spreewald 4.2.3 → 4.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d3a85d0ee7a8a0ebd403ef168a1788a21ce14dd3b3966aa431b1d0481f25e05
-  data.tar.gz: f68eb3cecf0e1792fada9ec58a664f6d8652fb700ebd07cee9a9789c260690a4
+  metadata.gz: 8841cf880bda6d58ed1632050b3c3a28292e476acb6f961922beaa3f842498a3
+  data.tar.gz: 830f0798c36a968717bf946ba987372e78df20c2a1ce4a5e4ec570733256c0b1
 SHA512:
-  metadata.gz: 8276a0f55cfbdab771e028d05117291ce3cff8ad082e66a8a6828805392ae7e36c26240033fa6f9e37e1de25f2c6c9ff6f5a3a6c7f8b4b16210a1287819a5cf8
-  data.tar.gz: 35d84f7231336eb6edf2e44c91d128b6ebb38a2f7c0119906c0df9f29f94f41d5f2b5ba51532156fd465533adfa8fbc061ce824d9f90b433a0c20ee50fc76d01
+  metadata.gz: 8f4afbf809ee2f17478eea159da1d1659a72e62d45b39bc8e221c4bb0fc94ed5fcad15ca17f4557e3163b2f9d6aa182041ab6aa4f13e1db72d290307a5724e82
+  data.tar.gz: 88b21029149764ec1023134a50e99ced4a51b8fe1e8f4a96ff1681cc4809013d52dcc2e995eba79e315b9626fe36b16bb65bd8da5ca100bbf3213b0ece67932a

data/CHANGELOG.md

@@ -3,6 +3,31 @@ All notable changes to this project will be documented in this file.
 
 This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## 4.3.5
+- Fix deprecation warning for using keyword arguments as last argument when running with ruby 2.7
+
+## 4.3.4
+- Fix "undefined method `build_rb_world_factory` for nil:NilClass" error when running tests on a real project'
+  - The field error class couldn't be required in certain circumstances and so the specs failed
+
+## 4.3.3
+- Fixes that the `Spreewald.field_error_class` configuration
+did not find the correct elements
+
+## 4.3.2
+- Added built-in support for Rails and Bootstrap (3-5) error classes to the steps
+  - `The ... field should have the error ...`
+  - `The ... field should have an error`
+- Added the possibility to specify custom error classes and message selectors for these steps
+  using `Spreewald.field_error_class` and `Spreewald.error_message_xpath_selector` in your configuration.
+
+- We had separate steps for e.g. `I should see ...` and `I should not see ...`. These were merged now:
+  - `I should see "..."` + `I should not see "..."` => `I should( not)? see "..."`
+  - `I should see /.../` + `I should not see /.../` => `I should( not)? see /.../`
+  - `I should see '...'` + `I should not see '...'` => `I should( not)? see '...'`
+- Optional negation was made more consistent. The steps use `"( not)? "` now.
+- The search via `spreewald some query here` includes steps with optional negation now.
+
 ## 4.2.2
 - Fixes the "Show me the email" step (#171)
 - Fixes the "I follow the link in the email" step. (#172, #173)

data/Gemfile.lock

@@ -1,8 +1,8 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    gemika (0.5.0)
-    rake (12.3.2)
+    gemika (0.6.1)
+    rake (13.0.3)
 
 PLATFORMS
   ruby
@@ -12,4 +12,4 @@ DEPENDENCIES
   rake
 
 BUNDLED WITH
-   2.2.3
+   2.2.17

data/Gemfile.ruby266.lock

@@ -1,60 +1,77 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    aruba (1.0.0)
-      childprocess (~> 3.0)
-      contracts (~> 0.16.0)
-      cucumber (>= 2.4, < 4.0)
-      ffi (~> 1.9)
+    aruba (2.0.0)
+      bundler (>= 1.17, < 3.0)
+      childprocess (>= 2.0, < 5.0)
+      contracts (>= 0.16.0, < 0.18.0)
+      cucumber (>= 4.0, < 8.0)
       rspec-expectations (~> 3.4)
       thor (~> 1.0)
-    backports (3.17.0)
     builder (3.2.4)
-    childprocess (3.0.0)
+    childprocess (4.0.0)
     contracts (0.16.0)
-    cucumber (3.1.2)
-      builder (>= 2.1.2)
-      cucumber-core (~> 3.2.0)
-      cucumber-expressions (~> 6.0.1)
-      cucumber-wire (~> 0.0.1)
-      diff-lcs (~> 1.3)
-      gherkin (~> 5.1.0)
-      multi_json (>= 1.7.5, < 2.0)
-      multi_test (>= 0.1.2)
-    cucumber-core (3.2.1)
-      backports (>= 3.8.0)
-      cucumber-tag_expressions (~> 1.1.0)
-      gherkin (~> 5.0)
-    cucumber-expressions (6.0.1)
-    cucumber-tag_expressions (1.1.1)
-    cucumber-wire (0.0.1)
-    diff-lcs (1.3)
-    ffi (1.12.2)
-    gemika (0.5.0)
-    gherkin (5.1.0)
+    cucumber (7.1.0)
+      builder (~> 3.2, >= 3.2.4)
+      cucumber-core (~> 10.1, >= 10.1.0)
+      cucumber-create-meta (~> 6.0, >= 6.0.1)
+      cucumber-cucumber-expressions (~> 14.0, >= 14.0.0)
+      cucumber-gherkin (~> 22.0, >= 22.0.0)
+      cucumber-html-formatter (~> 17.0, >= 17.0.0)
+      cucumber-messages (~> 17.1, >= 17.1.1)
+      cucumber-wire (~> 6.2, >= 6.2.0)
+      diff-lcs (~> 1.4, >= 1.4.4)
+      mime-types (~> 3.3, >= 3.3.1)
+      multi_test (~> 0.1, >= 0.1.2)
+      sys-uname (~> 1.2, >= 1.2.2)
+    cucumber-core (10.1.0)
+      cucumber-gherkin (~> 22.0, >= 22.0.0)
+      cucumber-messages (~> 17.1, >= 17.1.1)
+      cucumber-tag-expressions (~> 4.0, >= 4.0.2)
+    cucumber-create-meta (6.0.4)
+      cucumber-messages (~> 17.1, >= 17.1.1)
+      sys-uname (~> 1.2, >= 1.2.2)
+    cucumber-cucumber-expressions (14.0.0)
+    cucumber-gherkin (22.0.0)
+      cucumber-messages (~> 17.1, >= 17.1.1)
+    cucumber-html-formatter (17.0.0)
+      cucumber-messages (~> 17.1, >= 17.1.0)
+    cucumber-messages (17.1.1)
+    cucumber-tag-expressions (4.1.0)
+    cucumber-wire (6.2.0)
+      cucumber-core (~> 10.1, >= 10.1.0)
+      cucumber-cucumber-expressions (~> 14.0, >= 14.0.0)
+      cucumber-messages (~> 17.1, >= 17.1.1)
+    diff-lcs (1.4.4)
+    ffi (1.15.4)
+    gemika (0.6.1)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
-    mini_mime (1.0.2)
-    multi_json (1.14.1)
+    mime-types (3.4.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2021.1115)
+    mini_mime (1.1.2)
     multi_test (0.1.2)
     nokogiri (1.11.1-x86_64-linux)
       racc (~> 1.4)
     racc (1.5.2)
     rake (13.0.3)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.1)
-      rspec-support (~> 3.9.1)
-    rspec-expectations (3.9.1)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.2)
-    thor (1.0.1)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.2)
+    sys-uname (1.2.2)
+      ffi (~> 1.1)
+    thor (1.1.0)
 
 PLATFORMS
   ruby
