spreewald 3.0.2 → 4.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 13490aa27d2ade6a30674d36cbe3374b0d4e6f4687958300b56047b2033a49b3
-  data.tar.gz: 897b9e7881f0f50f32aa8c78afac85380a281e39bf25e007694bf9bb07654efc
+  metadata.gz: a4c751f9710de7f192ae23a8184dd2f7a929c2a9381f6fd3ee11e7f84c2012e4
+  data.tar.gz: 5f94bfcf3744f8f2f44d688129c4e490e98b987eb2c97116431c8e56a5b9714c
 SHA512:
-  metadata.gz: f5653340cf2ae8b8f3aaabb29a47df7854e86fe1c88ef49310f583c7733e9ef8e49867e914ca4547a6b3ed3ee2f78dc4dc26a9c9dbda67ff426b38532efa8596
-  data.tar.gz: b00d439380d560f792963261900b3840733c0a2f394da89de984ea3a3469b0ee549b30ea84491fcc2017eaebf3e15ce622439dac5ea55f1b94d7c4258fe8b179
+  metadata.gz: 63d52ea274f3d44d63c460fd29adf935c77790093010b4dcfe2ddadf5a6f57a64407eeef686ad35acca5ee0ad79d2d0e6977886cad4d06ac17ba011c0b5287e7
+  data.tar.gz: 52dea6eae2351828a62aafc3d31fba6c0e156981c530cd8f67b3f0623516cea06ffe239af78b90562304cb5158e0bc5fc4836a28d02baae26b1401bee9236cc9

data/.github/workflows/test.yml

@@ -0,0 +1,42 @@
+---
+name: Tests
+'on':
+  push:
+    branches:
+    - master
+  pull_request:
+    branches:
+    - master
+jobs:
+  test:
+    runs-on: ubuntu-20.04
+    strategy:
+      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
+          gemfile: Gemfile.ruby300
+    env:
+      BUNDLE_GEMFILE: "${{ matrix.gemfile }}"
+    steps:
+    - uses: actions/checkout@v2
+    - name: Install ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: "${{ matrix.ruby }}"
+    - name: Bundle
+      run: |
+        gem install bundler:1.17.3
+        bundle install --no-deployment
+    - name: Run tests
+      run: bundle exec rake matrix:single_test[${{ matrix.gemfile }},${{ matrix.ruby }}]

data/.ruby-version

@@ -1 +1 @@
-2.4.5
+3.0.0

data/CHANGELOG.md

