mache 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 912b56e289aa3e69473fd758575e2f43afe3818b
-  data.tar.gz: abcf1936d0c0c3cf08c6c27a8148f7107333500b
+  metadata.gz: f2a6457504e07023cbe3e84e72ef455a22081ecd
+  data.tar.gz: cce7b3211712bfa08b179b9b9cd8f237eca299b3
 SHA512:
-  metadata.gz: 0d6ad5456be773a9fe544700e8377227fd4bd50be9d22baca2d94fccd641c212a3c62189114a3de9b59a757eb1fd39852cc3a67230e288b790636cea1bac9ae3
-  data.tar.gz: 8ad576449372f1966b1fcba9e6db5753cb6d1b41c403307496041958270451b3de0b6f621a9b2c8dfbdbbe1945e99d4416a7ed3f4449cd154a42d5453311f3da
+  metadata.gz: 2ca5d81a94c1c56716d9e9411abf47bac750198dd07950d049bbcb4612dcf6ded9e96c3b3eddcb91f428be49846772d179e37074e1aeb8956b880f0dd8fb5e3c
+  data.tar.gz: 15b0571b00474011618204d7eb7e82fcdbac3d06ccda60f0ea55ca39dc7a05c3206a6e1fd020a31a1dc6eb19ff75df8919727e43f350cd7d4f0fbb7b7dfe906b

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 2.1.1
+
+- Fix a bug in the flash helper matchers.
+
 ## 2.1.0
 
 - Add flash and routing helpers.

data/README.md

@@ -184,8 +184,17 @@ end
 Then you can query the flash on your page object:
 
 ```ruby
-page.has_notice_message?("Welcome to the app")
-page.has_alert_message?("A horrible error occurred")
+page.has_message?(:success, "lorem ipsum")
+page.has_message?(:success, /lorem ipsum/)
+```
+
+There are even convenience matchers for the common types of flash messages:
+
+```ruby
+page.has_success_message?("lorem ipsum")
+page.has_notice_message?("lorem ipsum")
+page.has_alert_message?("lorem ipsum")
+page.has_error_message?("lorem ipsum")
 ```
 
 #### Routes

data/lib/mache/helpers/rails/flash.rb

@@ -3,6 +3,8 @@ module Mache
     module Rails
       # The {Flash} module can be Included into page object classes that support
       # flash behaviour.
+      #
+      # rubocop:disable Style/PredicateName
       module Flash
         def self.included(base)
           base.extend(ClassMethods)
@@ -10,22 +12,54 @@ module Mache
 
         module ClassMethods # :nodoc:
           def flash(selector)
-            element :flash, selector
+            element(:flash, selector)
           end
         end
 
-        # rubocop:disable Style/PredicateName
-        def has_notice_message?(text)
+        # Tests whether the page has a flash message.
+        #
+        # @param [String, Symbol] type a flash message type
+        # @param [Regexp, String] text a value to match
+        # @return `true` if the page has a matching message, `false` otherwise
+        def has_message?(type, text)
           css_class = flash[:class] || ""
-          css_class.include?("notice") && flash.text =~ /\s*#{text}\s*/
+          regexp = text.is_a?(String) ? /\A#{Regexp.escape(text)}\Z/ : text
+          css_class.include?(type.to_s) && flash.text.strip =~ regexp
+        end
+
+        # Tests whether the page has a success message.
+        #
+        # @param [Regexp, String] text a value to match
+        # @return `true` if the page has a matching message, `false` otherwise
+        def has_success_message?(text)
+          has_message?(:success, text)
         end
 
+        # Tests whether the page has a notice message.
+        #
+        # @param [Regexp, String] text a value to match
+        # @return `true` if the page has a matching message, `false` otherwise
+        def has_notice_message?(text)
+          has_message?(:notice, text)
+        end
+
+        # Tests whether the page has an alert message.
+        #
+        # @param [Regexp, String] text a value to match
+        # @return `true` if the page has a matching message, `false` otherwise
         def has_alert_message?(text)
-          css_class = flash[:class] || ""
-          css_class.include?("error") && flash.text =~ /\s*#{text}\s*/
+          has_message?(:alert, text)
+        end
+
+        # Tests whether the page has an error message.
+        #
+        # @param [Regexp, String] text a value to match
+        # @return `true` if the page has a matching message, `false` otherwise
+        def has_error_message?(text)
+          has_message?(:error, text)
         end
-        # rubocop:enable Style/PredicateName
       end
+      # rubocop:enable Style/PredicateName
     end
   end
 end

data/lib/mache/version.rb

@@ -1,3 +1,3 @@
 module Mache
-  VERSION = "2.1.0".freeze
+  VERSION = "2.1.1".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mache
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Joshua Bassett