@@ -72,4 +89,4 @@ RUBY VERSION
    ruby 2.6.6p146
 
 BUNDLED WITH
-   2.2.14
+   2.2.17

data/Gemfile.ruby300.lock

@@ -1,71 +1,59 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.3.1)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 1.6, < 2)
-      minitest (>= 5.1)
-      tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
-    aruba (1.0.4)
+    aruba (2.0.0)
+      bundler (>= 1.17, < 3.0)
       childprocess (>= 2.0, < 5.0)
-      contracts (~> 0.16.0)
-      cucumber (>= 2.4, < 6.0)
+      contracts (>= 0.16.0, < 0.18.0)
+      cucumber (>= 4.0, < 8.0)
       rspec-expectations (~> 3.4)
       thor (~> 1.0)
     builder (3.2.4)
     childprocess (4.0.0)
-    concurrent-ruby (1.1.8)
     contracts (0.16.0)
-    cucumber (5.3.0)
+    cucumber (7.1.0)
       builder (~> 3.2, >= 3.2.4)
-      cucumber-core (~> 8.0, >= 8.0.1)
-      cucumber-create-meta (~> 2.0, >= 2.0.2)
-      cucumber-cucumber-expressions (~> 10.3, >= 10.3.0)
-      cucumber-gherkin (~> 15.0, >= 15.0.2)
-      cucumber-html-formatter (~> 9.0, >= 9.0.0)
-      cucumber-messages (~> 13.1, >= 13.1.0)
-      cucumber-wire (~> 4.0, >= 4.0.1)
+      cucumber-core (~> 10.1, >= 10.1.0)
+      cucumber-create-meta (~> 6.0, >= 6.0.1)
+      cucumber-cucumber-expressions (~> 14.0, >= 14.0.0)
+      cucumber-gherkin (~> 22.0, >= 22.0.0)
+      cucumber-html-formatter (~> 17.0, >= 17.0.0)
+      cucumber-messages (~> 17.1, >= 17.1.1)
+      cucumber-wire (~> 6.2, >= 6.2.0)
       diff-lcs (~> 1.4, >= 1.4.4)
+      mime-types (~> 3.3, >= 3.3.1)
       multi_test (~> 0.1, >= 0.1.2)
-      sys-uname (~> 1.2, >= 1.2.1)
-    cucumber-core (8.0.1)
-      cucumber-gherkin (~> 15.0, >= 15.0.2)
-      cucumber-messages (~> 13.0, >= 13.0.1)
-      cucumber-tag-expressions (~> 2.0, >= 2.0.4)
-    cucumber-create-meta (2.0.4)
-      cucumber-messages (~> 13.1, >= 13.1.0)
-      sys-uname (~> 1.2, >= 1.2.1)
-    cucumber-cucumber-expressions (10.3.0)
-    cucumber-gherkin (15.0.2)
-      cucumber-messages (~> 13.0, >= 13.0.1)
-    cucumber-html-formatter (9.0.0)
-      cucumber-messages (~> 13.0, >= 13.0.1)
-    cucumber-messages (13.2.1)
-      protobuf-cucumber (~> 3.10, >= 3.10.8)
-    cucumber-tag-expressions (2.0.4)
-    cucumber-wire (4.0.1)
-      cucumber-core (~> 8.0, >= 8.0.1)
-      cucumber-cucumber-expressions (~> 10.3, >= 10.3.0)
-      cucumber-messages (~> 13.0, >= 13.0.1)
+      sys-uname (~> 1.2, >= 1.2.2)
+    cucumber-core (10.1.0)
+      cucumber-gherkin (~> 22.0, >= 22.0.0)
+      cucumber-messages (~> 17.1, >= 17.1.1)
+      cucumber-tag-expressions (~> 4.0, >= 4.0.2)
+    cucumber-create-meta (6.0.4)
+      cucumber-messages (~> 17.1, >= 17.1.1)
+      sys-uname (~> 1.2, >= 1.2.2)
+    cucumber-cucumber-expressions (14.0.0)
+    cucumber-gherkin (22.0.0)
+      cucumber-messages (~> 17.1, >= 17.1.1)
+    cucumber-html-formatter (17.0.0)
+      cucumber-messages (~> 17.1, >= 17.1.0)
+    cucumber-messages (17.1.1)
+    cucumber-tag-expressions (4.1.0)
+    cucumber-wire (6.2.0)
+      cucumber-core (~> 10.1, >= 10.1.0)
+      cucumber-cucumber-expressions (~> 14.0, >= 14.0.0)
+      cucumber-messages (~> 17.1, >= 17.1.1)
     diff-lcs (1.4.4)