@@ -3,6 +3,35 @@ 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.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])
+
+## 4.1.0
+
+- New steps:
+  - When ... inside the ... iframe
+
+- New steps only available for Capybara 3+:
+  - When I switch to the ... iframe
+  - When I switch back to the whole page
+  - The I switch back to the whole page step does not work reliably with Capybara 2 and lead to StaleReferenceErrors, therefore we decided to not make these steps available for Capybara 2.
+
+- Small improvements:
+  - Trying to match against unsupported email headers will raise an error. Supported headers are "To", "CC", "BCC", "From", "Reply-To", "Subject", "Attachments"
+  - It's now possible to have indented header lines in email steps.
+  - If there's not an explicit text part in a mail, Spreewald determines if the email body is HTML or plaintext and converts it to plaintext accordingly.
+
+## 4.0.0
+
+- Dropped support for capybara 1, Ruby 2.1 and Rails 3.2. 
+
+## 3.0.3
+
+- The `an email should have been sent with` step now interprets all lines as body when not specifying headers (see issue [#157](https://github.com/makandra/spreewald/issues/157))
+
 ## 3.0.2
 
 - Introduce wildcard for the beginning of a line. (see issue [#155](https://github.com/makandra/spreewald/issues/155))

data/Gemfile

@@ -1,4 +1,4 @@
 source 'https://rubygems.org'
 
 gem 'rake'
-gem 'gemika'
+gem 'gemika'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    gemika (0.4.0)
+    gemika (0.5.0)
     rake (12.3.2)
 
 PLATFORMS
@@ -12,4 +12,4 @@ DEPENDENCIES
   rake
 
 BUNDLED WITH
-   1.17.3
+   2.2.3

data/Gemfile.ruby245

@@ -1,7 +1,10 @@
 source 'https://rubygems.org'
 
+gem 'rake'
 gem 'rspec'
 gem 'cucumber'
 gem 'aruba'
 
 gem 'gemika'
+gem 'mail'
+gem 'nokogiri'

data/Gemfile.ruby245.lock

@@ -31,10 +31,16 @@ GEM
     cucumber-wire (0.0.1)
     diff-lcs (1.3)
     ffi (1.10.0)
-    gemika (0.3.4)
+    gemika (0.5.0)
     gherkin (5.1.0)
+    mail (2.7.1)
+      mini_mime (>= 0.1.1)
+    mini_mime (1.0.1)
+    mini_portile2 (2.4.0)
     multi_json (1.13.1)
     multi_test (0.1.2)
+    nokogiri (1.10.10)
+      mini_portile2 (~> 2.4.0)
     rake (12.3.2)
     rspec (3.8.0)
       rspec-core (~> 3.8.0)
@@ -58,7 +64,10 @@ DEPENDENCIES
   aruba
   cucumber
   gemika
+  mail
+  nokogiri
+  rake
   rspec
 
 BUNDLED WITH
-   1.17.3
+   2.2.4

data/Gemfile.ruby266

@@ -2,8 +2,11 @@ source 'https://rubygems.org'
 
 ruby '2.6.6'
 
+gem 'rake'
 gem 'rspec'
 gem 'cucumber'
 gem 'aruba'
 
 gem 'gemika'
+gem 'mail'
+gem 'nokogiri'

data/Gemfile.ruby266.lock

@@ -30,10 +30,17 @@ GEM
     cucumber-wire (0.0.1)
     diff-lcs (1.3)
     ffi (1.12.2)
-    gemika (0.4.0)
+    gemika (0.5.0)
     gherkin (5.1.0)
+    mail (2.7.1)
+      mini_mime (>= 0.1.1)
+    mini_mime (1.0.2)
     multi_json (1.14.1)
     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)
@@ -56,10 +63,13 @@ DEPENDENCIES
   aruba
   cucumber
   gemika
+  mail
+  nokogiri
+  rake
   rspec
 
 RUBY VERSION
    ruby 2.6.6p146
 
 BUNDLED WITH
-   2.1.4
+   2.2.14

data/{Gemfile.ruby218 → Gemfile.ruby300}

@@ -1,7 +1,12 @@
 source 'https://rubygems.org'
 
+ruby '3.0.0'
+
+gem 'rake'
 gem 'rspec'
-gem 'cucumber', '<3'
+gem 'cucumber'
 gem 'aruba'
 
 gem 'gemika'
+gem 'mail'
+gem 'nokogiri'

data/Gemfile.ruby300.lock

@@ -0,0 +1,108 @@
+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)
+      childprocess (>= 2.0, < 5.0)
+      contracts (~> 0.16.0)
+      cucumber (>= 2.4, < 6.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)
+      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)
+      diff-lcs (~> 1.4, >= 1.4.4)
+      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)
+    diff-lcs (1.4.4)
+    ffi (1.15.0)
+    gemika (0.5.0)
+    i18n (1.8.10)
+      concurrent-ruby (~> 1.0)
+    mail (2.7.1)
+      mini_mime (>= 0.1.1)
+    middleware (0.1.0)
+    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)
+      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.10.0)
+    rspec-mocks (3.10.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.2)
+    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
+
+DEPENDENCIES
+  aruba
+  cucumber
+  gemika
+  mail
+  nokogiri
+  rake
+  rspec
+
+RUBY VERSION
+   ruby 3.0.0p0
+
+BUNDLED WITH
+   2.2.3

data/README.md

@@ -19,9 +19,9 @@ Or install it yourself as:
     $ gem install spreewald
 
 
-## Supported RSpec versions
+## Supported versions
 
-Spreewald supports RSpec >= 2.13.0
+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.
 
 ## Usage
 
