cucumber-rails 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eba00efc3e821aa337c9e16993ba558c1a5f1c795c5db9fb00104f5de38839cd
-  data.tar.gz: af9a02416bdeda7f9d3c1c3600df92ff2248788909c1f18ff333223c025e64cc
+  metadata.gz: ab9079b1b0b5cbf30f04627c088e6e73a78804c68852b02b834439892d579001
+  data.tar.gz: 244214de463e90d6b73fd09dd5316b5a68de6397f816a68d64710986445303e7
 SHA512:
-  metadata.gz: c711b5a237e9d4e9e53936e2d9836d74f58604a864769c91758a00a742649945e2a798ea4881b26466a21307bed029dac6f36f5dc54650e406133fd27d35c82e
-  data.tar.gz: 499ba57f75835fc6ca390e7c313e7dd442a1b92cddb30b516841892bd15223ecd41b595e885e7bb3dbe890847f7a1e03b0c9195656b0a6e7915d19af67d5d59d
+  metadata.gz: eb770970489ece31916eb57934a5bf9873db51377e6588f1b1150403c3ffd7ce735afd90481a49c497bfe24e9f2d744bcde22e1908db9f2459edd83f205e387f
+  data.tar.gz: ca257e8a0ea4f794323c3aff7597c73d96189f057be11339369c2f87aed77c9c47b3d7df9ad914006277edcc24d371cf7c28552751b0b9f91cf3f2d95029365d

data/Appraisals

@@ -1,35 +1,26 @@
 # frozen_string_literal: true
 
-appraise 'rails_4_2' do
-  gem 'capybara', '< 3.16.0', platform: :mri_23
-  gem 'nokogiri', '< 1.9.1', platform: :mri_23
-  gem 'railties', '~> 4.2.11'
-  gem 'sqlite3', '~> 1.3.13'
-end
-
 appraise 'rails_5_0' do
-  gem 'capybara', '< 3.16.0', platform: :mri_23
-  gem 'nokogiri', '< 1.9.1', platform: :mri_23
-  gem 'railties', '~> 5.0.7'
+  gem 'capybara', '< 3'
+  gem 'cucumber', '< 4'
+  gem 'rails', '~> 5.0.7'
   gem 'sqlite3', '~> 1.3.13'
 end
 
 appraise 'rails_5_1' do
-  gem 'capybara', '< 3.16.0', platform: :mri_23
-  gem 'nokogiri', '< 1.9.1', platform: :mri_23
-  gem 'railties', '~> 5.1.7'
+  gem 'capybara', '< 3.15'
+  gem 'cucumber', '< 5'
+  gem 'rails', '~> 5.1.7'
   gem 'sqlite3', '~> 1.3.13'
 end
 
 appraise 'rails_5_2' do
-  gem 'capybara', '< 3.16.0', platform: :mri_23
-  gem 'nokogiri', '< 1.9.1', platform: :mri_23
-  gem 'railties', '~> 5.2.0'
+  gem 'capybara', '< 3.33'
+  gem 'rails', '~> 5.2.4'
   gem 'sqlite3', '~> 1.3.13'
 end
 
 appraise 'rails_6_0' do
-  gem 'railties', '~> 6.0.0'
-  gem 'rails',    '~> 6.0.0'
+  gem 'rails',    '~> 6.0.3'
   gem 'sqlite3', '~> 1.4'
 end

data/CHANGELOG.md

@@ -5,15 +5,23 @@ on how to contribute to Cucumber.
 
 ### New Features
 