-    ffi (1.15.0)
-    gemika (0.5.0)
-    i18n (1.8.10)
-      concurrent-ruby (~> 1.0)
+    ffi (1.15.4)
+    gemika (0.6.1)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
-    middleware (0.1.0)
+    mime-types (3.4.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2021.1115)
     mini_mime (1.0.3)
-    minitest (5.14.4)
     multi_test (0.1.2)
     nokogiri (1.11.2-x86_64-linux)
       racc (~> 1.4)
-    protobuf-cucumber (3.10.8)
-      activesupport (>= 3.2)
-      middleware
-      thor
-      thread_safe
     racc (1.5.2)
     rake (13.0.3)
     rspec (3.10.0)
@@ -84,10 +72,6 @@ GEM
     sys-uname (1.2.2)
       ffi (~> 1.1)
     thor (1.1.0)
-    thread_safe (0.3.6)
-    tzinfo (2.0.4)
-      concurrent-ruby (~> 1.0)
-    zeitwerk (2.4.2)
 
 PLATFORMS
   x86_64-linux

data/README.md

@@ -298,7 +298,7 @@ the step definitions.
 * **When I switch back to the whole page**
 
   This step can be used to switch back to the whole page if you switched
-  to operating inside an iframe before (step `I switch to the ... iframe`)
+  to operating inside an iframe before (step `I switch to the ... iframe`).
   
   Please note: This step is only available for Capybara >= 3.
 
@@ -460,26 +460,20 @@ deprecation notice. Decide for yourself whether you want to use them:
   Attach a file to a file upload form field
 
 
-* **Then I should see "..."**
+* **Then I should( not)? see "..."**
 
   Checks that some text appears on the page
   
   Note that this does not detect if the text might be hidden via CSS
 
 