@@ -237,7 +237,9 @@ the step definitions.
   
         """
   
-  You may skip lines in the header, of course.
+  You may skip lines in the header.
+  Please note: In older versions of Spreewald, unmentioned body lines were skipped.
+  Now you have to use the asterisk explicitly to omit lines in the body.
 
 
 * **When I follow the (first|second|third)? link in the e?mail**
@@ -265,6 +267,42 @@ the step definitions.
   This uses the same syntax as `Then an email should have been sent with:`
 
 
+### frame_steps.rb 
+
+* **When ... inside the ... iframe**
+
+  You can append `inside the [name or number] iframe` to any other step.
+  Then the step will operate inside the given iframe.
+  Examples:
+  
+      Then I should see "Kiwi" inside the 1st iframe
+      Then I should see "Cherry" inside the fruits iframe
+      When I press "Save" inside the 2nd iframe
+
+
+
+* **When I switch to the ... iframe**
+
+  This step will switch to the iframe identified by its name or number.
+  All further steps will operate inside the iframe.
+  To switch to operating on the main page again, use the step
+  "I switch back to the whole page".
+  Examples:
+  
+      When I switch to the 1st iframe
+      When I switch to the fruits iframe
+  
+  Please note: This step is only available for Capybara >= 3.
+
+
+* **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`)
+  
+  Please note: This step is only available for Capybara >= 3.
+
+
 ### session_steps.rb 
 
 * **When ... in the browser session "..."**

data/Rakefile

@@ -10,28 +10,25 @@ end
 task :default => 'matrix:tests'
 
 namespace :matrix do
+  desc 'Run tests for a single row of the matrix'
+  task :single_test, [:gemfile, :ruby] do |_t, args|
+    gemfile = args[:gemfile]
+    ruby = args[:ruby]
 
-  desc "Run all tests which are available for current Ruby (#{RUBY_VERSION})"
-  task :tests do
-    Gemika::Matrix.from_travis_yml.each do |row|
-      directory = File.dirname(row.gemfile)
-      if directory.start_with?('tests')
-        # Run integration tests (uses embedded projects)
-        system(cucumber_command(directory, row.ruby))
-      else
-        # Run specs and tests for spreewald binary
-        [
-          system("BUNDLE_GEMFILE=#{row.gemfile} bundle exec rspec"),
-          system("BUNDLE_GEMFILE=#{row.gemfile} bundle exec cucumber"),
-        ].all?
-      end
+    if gemfile.nil? || ruby.nil?
+      warn 'Please state the Gemfile and Ruby version to be used for the Testrun!'
+    else
+      run_tests(gemfile, ruby)
     end
-
-    travis_yml = YAML.load_file('.travis.yml')
-    rubies = travis_yml.fetch('rvm') - [RUBY_VERSION]
-    puts "Please remember to run tests for the other ruby versions as well: #{rubies.join(", ")}"
   end
 
+
+  desc "Run all tests which are available for current Ruby (#{RUBY_VERSION})"
+  task :tests, [:gemfile, :ruby] do |_t, args|
+    Gemika::Matrix.from_ci_config.each do |row|
+      run_tests(row.gemfile, row.ruby)
+    end
+  end
 end
 
 
@@ -59,12 +56,30 @@ task :update_readme do
   puts '', '> Done (diff applied).'
 end
 
+def run_tests(gemfile, ruby)
+  directory = File.dirname(gemfile)
+  if directory.start_with?('tests')
+    # Run integration tests (uses embedded projects)
+    system(cucumber_command(directory, ruby))
+  else
+    # Run specs and integration tests for Spreewald binary
+    [
+      system("BUNDLE_GEMFILE=#{gemfile} bundle exec rspec"),
+      system("BUNDLE_GEMFILE=#{gemfile} bundle exec cucumber --publish-quiet"),
+    ].all?
+  end
+end
+
 def cucumber_command(directory, ruby_version)
-  command = "cd #{directory} && BUNDLE_GEMFILE=Gemfile geordi cucumber"
+  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
 end