- * 
-
+ * Added more documentation and tests around Javascript tagged scenarios
+   ([#480](https://github.com/cucumber/cucumber-rails/pull/480) [luke-hill])
+   
 ### Changed
 
- *
+ * Dropped Rails 4.2 support ([#392](https://github.com/cucumber/cucumber-rails/pull/392) [deivid-rodriguez])
 
 ### Fixed
 
- *
+ * Database cleaning no longer silently fails when using database_cleaner v2 adapter gems
+   ([#467](https://github.com/cucumber/cucumber-rails/pull/467) [botandrose])
+   
+ * Restored compatibility with `database_cleaner` versions earlier than 1.8.0.beta
+   ([#473](https://github.com/cucumber/cucumber-rails/pull/473) [cgriego])
+   
+ * Restored previous `database_cleaner` behavior for apps that do not use/load ActiveRecord
+   ([#474](https://github.com/cucumber/cucumber-rails/pull/474) [cgriego])
 
 ## [v2.1.0](https://github.com/cucumber/cucumber-rails/compare/v2.0.0...v2.1.0) (2020-06-15)
 
@@ -619,3 +627,5 @@ and to celebrate that cucumber-rails now supports Capybara as an alternative to
 [damonjmurray]: https://github.com/damonjmurray
 [orien]: https://github.com/orien
 [wagenet]: https://github.com/wagenet
+[cgriego]: https://github.com/cgriego
+[botandrose]: https://github.com/botandrose

data/CONTRIBUTING.md

@@ -29,11 +29,23 @@ This document is a guide for those maintaining Cucumber-Rails, and others who wo
     bundle install
     bin/install_geckodriver.sh
     bin/install_webpacker.sh
-    # Then to run tests on one specific gemfile (i.e. Rails 4.2), run
-    bundle exec appraisal rails_4_2 rake test
+    # Then to run tests on one version-specific Gemfile (e.g. gemfiles/rails_6_0.gemfile), run
+    bundle exec appraisal rails_6_0 rake test
     # Or run tests across the full supported stack. Note that because we support many versions. This takes 5-10 minutes
     bundle exec rake appraisal
 
+## Updating Appraisal gems / dependencies of cucumber-rails
+
+To remove and rebuild the different gemfiles (for example, to update a rails version or its
+dependencies), use the following:
+
+    [bundle exec] appraisal update
+
+If you've changed versions of the dependencies, you may find it helpful to forcefully clean
+each appraisal's gem lock file in `gemfiles/`. You can do this using:
+
+    [bundle exec] rake clean
+    
 ## Release Process
 
 * Make sure `CHANGELOG.md` is updated with the upcoming version number, and has entries for all fixes.

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright (c) 2008-2019 Aslak Hellesøy and the Cucumber Team.
+Copyright (c) 2008-2020 Aslak Hellesøy and the Cucumber Team.
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -5,7 +5,7 @@
 [![Code Climate](https://codeclimate.com/github/cucumber/cucumber-rails.svg)](https://codeclimate.com/github/cucumber/cucumber-rails)
 [![Open Source Helpers](https://www.codetriage.com/cucumber/cucumber-rails/badges/users.svg)](https://www.codetriage.com/cucumber/cucumber-rails)
 
-Cucumber-Rails brings Cucumber to Rails 4.2, 5.x and 6.x.
+Cucumber-Rails brings Cucumber to Rails 5.x and 6.x.
 
 ## Installation
 
@@ -108,17 +108,7 @@ all gemfiles, run the following commands:
 
 To run the suite against a named gemfile, use the following:
 
-    [bundle exec] appraisal rails_4_2 rake test
-
-To remove and rebuild the different gemfiles (for example, to update a rails version or its
-dependencies), use the following:
-
-    [bundle exec] appraisal update
-
-If you've changed versions of the dependencies, you may find it helpful to forcefully clean
-each appraisal's gem lock file in `gemfiles/`. You can do this using:
-
-    [bundle exec] rake clean
+    [bundle exec] appraisal rails_6_0 rake test
 
 ### Adding dependencies
 

data/Rakefile

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 CUCUMBER_RAILS_VERSION =
-  Gem::Specification.load(File.dirname(__FILE__) + '/cucumber-rails.gemspec').version.version
+  Gem::Specification.load("#{File.dirname(__FILE__)}/cucumber-rails.gemspec").version.version
 require 'rubygems'
 require 'bundler'
 require 'bundler/setup'
@@ -11,7 +11,7 @@ require 'rake/clean'
 require 'pathname'
 Bundler::GemHelper.install_tasks
 
-$LOAD_PATH.unshift(File.dirname(__FILE__) + '/lib')
+$LOAD_PATH.unshift("#{File.dirname(__FILE__)}/lib")
 Dir["#{File.dirname(__FILE__)}/dev_tasks/*.rake"].sort.each { |ext| load ext }
 
 CLEAN.include('doc', 'tmp')
@@ -26,11 +26,11 @@ namespace :test do
     Rake::Task['appraisal'].invoke('test')
   end
 
-  desc 'Run tests against specified gemfile, e.g. rake test:gemfile[rails_3_0]'
+  desc 'Run tests against specified gemfile, e.g. rake test:gemfile[rails_6_0]'
   task :gemfile, :name do |_task, args|
     unless args.name && Pathname.new("gemfiles/#{args.name}.gemfile").exist?
       raise ArgumentError, "You must provide the name of an existing Appraisal gemfile,
-        e.g. 'rake test:gemfile[rails_4_2]'"
+        e.g. 'rake test:gemfile[rails_6_0]'"
     end
 
     Rake::Task["appraisal:#{args.name}"].invoke('test')

data/bin/install_geckodriver.sh

@@ -8,7 +8,7 @@ curl --silent \
      --fail \
      --retry 3 \
      --output /tmp/geckodriver_linux64.tar.gz \
-     https://github.com/mozilla/geckodriver/releases/download/v0.24.0/geckodriver-v0.24.0-linux64.tar.gz
+     https://github.com/mozilla/geckodriver/releases/download/v0.27.0/geckodriver-v0.27.0-linux64.tar.gz
 
 sudo tar -C /usr/local/bin -xvzf /tmp/geckodriver_linux64.tar.gz geckodriver
 

data/cucumber-rails.gemspec

@@ -1,10 +1,11 @@
 # frozen_string_literal: true
 
+require 'rake/file_list'
 $LOAD_PATH.unshift File.expand_path('lib', __dir__)
 
 Gem::Specification.new do |s|
   s.name        = 'cucumber-rails'
-  s.version     = '2.1.0'
+  s.version     = '2.2.0'
   s.authors     = ['Aslak Hellesøy', 'Dennis Blöte', 'Rob Holland']
   s.description = 'Cucumber Generator and Runtime for Rails'
   s.summary     = "#{s.name}-#{s.version}"
@@ -21,11 +22,11 @@ Gem::Specification.new do |s|
     'source_code_uri' => "https://github.com/cucumber/cucumber-rails/tree/v#{s.version}"
   }
 
-  s.add_runtime_dependency('capybara', ['>= 2.12', '< 4'])
-  s.add_runtime_dependency('cucumber', ['>= 3.0.2', '< 5'])
-  s.add_runtime_dependency('mime-types', ['>= 2.0', '< 4'])
-  s.add_runtime_dependency('nokogiri', '~> 1.8')
-  s.add_runtime_dependency('rails', ['>= 4.2', '< 7'])
+  s.add_runtime_dependency('capybara', ['>= 2.18', '< 4']) # We support legacy capybara (But only the last 2.x)
+  s.add_runtime_dependency('cucumber', ['>= 3.0.2', '< 6']) # Support cucumber in the 3.x / 4.x / 5.x revisions
+  s.add_runtime_dependency('mime-types', ['~> 3.2']) # Only support the latest major (3+ years old)
+  s.add_runtime_dependency('nokogiri', '~> 1.8') # Only support the latest major (3+ years old)
+  s.add_runtime_dependency('rails', ['>= 5.0', '< 7']) # We support any version of Rails in the 5.x and 6.x series
 
   # Main development dependencies
   s.add_development_dependency('ammeter', '>= 1.1.4')
@@ -34,9 +35,10 @@ Gem::Specification.new do |s|
   s.add_development_dependency('bundler', '>= 1.17')
   s.add_development_dependency('rake', '>= 12.0')
   s.add_development_dependency('rspec', '~> 3.6')
-  s.add_development_dependency('rubocop', '~> 0.85.0')
-  s.add_development_dependency('rubocop-performance', '~> 1.6.1')
-  s.add_development_dependency('rubocop-rspec', '~> 1.39.0')
+  s.add_development_dependency('rubocop', '~> 0.89.0')
+  s.add_development_dependency('rubocop-packaging', '~> 0.3.0')
+  s.add_development_dependency('rubocop-performance', '~> 1.7.1')
+  s.add_development_dependency('rubocop-rspec', '~> 1.42.0')
   s.add_development_dependency('sqlite3', '~> 1.3')
 
   # For Documentation:
@@ -45,7 +47,7 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = '>= 2.4.0'
   s.rubygems_version = '>= 1.6.1'
-  s.files            = `git ls-files`.split("\n")
-  s.test_files       = `git ls-files -- {spec,features}/*`.split("\n")
+  s.files            = Rake::FileList['**/*'].exclude(*File.read('.gitignore').split)
+  s.test_files       = Dir['{spec,features}/**/*']
   s.require_path     = 'lib'
 end

data/dev_tasks/yard.rake

@@ -3,7 +3,7 @@
 require 'yard'
 require 'yard/rake/yardoc_task'
 
-SITE_DIR = File.expand_path(File.dirname(__FILE__) + '/../cucumber.github.com')
+SITE_DIR = File.expand_path("#{File.dirname(__FILE__)}/../cucumber.github.com")
 API_DIR = File.join(SITE_DIR, 'api', 'cucumber-rails', 'ruby', 'yardoc')
 
 namespace :api do

data/dev_tasks/yard/default/layout/html/setup.rb

@@ -4,6 +4,6 @@ def init
   super
   options[:serializer].serialize(
     '/images/bubble_32x32.png',
-    IO.read(File.dirname(__FILE__) + '/bubble_32x32.png')
+    IO.read("#{File.dirname(__FILE__)}/bubble_32x32.png")
   )
 end

data/features/capybara_javascript_drivers.feature

@@ -1,13 +1,10 @@
-@focus
 Feature: Capybara Javascript Drivers
 
-  Background: A simple calendar app
+  Scenario: Use a particular driver
     Given I have created a new Rails app and installed cucumber-rails
     And I force selenium to run Firefox in headless mode
     When I run `bundle exec rails g scaffold appointment name:string when:datetime`
-
-  Scenario: Use a particular driver
-    When I write to "features/create_appointment.feature" with:
+    And I write to "features/create_appointment.feature" with:
       """
       @javascript
       Feature: Create appointments
@@ -50,7 +47,10 @@ Feature: Capybara Javascript Drivers
       """
 
   Scenario: Mixed DB access
-    When I write to "features/create_appointment.feature" with:
+    Given I have created a new Rails app and installed cucumber-rails
+    And I force selenium to run Firefox in headless mode
+    When I run `bundle exec rails g scaffold appointment name:string when:datetime`
+    And I write to "features/create_appointment.feature" with:
       """
       @javascript
       Feature: Create appointments
@@ -80,3 +80,53 @@ Feature: Capybara Javascript Drivers
       1 scenario (1 passed)
       3 steps (3 passed)
       """
+
+  Scenario: Use a particular driver without a DB
+    Given I have created a new Rails app and installed cucumber-rails without database_cleaner
+    And I force selenium to run Firefox in headless mode
+    When I run `bundle exec rails g scaffold appointment name:string when:datetime`
+    And I write to "features/create_appointment.feature" with:
+      """
+      @javascript
+      Feature: Create appointments
+        Scenario: Visit the Constitution on May 17
+          Given I am on the new appointment page
+          And I fill in "Norway's constitution" for "Name"
+          And I select "2015-02-20 15:10:00 UTC" as the "When" date and time
+          And I press "Create Appointment"
+          Then I should see "Norway's constitution"
+          And I should see "2015-02-20 15:10:00 UTC"
+      """
+    And I write to "features/create_appointment_steps.rb" with:
+      """
+      Given('I am on the new appointment page') do
+        visit new_appointment_path
+      end
+
+      When('I fill in {string} for {string}') do |value, field|
+        fill_in(field, with: value)
+      end
+
+      When('I press {string}') do |button|
+        click_button(button)
+      end
+
+      Then('I should see {string}') do |text|
+        expect(page).to have_content(text)
+      end
+
+      When('I select {string} as the {string} date and time') do |datetime, selector|
+        select_datetime(datetime, from: selector)
+      end
+      """
+    And I append to "features/support/env.rb" with:
+      """
+        Cucumber::Rails::Database.autorun_database_cleaner = false
+      """
+    And I run `bundle exec rake db:migrate`
+    And I run `bundle exec rake cucumber`
+    Then the feature run should pass with:
+      """
+      1 scenario (1 passed)
+      6 steps (6 passed)
+      """

data/features/database_cleaner.feature

@@ -1,6 +1,6 @@
 Feature: Database Cleaner
 
-  Scenario: Create records in background
+  Scenario: Create records in background with database_cleaner
     Given I have created a new Rails app and installed cucumber-rails
     When I write to "features/widgets.feature" with:
       """
@@ -42,3 +42,90 @@ Feature: Database Cleaner
       2 scenarios (2 passed)
       6 steps (6 passed)
       """
+
+  Scenario: Create records in background with database_cleaner-active_record
+    Given I have created a new Rails app and installed cucumber-rails with database_cleaner-active_record
+    When I write to "features/widgets.feature" with:
+      """
+      Feature: Create widgets
+        Background: 2 initial widgets
+          Given I have 2 widgets
+
+        Scenario: Add 3 widgets
+          When I create 3 more widgets
+          Then I should have 5 widgets
+
+        Scenario: Add 7 widgets
+          When I create 7 more widgets
+          Then I should have 9 widgets
+      """
+    And I run `rails generate model widget name:string`
+    And I write to "features/step_definitions/widget_steps.rb" with:
+      """
+      Given('I have {int} widgets') do |number|
+        number.times do |i|
+          Widget.create! name: "Widget #{Widget.count + i}"
+        end
+      end
+
+      When('I create {int} more widgets') do |number|
+        number.times do |i|
+          Widget.create! name: "Widget #{Widget.count + i}"
+        end
+      end
+
+      Then('I should have {int} widgets') do |number|
+        expect(Widget.count).to eq(number)
+      end
+      """
+    And I run `bundle exec rake db:migrate`
+    And I run `bundle exec rake cucumber`
+    Then the feature run should pass with:
+      """
+      2 scenarios (2 passed)
+      6 steps (6 passed)
+      """
+
+  Scenario: Create records in background without using database_cleaner
+    Given I have created a new Rails app and installed cucumber-rails without database_cleaner
+    When I write to "features/widgets.feature" with:
+      """
+      Feature: Create widgets
+        Background: 2 initial widgets
+          # Note this creates 2 widgets each time
+          Given I have 2 widgets
+
+        Scenario: Add 3 widgets
+          When I create 3 more widgets
+          Then I should have 5 widgets
+
+        Scenario: Add 7 widgets
+          When I create 7 more widgets
+          Then I should have 14 widgets
+      """
+    And I run `rails generate model widget name:string`
+    And I write to "features/step_definitions/widget_steps.rb" with:
+      """
+      Given('I have {int} widgets') do |number|
+        number.times do |i|
+          Widget.create! name: "Widget #{Widget.count + i}"
+        end
+      end
+
+      When('I create {int} more widgets') do |number|
+        number.times do |i|
+          Widget.create! name: "Widget #{Widget.count + i}"
+        end
+      end
+
+      Then('I should have {int} widgets') do |number|
+        expect(Widget.count).to eq(number)
+      end
+      """
+    And I run `bundle exec rake db:migrate`
+    And I run `bundle exec rake cucumber`
+    Then the feature run should pass with:
+      """
+      2 scenarios (2 passed)
+      6 steps (6 passed)
+      """