-* **Then I should see /.../**
+* **Then I should( not)? see /.../**
 
   Checks that a regexp appears on the page
   
   Note that this does not detect if the text might be hidden via CSS
 
 
-* **Then I should not see "..."**
-
-
-* **Then I should not see /.../**
-
-
 * **Then I should( not)? see a field "..."**
 
   Checks for the existance of an input field (given its id or label)
@@ -494,26 +488,23 @@ deprecation notice. Decide for yourself whether you want to use them:
   See [here](https://makandracards.com/makandra/1225-test-that-a-number-or-money-amount-is-shown-with-cucumber) for details
 
 
-* **Then I should see '...'**
+* **Then I should( not)? see '...'**
 
   Like `Then I should see`, but with single instead of double quotes. In case
   the expected string contains quotes as well.
 
 
-* **Then I should see "..." in the HTML**
+* **Then I should( not)? see "..." in the HTML**
 
   Check that the raw HTML contains a string
 
 
-* **Then I should not see "..." in the HTML**
-
-
 * **Then I should see an error**
 
   Checks that status code is 400..599
 
 
-* **Then I should (not )?see (an|the) element "..."**
+* **Then I should( not)? see (an|the) element "..."**
 
   Check that an element with the given selector is present on the page.
   
@@ -525,7 +516,7 @@ deprecation notice. Decide for yourself whether you want to use them:
       Then I should not see the element ".sidebar"
 
 
-* **Then I should (not )?see (an|the) element for ...**
+* **Then I should( not)? see (an|the) element for ...**
 
   Check that an element with the given [selector alias](https://github.com/makandra/spreewald/blob/master/examples/selectors.rb) is present on the page.
   
@@ -555,12 +546,12 @@ deprecation notice. Decide for yourself whether you want to use them:
   Checks that the page contains a link with a given text or title attribute.
 
 
-* **Then the "..." field should (not )?contain "..."**
+* **Then the "..." field should( not)? contain "..."**
 
   Checks that an input field contains some value (allowing * as wildcard character)
 
 
-* **Then the "..." field should (not )?contain:**
+* **Then the "..." field should( not)? contain:**
 
   Checks that a multiline textarea contains some value (allowing * as wildcard character)
 

data/Rakefile

@@ -17,14 +17,16 @@ namespace :matrix do
 
     if gemfile.nil? || ruby.nil?
       warn 'Please state the Gemfile and Ruby version to be used for the Testrun!'
+      exit 1
     else
-      run_tests(gemfile, ruby)
+      success = run_tests(gemfile, ruby)
+      exit success ? 0 : 1
     end
   end
 
 
   desc "Run all tests which are available for current Ruby (#{RUBY_VERSION})"
-  task :tests, [:gemfile, :ruby] do |_t, args|
+  task :tests do
     Gemika::Matrix.from_ci_config.each do |row|
       run_tests(row.gemfile, row.ruby)
     end

data/examples/paths.rb

@@ -51,6 +51,13 @@ module NavigationHelpers
 
   private
 
+  def path_to_show_or_edit(action_prose, model_prose, identifier)
+    model = model_prose_to_class(model_prose)
+    route = "#{action_prose == 'form' ? 'edit_' : ''}#{model_prose_to_route_segment(model_prose)}_path"
+    # For find_by_anything see https://makandracards.com/makandra/6361-find-an-activerecord-by-any-column-useful-for-cucumber-steps
+    send(route, model.find_by_anything!(identifier))
+  end
+
   def model_prose_to_class(model_prose)
     model_prose.gsub(' ', '_').classify.constantize
   end

data/features/binary.feature

@@ -11,11 +11,15 @@ Feature: The `spreewald` binary
     Then the output should contain:
     """
     # All Spreewald steps containing 'should not see'
-    Then I should not see "..."
-    Then I should not see "..." in the HTML
-    Then I should not see /.../
-    """
-    But the output should not contain "Then I should see"
+    Then I should( not)? see "..."
+    Then I should( not)? see "..." in the HTML
+    Then I should( not)? see "..." inside any "..."
+    Then I should( not)? see '...'
+    Then I should( not)? see (an|the) element "..."
+    Then I should( not)? see (an|the) element for ...
+    Then I should( not)? see /.../
+    """
+    But the output should not contain "Then show me the page"
       And the output should not contain "mail"
 
 
@@ -43,15 +47,15 @@ Feature: The `spreewald` binary
     """
     Then(/it strips parentheses/) do
     Then /^(?:|I )should see \/([^\/]*)\/$/ do
-    Then(/^the "(.*?)" field should (not )?contain:$/) do
+    Then(/^the "(.*?)" field should( not)? contain:$/) do
     """
 
     When I run `spreewald`
     Then the output should contain "Then it strips parentheses"
-      And the output should contain "Then I should see /.../"
+      And the output should contain "Then I should( not)? see /.../"
       And the output should contain:
       """
-      Then the "..." field should (not )?contain:
+      Then the "..." field should( not)? contain:
       """
 
 

data/lib/spreewald/web_steps.rb

@@ -31,6 +31,7 @@ require 'spreewald_support/custom_matchers'
 require 'spreewald_support/web_steps_helpers'
 require 'spreewald_support/driver_info'
 require 'spreewald_support/comparison'
+require 'spreewald_support/field_errors'
 require 'uri'
 require 'cgi'
 
@@ -167,32 +168,23 @@ end.overridable
 # Checks that some text appears on the page
 #
 # Note that this does not detect if the text might be hidden via CSS
-Then /^(?:|I )should see "([^"]*)"$/ do |text|
+Then /^(?:|I )should( not)? see "([^"]*)"$/ do |negate, text|
+  expectation = negate ? :not_to : :to
+
   patiently do
-    expect(page).to have_content(text)
+    expect(page).send(expectation, have_content(text))
   end
 end.overridable
 
 # Checks that a regexp appears on the page
 #
 # Note that this does not detect if the text might be hidden via CSS
-Then /^(?:|I )should see \/(.*)\/$/ do |regexp|
+Then /^(?:|I )should( not)? see \/(.*)\/$/ do |negate, regexp|
+  expectation = negate ? :not_to : :to
   regexp = Regexp.new(regexp)
-  patiently do
-    expect(page).to have_xpath('.//descendant-or-self::*', :text => regexp)
-  end
-end.overridable
 
-Then /^(?:|I )should not see "([^"]*)"$/ do |text|
   patiently do
-    expect(page).to have_no_content(text)
-  end
-end.overridable
-
-Then /^(?:|I )should not see \/(.*)\/$/ do |regexp|
-  patiently do
-    regexp = Regexp.new(regexp)
-    expect(page).to have_no_xpath('.//descendant-or-self::*', :text => regexp)
+    expect(page).send(expectation, have_xpath('.//descendant-or-self::*', text: regexp))
   end
 end.overridable
 
@@ -239,22 +231,20 @@ end.overridable(priority: -5) # priority lower than within
 
 # Like `Then I should see`, but with single instead of double quotes. In case
 # the expected string contains quotes as well.
-Then /^(?:|I )should see '([^']*)'$/ do |text|
+Then /^(?:|I )should( not)? see '([^']*)'$/ do |negate, text|
+  expectation = negate ? :not_to : :to
+
   patiently do
-    expect(page).to have_content(text)
+    expect(page).send(expectation, have_content(text))
   end
 end.overridable
 
 # Check that the raw HTML contains a string
-Then /^I should see "([^\"]*)" in the HTML$/ do |text|
-  patiently do
-    expect(page.body).to include(text)
-  end
-end.overridable
+Then /^I should( not)? see "([^\"]*)" in the HTML$/ do |negate, text|
+  expectation = negate ? :not_to : :to
 
-Then /^I should not see "([^\"]*)" in the HTML$/ do |text|
   patiently do
-    expect(page.body).not_to include(text)
+    expect(page.body).send(expectation, include(text))
   end
 end.overridable
 
@@ -271,7 +261,7 @@ end.overridable
 #     Then I should see the element ".panel"
 #     Then I should not see an element ".sidebar"
 #     Then I should not see the element ".sidebar"
-Then /^I should (not )?see (?:an|the) element "([^"]+)"$/ do |negate, selector|
+Then /^I should( not)? see (?:an|the) element "([^"]+)"$/ do |negate, selector|
   expectation = negate ? :not_to : :to
   patiently do
     expect(page).send(expectation, have_css(selector))
@@ -286,7 +276,7 @@ end.overridable
 #     Then I should see the element for the panel
 #     Then I should not see an element for the sidebar
 #     Then I should not see the element for the sidebar
-Then /^I should (not )?see (?:an|the) element for (.*?)$/ do |negate, locator|
+Then /^I should( not)? see (?:an|the) element for (.*?)$/ do |negate, locator|
   expectation = negate ? :not_to : :to
   selector = _selector_for(locator)
   patiently do
@@ -325,7 +315,7 @@ Then /^I should( not)? see a link labeled "([^"]*)"$/ do |negate, label|
 end.overridable
 
 # Checks that an input field contains some value (allowing * as wildcard character)
-Then /^the "([^"]*)" field should (not )?contain "([^"]*)"$/ do |label, negate, expected_string|
+Then /^the "([^"]*)" field should( not)? contain "([^"]*)"$/ do |label, negate, expected_string|
   patiently do
     field = find_with_disabled(:field, label)
     field_value = case field.tag_name
@@ -345,7 +335,7 @@ Then /^the "([^"]*)" field should (not )?contain "([^"]*)"$/ do |label, negate,
 end.overridable
 
 # Checks that a multiline textarea contains some value (allowing * as wildcard character)
-Then(/^the "(.*?)" field should (not )?contain:$/) do |label, negate, expected_string|
+Then(/^the "(.*?)" field should( not)? contain:$/) do |label, negate, expected_string|
   patiently do
     field = find_with_disabled(:field, label)
     expect(field.value.chomp).send(negate ? :not_to : :to, contain_with_wildcards(expected_string))
@@ -370,17 +360,28 @@ end.overridable
 Then /^the "([^"]*)" field should have the error "([^"]*)"$/ do |field, error_message|
   patiently do
     element = find_with_disabled(:field, field)
-    classes = element.find(:xpath, '..')[:class].split(' ')
+    field_error_finder = Spreewald::FieldErrorFinder.new(page, element)
+    expect(field_error_finder.error_present?).to eq true
 
-    form_for_input = element.find(:xpath, 'ancestor::form[1]')
-    using_formtastic = form_for_input && form_for_input.has_css?('.formtastic')
-    error_class = using_formtastic ? 'error' : 'field_with_errors'
+    if Spreewald.field_error_class
+      unless Spreewald.error_message_xpath_selector
+        raise ArgumentError, 'No XPath was specified for the custom error message element.'
+      end
+    end
 
-    expect(classes).to include(error_class)
+    error_message_element = case
+      when Spreewald.error_message_xpath_selector
+        element.find(:xpath, Spreewald.error_message_xpath_selector)
+      when field_error_finder.bootstrap3_error?
+        element.find(:xpath, 'parent::*/child::*[@class="help-block"]')
+      when field_error_finder.bootstrap45_error?
+        element.find(:xpath, 'parent::*/child::*[@class="invalid-feedback"]')
+      else
+        nil
+    end
 
