spreewald 4.1.1 → 4.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 06fe5aa45812c755a6f7b875be6fd48a9c17e134a059aaec4f18d7777f4e88ca
-  data.tar.gz: 5612118b301015088b9b9702aaf77d5b1e140ae03e785d2ad840c7bc5805c3d8
+  metadata.gz: e10c60e2e7cc0636a4cfa38bcd509de5f6e1d1077e796b0e80bfb59eae84f9a3
+  data.tar.gz: 9543765c53174dfab02096267b5ff9c5498a555d730b3a9a0d95b6b10a78b40a
 SHA512:
-  metadata.gz: 39507ac68849f59b244bfe7555654aba0b8371d62fdfbb70dcf186713b2458b300a47a05c66c3f6b78183d35313914df60c2b2197ec0ba688f1b82d01fec34cd
-  data.tar.gz: a6f5033b9f9d952c7fed05fd38ec6a2e6b72c6ad1e7eadae2311491ff0342ce84afe60015ec81b950a4b04fbe01597e277deec95a929da32b2eadaf4e5f5c4c3
+  metadata.gz: b1189c2293c12c110640dcae56c73a2ccebf395d0fcf52d39ed50180e045da393fef78485602b303fd6882a268424ed5d16fd27ce1936551d1efb352f6e8869d
+  data.tar.gz: '08050f1748090f777465abf05636b0479375d5043f0d08865b07011e20fcddadb3b60c67574dd7c05895d54539a539bc213dfbac1decac949b7b8a83f439d8e5'

data/.github/workflows/test.yml

@@ -14,14 +14,9 @@ jobs:
       fail-fast: false
       matrix:
         include:
-        # Test projects
-        - ruby: 2.4.5
-          gemfile: tests/rails-4_capybara-2/Gemfile
         - ruby: 3.0.0
           gemfile: tests/rails-6_capybara-3/Gemfile
         # Used to run rspec and integration tests for spreewald binary:
-        - ruby: 2.4.5
-          gemfile: Gemfile.ruby245
         - ruby: 2.6.6
           gemfile: Gemfile.ruby266
         - ruby: 3.0.0

data/CHANGELOG.md

@@ -3,6 +3,22 @@ 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.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. 
+
+## 4.2.2
+- Fixes the "Show me the email" step (#171)
+- Fixes the "I follow the link in the email" step. (#172, #173)
+  - It works for emails with and without explicit html parts
+  - There's a better error message if no links are found
+
+## 4.1.2
+- Multiple invocations of console don't raise anymore
+
 ## 4.1.1
 - The step `I open .. in a new browser tab` is now using the `noopener` option (see issue [#174])
 

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

@@ -21,7 +21,7 @@ Or install it yourself as:
 
 ## Supported versions
 
-Spreewald is currently tested against Ruby 2.4.5 with Rails 4 and Capybara 2 and Ruby 2.6.6 with Rails 6 and Capybara 3.
+Spreewald is currently tested against and Ruby 2.6.6 with Rails 6 and Capybara 3.
 
 ## Usage
 
@@ -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
@@ -72,15 +74,7 @@ end
 
 def cucumber_command(directory, ruby_version)
   command = "cd #{directory} && BUNDLE_GEMFILE=Gemfile bundle exec cucumber --publish-quiet"
-  if Gem::Version.new(ruby_version) > Gem::Version.new('2.5')
-    # Modern cucumber sees pending tests as failures.
-    # We don't want this.
-    command << ' --no-strict-pending'
-  else
-    # Ruby < 2.5 means the capybara 2 Test project.
-    # Omit scenarios that only work with modern Capybara.
-    command << ' --tags "not @not-capybara-2"'
-  end
+  command << ' --no-strict-pending'
   command
 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/development_steps.rb

@@ -11,11 +11,6 @@ Then 'console' do
   require 'irb'
   ARGV.clear # IRB takes ARGV as its own arguments
 
-  # `source` is defined by Capybara as a shortcut to `page.source`. IRB tries to
-  # create an alias with the same name and fails with a warning. To avoid this,
-  # we remove the alias here.
-  undef :source
-
   # We adapted the steps of IRB.run
   # https://github.com/ruby/ruby/blob/c08f7b80889b531865e74bc5f573df8fa27f2088/lib/irb.rb#L418
   # with injected workspace. See https://github.com/makandra/spreewald/issues/77 for reasons.
@@ -24,6 +19,11 @@ Then 'console' do
   # "already initialized constant" warnings
   unless IRB.conf[:LOAD_MODULES]
     IRB.setup(nil)
+
+    # `source` is defined by Capybara as a shortcut to `page.source`. IRB tries to
+    # create an alias with the same name and fails with a warning. To avoid this,
+    # we remove the alias here.
+    undef :source
   end
 
   workspace = IRB::WorkSpace.new(binding)

data/lib/spreewald/email_steps.rb

@@ -1,6 +1,8 @@
 # coding: UTF-8
 
 require 'spreewald_support/mail_finder'
+require 'steps/show_me_the_mails'
+require 'steps/follow_the_link'
 
 Before do
   ActionMailer::Base.deliveries.clear
@@ -73,18 +75,7 @@ end.overridable
 # Other links (such as mailto: or ftp:// links) are ignored.
 When /^I follow the (first|second|third)? ?link in the e?mail$/ do |index_in_words|
   mail = @mail || ActionMailer::Base.deliveries.last
-  index = { nil => 0, 'first' => 0, 'second' => 1, 'third' => 2 }[index_in_words]
-  url_pattern = %r((?:https?://[^/]+)([^"'\s]+))
-
-  paths = if mail.html_part
-    dom = Nokogiri::HTML(mail.html_part.body.to_s)
-    (dom / 'a[href]').map { |a| a['href'].match(url_pattern) }.compact.map { |match| match[1] }
-  else
-    mail_body = MailFinder.email_text_body(mail).to_s
-    mail_body.scan(url_pattern).flatten(1)
-  end
-
-  visit paths[index]
+  Spreewald::Steps::FollowTheLink.new(mail, index_in_words).run
 end.overridable
 
 Then /^no e?mail should have been sent$/ do
@@ -98,12 +89,7 @@ end.overridable
 
 # Print all sent emails to STDOUT (optionally only the headers).
 Then /^show me the e?mail( header)?s$/ do |only_header|
-  if ActionMailer::Base.deliveries.empty?
-    puts MailFinder.show_mails(ActionMailer::Base.deliveries, only_header)
-  else
-    puts "No emails found" if ActionMailer::Base.deliveries.empty?
-  end
-
+  Spreewald::Steps::ShowMeTheMails.new(ActionMailer::Base.deliveries, only_header).run
 end.overridable
 
 # Print a subset of all sent emails to STDOUT