-    if using_formtastic
-      error_paragraph = element.find(:xpath, '../*[@class="inline-errors"][1]')
-      expect(error_paragraph).to have_content(error_message)
+    if error_message_element
+      expect(error_message_element).to have_content(error_message)
     else
       expect(page).to have_content("#{field.titlecase} #{error_message}")
     end
@@ -390,9 +391,10 @@ end.overridable
 Then /^the "([^\"]*)" field should( not)? have an error$/ do |label, negate|
   patiently do
     expectation = negate ? :not_to : :to
-    field = find_with_disabled(:field, label)
-    expect(field[:id]).to be_present # prevent bad CSS selector if field lacks id
-    expect(page).send(expectation, have_css(".field_with_errors ##{field[:id]}"))
+    element = find_with_disabled(:field, label)
+    field_error_finder = Spreewald::FieldErrorFinder.new(page, element)
+
+    expect(field_error_finder.error_present?).public_send(expectation, (eq true))
   end
 end.overridable
 
@@ -484,18 +486,18 @@ end.overridable
 # Checks for the presence of an option in a select
 Then /^"([^"]*)" should( not)? be an option for "([^"]*)"$/ do |value, negate, field|
   finder_arguments = if Spreewald::Comparison.compare_versions(Capybara::VERSION, :<, "2.12")
-    ['option', { :text => value }]
+    { text: value }
   else
-    ['option', { :exact_text => value }]
+    { exact_text: value }
   end
   patiently do
     if negate
       begin
-        expect(find_with_disabled(:field, field)).to have_no_css(*finder_arguments)
+        expect(find_with_disabled(:field, field)).to have_no_css('option', **finder_arguments)
       rescue Capybara::ElementNotFound
       end
     else
-      expect(find_with_disabled(:field, field)).to have_css(*finder_arguments)
+      expect(find_with_disabled(:field, field)).to have_css('option', **finder_arguments)
     end
   end
 end.overridable
@@ -648,18 +650,19 @@ end.overridable
 
 # Tests that an input, button, checkbox or radio button with the given label is disabled.
 Then /^the "([^\"]*)" (field|button|checkbox|radio button) should( not)? be disabled$/ do |label, kind, negate|
-  element = if kind == 'button'
-    find_with_disabled(:button, label)
-  else
-    find_with_disabled(:field, label)
-  end
+  patiently do
+    element = if kind == 'button'
+      find_with_disabled(:button, label)
+    else
+      find_with_disabled(:field, label)
+    end
 
-  if Spreewald::Comparison.compare_versions(Capybara::VERSION, :<, "2.1")
-    expect(element[:disabled]).send(negate ? :to : :not_to, eq(nil))
-  else
-    expect(!!element.disabled?).to be !negate
+    if Spreewald::Comparison.compare_versions(Capybara::VERSION, :<, "2.1")
+      expect(element[:disabled]).send(negate ? :to : :not_to, eq(nil))
+    else
+      expect(!!element.disabled?).to be !negate
+    end
   end
-
 end.overridable
 
 # Tests that a field with the given label is visible.

data/lib/spreewald_support/field_errors.rb

@@ -0,0 +1,56 @@
+require 'spreewald_support/driver_info'
+
+module Spreewald
+  def self.field_error_class
+    self.instance_variable_get('@field_error_class')
+  end
+
+  def self.field_error_class=(error_class)
+    self.instance_variable_set('@field_error_class', error_class)
+  end
+
+  def self.error_message_xpath_selector
+    self.instance_variable_get('@error_message_xpath_selector')
+  end
+
+  # The XPath to the HTML-element that renders your validation/error message.
+  # The current node to start from is the input-field that is validated.
+  def self.error_message_xpath_selector=(message_selector)
+    self.instance_variable_set('@error_message_xpath_selector', message_selector)
+  end
+
+  class FieldErrorFinder
+    include Spreewald::DriverInfo
+
+    def initialize(page, element)
+      @page = page
+      @element = element
+    end
+
+    def error_present?
+      custom_error? || bootstrap3_error? || bootstrap45_error? || rails_error?
+    end
+
+    def custom_error?
+      Spreewald.field_error_class && @element.has_xpath?("ancestor-or-self::div[contains(@class, \"#{Spreewald.field_error_class}\")]")
+    end
+
+    def bootstrap3_error?
+      @element.has_xpath?('ancestor::div[@class="form-group has-error"]')
+    end
+
+    def bootstrap45_error?
+      element_classes = @element[:class] &.split(' ') || []
+      invalid_elements = if javascript_capable?
+        @page.all(':invalid') # Collect all invalid elements as Bootstrap 4 and 5 support client validation
+      end
+
+      element_classes.include?('is-invalid') || (invalid_elements && invalid_elements.include?(@element))
+    end
+
+    def rails_error?
+      parent_element_classes = @element.find(:xpath, '..')[:class] &.split(' ') || []
+      parent_element_classes.include?('field_with_errors')
+    end
+  end
+end

data/lib/spreewald_support/version.rb

@@ -1,3 +1,3 @@
 module Spreewald
-  VERSION = '4.2.3'
+  VERSION = '4.3.5'
 end

data/support/step_definition.rb

@@ -33,6 +33,11 @@ class StepDefinition
     "#{kind} #{pretty_step}"
   end
 
+  def matches_search?(search)
+    regexp = Regexp.new(search)
+    step =~ regexp || matches_without_optional_negation?(regexp)
+  end
+
   private
 
   def pretty_step
@@ -45,4 +50,10 @@ class StepDefinition
     end
   end
 
+  def matches_without_optional_negation?(regexp)
+    without_negation = step.gsub('( not)?', '').gsub('(not )?', '')
+    with_negation = step.gsub('( not)?', ' not').gsub('(not )?', 'not ')
+    with_negation =~ regexp || without_negation =~ regexp
+  end
+
 end

data/support/step_manager.rb

@@ -17,7 +17,7 @@ class StepManager
   def steps(search = nil)
     step_files.collect(&:real_steps).flatten.
       sort_by { |step| [STEP_KINDS.index(step.kind), step.to_s.downcase] }.
-      select { |definition| search.nil? or definition.step =~ Regexp.new(search) }
+      select { |definition| search.nil? || definition.matches_search?(search) }
   end
 
 private

data/tests/rails-6_capybara-3/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../..
   specs:
-    spreewald (4.2.3)
+    spreewald (4.3.5)
       cucumber
       cucumber_priority (>= 0.3.0)
       rspec (>= 2.13.0)

data/tests/rails-6_capybara-3/features/step_definitions/field_error_steps.rb

@@ -0,0 +1,12 @@
+Then /^I set the custom field error class to "([^"]+)"$/ do |error_class|
+  Spreewald.field_error_class = error_class
+end
+
+Then /^I set the custom error message xpath to "(.+)"$/ do |error_message_xpath|
+  Spreewald.error_message_xpath_selector = error_message_xpath
+end
+
+After('@field_errors') do
+  Spreewald.field_error_class = nil
+  Spreewald.error_message_xpath_selector = nil
+end

data/tests/shared/app/controllers/forms_controller.rb

@@ -15,7 +15,16 @@ class FormsController < ApplicationController
   def select_fields
   end
 
-  def invalid_form
+  def invalid_rails_form
   end
 
-end
+  def invalid_bootstrap3_form
+  end
+
+  def invalid_bootstrap4_form
+  end
+
+  def invalid_custom_form
+  end
+
+end

data/tests/shared/app/controllers/static_pages_controller.rb

@@ -33,6 +33,9 @@ class StaticPagesController < ApplicationController
   def see_element
   end
 
+  def should_see
+  end
+
   def tab_1
   end
 

data/tests/shared/app/views/forms/invalid_bootstrap3_form.html.haml

@@ -0,0 +1,16 @@
+= form_tag do
+  .form-group.has-error
+    = label_tag 'text_control', 'A'
+    = text_field_tag 'text_control', 'Text control value'
+    .help-block 'A is invalid'
+  .form-group.has-error
+    = label_tag 'textarea_control_1', 'B'
+    = text_area_tag 'textarea_control_1', "Textarea control line 1\nTextarea control line 2\n"
+    .help-block 'B is invalid'
+  .form-group.has-error
+    = label_tag 'disabled_control', 'Disabled'
+    = text_field_tag 'disabled_control', "Disabled control value", disabled: true
+    .help-block 'Disabled is invalid'
+  .form-group
+    = label_tag 'textarea_control_2', 'C'
+    = text_area_tag 'textarea_control_2', "Textarea control line 1\nTextarea control line 2\n"

data/tests/shared/app/views/forms/invalid_bootstrap4_form.html.haml

@@ -0,0 +1,18 @@
+= form_tag do
+  .form-group
+    = label_tag 'text_control', 'A'
+    - # Client validation
+    = text_field_tag 'text_control', '', class: 'form-control', required: true
+    .invalid-feedback 'A is invalid'
+  .form-group
+    = label_tag 'textarea_control_1', 'B'
+    = text_area_tag 'textarea_control_1', '', class: 'form-control', required: true
+    .invalid-feedback 'B is invalid'
+  .form-group
+    = label_tag 'disabled_control', 'Disabled'
+    - # Server validation
+    = text_field_tag 'disabled_control', "Disabled control value", class: 'form-control is-invalid', disabled: true
+    .invalid-feedback 'Disabled is invalid'
+  .form-group
+    = label_tag 'textarea_control_2', 'C'
+    = text_area_tag 'textarea_control_2', "Textarea control line 1\nTextarea control line 2\n"

data/tests/shared/app/views/forms/invalid_custom_form.html.haml

@@ -0,0 +1,19 @@
+= form_tag do
+  .form-group.my-error
+    = label_tag 'text_control', 'A'
+    = text_field_tag 'text_control', 'Text control value'
+    %p.my-error-description
+      A is invalid
+  .form-group.my-error
+    = label_tag 'textarea_control_1', 'B'
+    = text_area_tag 'textarea_control_1', "Textarea control line 1\nTextarea control line 2\n"
+    %p.my-error-description
+      B is invalid
+  .form-group.my-error
+    = label_tag 'disabled_control', 'Disabled'
+    = text_field_tag 'disabled_control', "Disabled control value", disabled: true
+    %p.my-error-description
+      Disabled is invalid
+  .form-group
+    = label_tag 'textarea_control_2', 'C'
+    = text_area_tag 'textarea_control_2', "Textarea control line 1\nTextarea control line 2\n"

data/tests/shared/app/views/static_pages/should_see.haml

@@ -0,0 +1,7 @@
+%p Normal text
+
+%p Some text matching a regular expression
+
+%p Some text with "quotes"
+
+%p Some text in the <b>HTML</b>

data/tests/shared/config/routes.rb

@@ -23,7 +23,10 @@ Rails.application.routes.draw do
   get '/forms/form1', to: 'forms#form1'
   get '/forms/form2', to: 'forms#form2'
   get '/forms/select_fields', to: 'forms#select_fields'
-  get '/forms/invalid_form', to: 'forms#invalid_form'
+  get '/forms/invalid_rails_form', to: 'forms#invalid_rails_form'
+  get '/forms/invalid_bootstrap3_form', to: 'forms#invalid_bootstrap3_form'
+  get '/forms/invalid_bootstrap4_form', to: 'forms#invalid_bootstrap4_form'
+  get '/forms/invalid_custom_form', to: 'forms#invalid_custom_form'
 
   get '/iframes/iframe_1_content', to: 'iframes#iframe_1_content'
   get '/iframes/iframe_2_content', to: 'iframes#iframe_2_content'
@@ -41,6 +44,7 @@ Rails.application.routes.draw do
   get '/static_pages/session_1', to: 'static_pages#session_1'
   get '/static_pages/session_2', to: 'static_pages#session_2'
   get '/static_pages/session_3', to: 'static_pages#session_3'
+  get '/static_pages/should_see', to: 'static_pages#should_see'
   get '/static_pages/tab_1', to: 'static_pages#tab_1'
   get '/static_pages/tab_2', to: 'static_pages#tab_2'
   get '/static_pages/tab_3', to: 'static_pages#tab_3'

data/tests/shared/features/shared/web_steps.feature

@@ -1,6 +1,6 @@
 Feature: Web steps
 
-  Scenario: /^the "([^"]*)" field should (not )?contain "([^"]*)"$/
+  Scenario: /^the "([^"]*)" field should( not)? contain "([^"]*)"$/
     When I go to "/forms/form1"
     Then the "Text control" field should contain "Text control value"
     Then the "Text control" field should not contain "false text"
@@ -11,7 +11,7 @@ Feature: Web steps
     Then the "Empty control" field should contain ""
 
 
-  Scenario: /^the "([^"]*)" field should (not )?contain:/
+  Scenario: /^the "([^"]*)" field should( not)? contain:/
     When I go to "/forms/form2"
     Then the "Text control" field should contain:
       """
@@ -31,20 +31,57 @@ Feature: Web steps
       """
       """
 
-
+  @javascript @field_errors
   Scenario: /^the "([^\"]*)" field should( not)? have an error$/
-    When I go to "/forms/invalid_form"
+    When I go to "/forms/invalid_rails_form"
+    Then the "A" field should have an error
+    Then the "B" field should have an error
+    Then the "Disabled" field should have an error
+    Then the "C" field should not have an error
+
+    When I go to "/forms/invalid_bootstrap3_form"
     Then the "A" field should have an error
     Then the "B" field should have an error
     Then the "Disabled" field should have an error
     Then the "C" field should not have an error
 
+    When I go to "/forms/invalid_bootstrap4_form"
+    Then the "A" field should have an error
+    Then the "B" field should have an error
+    Then the "Disabled" field should have an error
+    Then the "C" field should not have an error
+
+    When I set the custom field error class to "my-error"
+      And I go to "/forms/invalid_custom_form"
+    Then the "A" field should have an error
+    Then the "B" field should have an error
+    Then the "Disabled" field should have an error
+    Then the "C" field should not have an error
+
+
+  @javascript @field_errors
   Scenario: /^the "([^"]*)" field should have the error "([^"]*)"$/
-    When I go to "/forms/invalid_form"
+    When I go to "/forms/invalid_rails_form"
     Then the "A" field should have the error "is invalid"
     Then the "B" field should have the error "is invalid"
     Then the "Disabled" field should have the error "is invalid"
 
+    When I go to "/forms/invalid_bootstrap3_form"
+    Then the "A" field should have the error "is invalid"
+    Then the "B" field should have the error "is invalid"
+    Then the "Disabled" field should have the error "is invalid"
+
+    When I go to "/forms/invalid_bootstrap4_form"
+    Then the "A" field should have the error "is invalid"
+    Then the "B" field should have the error "is invalid"
+    Then the "Disabled" field should have the error "is invalid"
+
+    When I set the custom field error class to "my-error"
+      And I set the custom error message xpath to "parent::*/child::*[contains(@class, "my-error-description")]"
+      And I go to "/forms/invalid_custom_form"
+    Then the "A" field should have the error "is invalid"
+    Then the "B" field should have the error "is invalid"
+    Then the "Disabled" field should have the error "is invalid"
 
   Scenario: /^I should see a form with the following values:$/
     When I go to "/forms/form1"
@@ -200,7 +237,7 @@ Feature: Web steps
     And "div with style: display: none" should be hidden within ".container"
 
 
-  Scenario: /^I should (not )?see (?:an|the) element "([^"]+)"$/
+  Scenario: /^I should( not)? see (?:an|the) element "([^"]+)"$/
     When I go to "/static_pages/see_element"
     Then I should see an element ".panel"
       And I should see the element ".panel"
@@ -210,7 +247,7 @@ Feature: Web steps
       But I should not see the element ".timeline"
 
 
-  Scenario: /^I should (not )?see (?:an|the) element for (.*?)$/
+  Scenario: /^I should( not)? see (?:an|the) element for (.*?)$/
     When I go to "/static_pages/see_element"
     Then I should see an element for a panel
       And I should see the element for a panel
@@ -220,7 +257,26 @@ Feature: Web steps
       And I should not see the element for the timeline
 
 
-  Scenario: /^((?:|I )should see "([^"]*)" within (.*[^:])$/
+  Scenario: /^((?:|I )should( not)? see "([^"]*)"$/
+    When I go to "/static_pages/should_see"
+    Then I should see "Normal text"
+    But I should not see "Some special text"
+
+
+  Scenario: /^((?:|I )should( not)? see '([^']*)'$/
+    When I go to "/static_pages/should_see"
+    Then I should see 'Some text with "quotes"'
+    But I should not see 'Some special text with "quotes"'
+
+
+  Scenario: /^I should( not)? see "([^\"]*)" in the HTML$/
+    When I go to "/static_pages/should_see"
+    Then I should see "Some text in the <b>HTML</b>" in the HTML
+      And I should see "Some text in the HTML"
+    But I should not see "Some text in the <strong>HTML</strong>" in the HTML
+
+
+  Scenario: /^((?:|I )should( not)? see "([^"]*)" within (.*[^:])$/
     When I go to "/static_pages/within"
     Then I should see "Role" within ".table"
       And I should see "Permissions" within a table
@@ -232,7 +288,8 @@ Feature: Web steps
       And I should not see "Outside Table" within a table
     But I should see "Outside Table"
 
-  Scenario: /^(?:|I )should see \/([^\/]*)\/$/
+
+  Scenario: /^(?:|I )should( not)? see \/([^\/]*)\/$/
     When I go to "/static_pages/within"
     Then I should see /Shared Text/
       And I should see /Unique Text/
@@ -241,13 +298,8 @@ Feature: Web steps
     But I should not see /Nonsense/
       And I should not see /http://other-domain.com/
 
-    # making sure it works with a within scope correctly when the same element is available outside
-    Then I should not see /Outside Table/ within ".table"
-      And I should not see /Outside Table/ within a table
-    But I should see /Outside Table/
-
 
-  Scenario: /^(?:|I )should see \/([^\/]*)\/ within (.*[^:])$/
+  Scenario: /^(?:|I )should( not)? see \/([^\/]*)\/ within (.*[^:])$/
     When I go to "/static_pages/within"
     Then I should see /Shared Text/ within ".scoped-element"
       And I should see /Shared Text/ within ".unrelated-element"
@@ -257,6 +309,11 @@ Feature: Web steps
     But I should not see /Unique Text/ within ".unrelated-element"
       And I should not see /http://other-domain.com/ within ".unrelated-element"
 
+    # making sure it works with a within scope correctly when the same element is available outside
+    Then I should not see /Outside Table/ within ".table"
+      And I should not see /Outside Table/ within a table
+    But I should see /Outside Table/
+
 
   Scenario: /^(.*) within (.*[^:])$/ with a Capybara::Node::Element
     When I go to "/static_pages/within"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spreewald
 version: !ruby/object:Gem::Version
-  version: 4.2.3
+  version: 4.3.5
 platform: ruby
 authors:
 - Tobias Kraze
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-19 00:00:00.000000000 Z
+date: 2022-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -165,6 +165,7 @@ files:
 - lib/spreewald_support/compatibility.rb
 - lib/spreewald_support/custom_matchers.rb
 - lib/spreewald_support/driver_info.rb
+- lib/spreewald_support/field_errors.rb
 - lib/spreewald_support/github.rb
 - lib/spreewald_support/mail_finder.rb
 - lib/spreewald_support/mail_to_plaintext_converter.rb
@@ -231,6 +232,7 @@ files:
 - tests/rails-6_capybara-3/features/overriding.feature
 - tests/rails-6_capybara-3/features/session_steps.feature
 - tests/rails-6_capybara-3/features/step_definitions/.gitkeep
+- tests/rails-6_capybara-3/features/step_definitions/field_error_steps.rb
 - tests/rails-6_capybara-3/features/step_definitions/overriding_steps.rb
 - tests/rails-6_capybara-3/features/step_definitions/test_steps.rb
 - tests/rails-6_capybara-3/features/support/env.rb
@@ -262,7 +264,10 @@ files:
 - tests/shared/app/views/forms/disabled_elements.html.haml
 - tests/shared/app/views/forms/form1.html.haml
 - tests/shared/app/views/forms/form2.html.haml
-- tests/shared/app/views/forms/invalid_form.html.haml
+- tests/shared/app/views/forms/invalid_bootstrap3_form.html.haml
+- tests/shared/app/views/forms/invalid_bootstrap4_form.html.haml
+- tests/shared/app/views/forms/invalid_custom_form.html.haml
+- tests/shared/app/views/forms/invalid_rails_form.html.haml
 - tests/shared/app/views/forms/select_fields.html.haml
 - tests/shared/app/views/iframes/iframe_1_content.haml
 - tests/shared/app/views/iframes/iframe_2_content.haml
@@ -293,6 +298,7 @@ files:
 - tests/shared/app/views/static_pages/session_1.haml
 - tests/shared/app/views/static_pages/session_2.haml
 - tests/shared/app/views/static_pages/session_3.haml
+- tests/shared/app/views/static_pages/should_see.haml
 - tests/shared/app/views/static_pages/tab_1.haml
 - tests/shared/app/views/static_pages/tab_2.haml
 - tests/shared/app/views/static_pages/tab_3.haml
@@ -391,6 +397,7 @@ test_files:
 - tests/rails-6_capybara-3/features/overriding.feature
 - tests/rails-6_capybara-3/features/session_steps.feature
 - tests/rails-6_capybara-3/features/step_definitions/.gitkeep
+- tests/rails-6_capybara-3/features/step_definitions/field_error_steps.rb
 - tests/rails-6_capybara-3/features/step_definitions/overriding_steps.rb
 - tests/rails-6_capybara-3/features/step_definitions/test_steps.rb
 - tests/rails-6_capybara-3/features/support/env.rb
@@ -422,7 +429,10 @@ test_files:
 - tests/shared/app/views/forms/disabled_elements.html.haml
 - tests/shared/app/views/forms/form1.html.haml
 - tests/shared/app/views/forms/form2.html.haml
-- tests/shared/app/views/forms/invalid_form.html.haml
+- tests/shared/app/views/forms/invalid_bootstrap3_form.html.haml
+- tests/shared/app/views/forms/invalid_bootstrap4_form.html.haml
+- tests/shared/app/views/forms/invalid_custom_form.html.haml
+- tests/shared/app/views/forms/invalid_rails_form.html.haml
 - tests/shared/app/views/forms/select_fields.html.haml
 - tests/shared/app/views/iframes/iframe_1_content.haml
 - tests/shared/app/views/iframes/iframe_2_content.haml
@@ -453,6 +463,7 @@ test_files:
 - tests/shared/app/views/static_pages/session_1.haml
 - tests/shared/app/views/static_pages/session_2.haml
 - tests/shared/app/views/static_pages/session_3.haml
+- tests/shared/app/views/static_pages/should_see.haml
 - tests/shared/app/views/static_pages/tab_1.haml
 - tests/shared/app/views/static_pages/tab_2.haml
 - tests/shared/app/views/static_pages/tab_3.haml