cucumber-rails 1.8.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4583ae621b7346d537d3ab6e4e66da4f39b99c04e5403aab0d94a60fa9e20142
-  data.tar.gz: 832a66009f3801b9a1efb43d7a83a853076465afbbcaf2b44fbc2b25514fae75
+  metadata.gz: aea01cd8d17a13c8f43f785981239c8aeb28202591bce35bedeee997ac2c25ea
+  data.tar.gz: f021c09f4793b9e179f80214d6572498645fd65a007a5e17121a91a73effc3a4
 SHA512:
-  metadata.gz: ab69574710466da0405aa96555ade3c78a5013f29181534908bdfd6fc92157fe9410fc65228920a90cdfc1862079573754aa63beaeff53229fa2574b6f3a09a8
-  data.tar.gz: 31f270978a478b0ca111271417f19325b60e7d1f6823abddc62598ae0fabcfc9c93dfc494775d7c8451e08b2dc9c3b4e9f296148552b766272dc99793487df6b
+  metadata.gz: b90e398bf55e9bb8d3f5eb267bd981ba16929f16c2be420829da9498ba4c077f9ba37652a6744ac57a1a96653b2bccf1d0bc57b40aa1700a89725dfd9a95179c
+  data.tar.gz: 80ee71f600ddff221964012001529345b769503f12b9124257ddca788e8a27e132c62a71a712b80f1d4bd7b314ddfad7c32a741a314fac386d9fad7bb0c0c3f8

data/.rspec

@@ -1 +1,4 @@
---format progress --colour
+--format progress
+--color
+--order random
+--require spec_helper

data/.rubocop.yml

@@ -7,9 +7,6 @@ require:
 AllCops:
   TargetRubyVersion: 2.3
   Exclude:
-    # This file is something which we aren't advising people to use
-    # Probably need to consider deleting this fully at some point
-    - 'features/support/legacy_web_steps_support.rb'
     # These are auto-generated from a load of features that we
     # don't have direct control over
     - 'tmp/**/*'

data/Appraisals

@@ -17,19 +17,19 @@ 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.0'
+  gem 'railties', '~> 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.3'
+  gem 'railties', '~> 5.2.0'
   gem 'sqlite3', '~> 1.3.13'
 end
 
 appraise 'rails_6_0' do
-  gem 'railties', '~> 6.0.0.rc2'
-  gem 'rails',    '~> 6.0.0.rc2'
+  gem 'railties', '~> 6.0.0'
+  gem 'rails',    '~> 6.0.0'
   gem 'sqlite3', '~> 1.4'
 end

data/CHANGELOG.md

@@ -1,15 +1,35 @@
 Please see [CONTRIBUTING.md](https://github.com/cucumber/cucumber/blob/master/CONTRIBUTING.md) on how to contribute to Cucumber.
 
-## [master](https://github.com/cucumber/cucumber-rails/compare/v1.8.0...master) (Not yet released)
+## [master](https://github.com/cucumber/cucumber-rails/compare/v2.0.0...master) (Not yet released)
+
+### New Features
+
+ * 
 
 ### Changed
 
  * 
-   
+
 ### Fixed
 
  * 
 
+## [v2.0.0](https://github.com/cucumber/cucumber-rails/compare/v1.8.0...v2.0.0) (Not yet released)
+
+### New Features
+
+ * New functionality allows users to Configure whether `Rack::Test` methods get auto-mixed in
+   * Setting `ENV['CR_REMOVE_RACK_TEST_HELPERS] = "true"` will remove these methods from the `World`
+   ([#440](https://github.com/cucumber/cucumber-rails/pull/440) [luke-hill])
+
+### Changed
+
+ * **Breaking change:** `web_steps` have been completely removed from cucumber-rails
+   ([#437](https://github.com/cucumber/cucumber-rails/pull/437) [luke-hill])
+   
+ * Altered some branching logic in tests designed to cater for old ruby/rails versions
+   ([#433](https://github.com/cucumber/cucumber-rails/pull/433) [luke-hill])
+
 ## [v1.8.0](https://github.com/cucumber/cucumber-rails/compare/v1.7.0..v1.8.0) (2019-08-06)
 
 ### Changed

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, Rails 5.x and Rails 6.0.
+Cucumber-Rails brings Cucumber to Rails 4.2, 5.x and 6.x.
 
 ## Installation
 
@@ -43,7 +43,8 @@ Without Rake:
 
 ## Configuration options
 
-By default, cucumber-rails runs `DatabaseCleaner.start` and `DatabaseCleaner.clean` before and after your scenarios. You can disable this behaviour like so:
+By default, cucumber-rails runs `DatabaseCleaner.start` and `DatabaseCleaner.clean`
+before and after your scenarios. You can disable this behaviour like so:
 
 ```ruby
 # features/support/env.rb
@@ -51,6 +52,12 @@ By default, cucumber-rails runs `DatabaseCleaner.start` and `DatabaseCleaner.cle
 Cucumber::Rails::Database.autorun_database_cleaner = false
 ```
 
+By default, cucumber-rails will auto mix-in the helpers from  `Rack::Test` into your default Cucumber World instance. You can prevent this behaviour like so:
+```ruby
+# features/support/env.rb
+ENV['CR_REMOVE_RACK_TEST_HELPERS'] = 'true'
+```
+
 ## Upgrading from a previous version
 
 When upgrading from a previous version it is recommended that you rerun:
@@ -59,14 +66,20 @@ When upgrading from a previous version it is recommended that you rerun:
 
 ## Bugs and feature requests
 
-The *only* way to have a bug fixed or a new feature accepted is to describe it with a Cucumber feature. Let's say you think you have found a bug in the cucumber:install generator. Fork this project, clone it to your workstation and check out a branch with a descriptive name:
+The *only* way to have a bug fixed or a new feature accepted is to describe it with a
+Cucumber feature. Let's say you think you have found a bug in the cucumber:install generator.
+Fork this project, clone it to your workstation and check out a branch with a descriptive name:
 
     git clone git@github.com:you/cucumber-rails.git
     git checkout -b bugfix/generator-fails-on-ruby-25
 
-Start by making sure you can run the existing features. Now, create a feature that demonstrates what's wrong. See the existing features for examples. When you have a failing feature that reproduces the bug, commit, push and send a pull request. Someone from the Cucumber-Rails team will review it and hopefully create a fix.
+Start by making sure you can run the existing features. Now, create a feature that demonstrates
+what's wrong. See the existing features for examples. When you have a failing feature that
+reproduces the bug, commit, push and send a pull request. Someone from the Cucumber-Rails team
+will review it and hopefully create a fix.
 
-If you know how to fix the bug yourself, make a second commit (after committing the failing feature) before you send the pull request.
+If you know how to fix the bug yourself, make a second commit (after committing the failing
+feature) before you send the pull request.
 
 ### Setting up your environment
 
@@ -85,7 +98,10 @@ With all dependencies installed, all specs and features should pass:
 
 ### Running Appraisal suite
 
-In order to test against multiple versions of key dependencies, the [Appraisal](https://github.com/thoughtbot/appraisal) is used to generate multiple gemfiles, stored in the `gemfiles/` directory. Normally these will only run on Travis; however, if you want to run the full test suite against all gemfiles, run the following commands:
+In order to test against multiple versions of key dependencies, the [Appraisal](https://github.com/thoughtbot/appraisal)
+gem is used to generate multiple gemfiles, stored in the `gemfiles/` directory.
+Normally these will only run on Travis; however, if you want to run the full test suite against
+all gemfiles, run the following commands:
 
     [bundle exec] appraisal install
     [bundle exec] appraisal rake test
@@ -94,11 +110,13 @@ 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:
+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:
+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
 
@@ -108,7 +126,8 @@ To support the multiple-gemfile testing, when adding a new dependency the follow
 
 1. If it's a runtime dependency of the gem, add it to the gemspec
 2. If it's a primary development dependency, add it to the gemspec
-3. If it's a dependency of a generated rails app in a test, add it to [the helper] that modifies that Gemfile.
+3. If it's a dependency of a generated rails app in a test, add it to [the helper] that
+modifies the `Gemfile`.
 
 For example, rspec is a primary development dependency, so it lives in the gemspec.
 

data/cucumber-rails.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift File.expand_path('lib', __dir__)
 
 Gem::Specification.new do |s|
   s.name        = 'cucumber-rails'
-  s.version     = '1.8.0'
+  s.version     = '2.0.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,8 +21,8 @@ Gem::Specification.new do |s|
 
   # Main development dependencies
   s.add_development_dependency('ammeter', '>= 1.1.4')
-  s.add_development_dependency('appraisal', '~> 2.2')
   s.add_development_dependency('aruba', '~> 0.14.4')
+  s.add_development_dependency('appraisal', '~> 2.2')
   s.add_development_dependency('bundler', '>= 1.17')
   s.add_development_dependency('rails', ['>= 4.2', '< 7'])
   s.add_development_dependency('rake', '>= 12.0')

data/features/annotations.feature

@@ -1,22 +1,20 @@
 Feature: Annotations
 
-  I order to track my development progress
+  In order to track my development progress
   As a developer
   I should be able to list annotations in my features
 
-  Background:
+  Scenario: See annotations in feature file
     Given I have created a new Rails app with no database and installed cucumber-rails
-    When I write to "features/tests.feature" with:
+    When I write to "features/products.feature" with:
       """
-      Feature: Tests
-        Scenario: Tests
+      Feature: Products
+        Scenario: Test a Product
           # TODO: When I go to the products page
       """
-
-  Scenario: See annotations in .feature file
     When I run `bundle exec rake notes`
     Then it should pass with:
       """
-      features/tests.feature:
-        * [ 3] [TODO] When I go to the products page
+      features/products.feature:
+        * [3] [TODO] When I go to the products page
       """

data/features/capybara_javascript_drivers.feature

@@ -5,12 +5,6 @@ Feature: Capybara Javascript Drivers
     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/step_definitions/date_time_steps.rb" with:
-      """
-      When('I select {string} as the {string} date and time') do |datetime, selector|
-        select_datetime(datetime, from: selector)
-      end
-      """
 
   Scenario: Use a particular driver
     When I write to "features/create_appointment.feature" with:
@@ -25,6 +19,28 @@ Feature: Capybara Javascript Drivers
           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 run `bundle exec rake db:migrate`
     And I run `bundle exec rake cucumber`
     Then the feature run should pass with:
@@ -40,18 +56,22 @@ Feature: Capybara Javascript Drivers
       Feature: Create appointments
         Scenario: Visit the Constitution on May 17
           Given a random appointment
-          And I am viewing a random appointment
+          And I am viewing the appointment
           Then I should see "Random appointment"
       """
-    And I write to "features/step_definitions/custom_steps.rb" with:
+    And I write to "features/step_definitions/create_appointment_steps.rb" with:
       """
       Given('a random appointment') do
         @appointment = Appointment.create!(name: 'Random appointment', when: DateTime.now)
       end
 
-      Given('I am viewing a random appointment') do
+      Given('I am viewing the appointment') do
         visit appointment_path(@appointment)
       end
+
+      Then('I should see {string}') do |text|
+        expect(page).to have_content(text)
+      end
       """
     And I run `bundle exec rake db:migrate`
     And I run `bundle exec rake cucumber`

data/features/configuration.feature

@@ -0,0 +1,48 @@
+Feature: Cucumber Rails Configuration
+
+  In order to configure how Cucumber-Rails runs
+  As a developer
+  I should be able to alter the settings of my project
+
+  Scenario: Default configuration
+    Given I have created a new Rails app with no database and installed cucumber-rails
+    When I write to "features/config.feature" with:
+      """
+      Feature: Rack Test Methods
+        Scenario: Default Methods are added to the World
+          Then Rack Test should be mixed into the Cucumber World
+      """
+    When I write to "features/step_definitions/config_steps.rb" with:
+      """
+      Then('Rack Test should be mixed into the Cucumber World') do
+        expect(self.class.ancestors).to include(Rack::Test::Methods)
+      end
+      """
+    And I run `bundle exec rake cucumber`
+    Then the feature run should pass with:
+      """
+      1 scenario (1 passed)
+      1 step (1 passed)
+      """
+
+  Scenario: Altered configuration
+    Given I have created a new Rails app with no database and installed cucumber-rails
+    And I set the environment variable "CR_REMOVE_RACK_TEST_HELPERS" to "true"
+    When I write to "features/config.feature" with:
+      """
+      Feature: Rack Test Methods
+        Scenario: Rack Test Methods can be removed from the world
+          Then Rack Test should not be mixed into the Cucumber World
+      """
+    When I write to "features/step_definitions/config_steps.rb" with:
+      """
+      Then('Rack Test should not be mixed into the Cucumber World') do
+        expect(self.class.ancestors).not_to include(Rack::Test::Methods)
+      end
+      """
+    And I run `bundle exec rake cucumber`
+    Then the feature run should pass with:
+      """
+      1 scenario (1 passed)
+      1 step (1 passed)
+      """

data/features/database_cleaner.feature

@@ -1,18 +1,18 @@
-Feature: DatabaseCleaner
+Feature: Database Cleaner
 
   Scenario: Create records in background
     Given I have created a new Rails app and installed cucumber-rails
     When I write to "features/widgets.feature" with:
       """
       Feature: Create widgets
-        Background: some widgets
+        Background: 2 initial widgets
           Given I have 2 widgets
 
-        Scenario: Add 3
+        Scenario: Add 3 widgets
           When I create 3 more widgets
           Then I should have 5 widgets
 
-        Scenario: Add 7
+        Scenario: Add 7 widgets
           When I create 7 more widgets
           Then I should have 9 widgets
       """

data/features/emulate_javascript.feature

@@ -1,25 +1,24 @@
 Feature: Emulate Javascript
 
-  Scenario: See a widget
+  Background:
     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 `rails generate scaffold widget name:string`
-    And I write to "features/f.feature" with:
-      """
-      @javascript
-      Feature: Widget inventory
-        Scenario: Delete a widget
-          Given there is a widget named "wrench"
-          When I go to the widgets page
-          Then I should see "wrench"
-      """
-    And I write to "features/step_definitions/s.rb" with:
-      """
+    And I write to "features/step_definitions/widget_steps.rb" with:
+    """
       Given('there is a widget named {string}') do |name|
         FactoryBot.create(:widget, name: name)
       end
+
+      When('I am on the widgets page') do
+        visit widgets_path
+      end
+
+      Then('I should see {string}') do |text|
+        expect(page).to have_content(text)
+      end
       """
-    And I write to "features/support/factories.rb" with:
+    And I write to "features/support/factories/widget.rb" with:
       """
       FactoryBot.define do
         factory :widget do
@@ -27,6 +26,17 @@ Feature: Emulate Javascript
         end
       end
       """
+
+  Scenario: See a widget
+    When I write to "features/widgets.feature" with:
+      """
+      @javascript
+      Feature: Widget inventory
+        Scenario: Delete a widget
+          Given there is a widget named "wrench"
+          And I am on the widgets page
+          Then I should see "wrench"
+      """
     And I run `bundle exec rake db:migrate`
     And I run `bundle exec rake cucumber`
     Then the feature run should pass with:
@@ -36,9 +46,7 @@ Feature: Emulate Javascript
       """
 
   Scenario: Pass on the CSRF token
-    Given I have created a new Rails app and installed cucumber-rails
-    When I run `rails generate scaffold widget name:string`
-    And I run `sed -i -e 's/forgery_protection *= false/forgery_protection = true/' config/environments/test.rb`
+    When I run `sed -i -e 's/forgery_protection *= false/forgery_protection = true/' config/environments/test.rb`
     And I run `rails generate controller session establish`
     And I write to "app/controllers/session_controller.rb" with:
       """
@@ -58,31 +66,38 @@ Feature: Emulate Javascript
         end
       end
       """
-    And I write to "features/f.feature" with:
+    And I write to "features/widgets.feature" with:
       """
       Feature: Widget inventory
         Scenario: Delete a widget
           Given there is a widget named "wrench"
-          When I go to the session establish page
-          And I go to the widgets page
+          And I am on the session establish page
+          And I am on the widgets page
           Then I should see "wrench"
           When I follow "Destroy"
           Then I should not see "denied"
           And I should be on the widgets page
           And I should not see "wrench"
       """
-    And I write to "features/step_definitions/s.rb" with:
+    And I append to "features/step_definitions/widget_steps.rb" with:
+      # TODO: Remove the newline below (Required) once bug is fixed: https://github.com/cucumber/aruba/issues/662
       """
-      Given('there is a widget named {string}') do |name|
-        FactoryBot.create(:widget, name: name)
+
+      Given('I am on the session establish page') do
+        visit session_establish_path
       end
-      """
-    And I write to "features/support/factories.rb" with:
-      """
-      FactoryBot.define do
-        factory :widget do
-          name { 'testwidget' }
-        end
+
+      When('I follow {string}') do |link|
+        click_link(link)
+      end
+
+      Then('I should not see {string}') do |text|
+        expect(page).not_to have_content(text)
+      end
+
+      Then('I should be on the widgets page') do
+        current_path = URI.parse(current_url).path
+        expect(current_path).to eq(widgets_path)
       end
       """
     And I run `bundle exec rake db:migrate`

data/features/install_cucumber_rails.feature

@@ -1,7 +1,7 @@
-Feature: Rails
-  In order to take over the world
-  Cucumber-Rails should work on major versions
-  of Rails and Ruby, with Capybara, Spork and DatabaseCleaner
+Feature: Install Cucumber Rails
+
+  Cucumber-Rails should work on supported versions
+  of Ruby on Rails, with Capybara and DatabaseCleaner
 
   Scenario: Install Cucumber-Rails
     Given I have created a new Rails app and installed cucumber-rails

data/features/no_database.feature

@@ -1,4 +1,5 @@
 Feature: No Database
+
   Allow Cucumber to work with a Rails app without a database
 
   Scenario: No ActiveRecord and DatabaseCleaner

data/features/raising_errors.feature

@@ -2,11 +2,17 @@ Feature: Raise Errors
 
   Scenario: Raise error for undefined route
     Given I have created a new Rails app with no database and installed cucumber-rails
-    When I write to "features/tests.feature" with:
+    When I write to "features/home.feature" with:
       """
       Feature: Tests
         Scenario: Tests
-          When I go to the products page
+          When I go to the home page
+      """
+    And I write to "features/home_steps.rb" with:
+      """
+      When('I go to the home page') do
+        visit('/')
+      end
       """
     And I run `bundle exec cucumber`
     Then it should fail with:

data/features/rerun_profile.feature

@@ -1,4 +1,5 @@
 Feature: Rerun profile
+
   In order to concentrate on failing features
   As a Rails developer working with Cucumber
   I want to rerun only failing features

data/features/rest_api.feature

@@ -28,13 +28,13 @@ Feature: REST API
             }
             \"\"\"
       """
-    And I write to "features/step_definitions/rest_steps.rb" with:
+    And I write to "features/step_definitions/post_steps.rb" with:
       """
       When('the client requests GET /{word}') do |path|
         get(path)
       end
 
-      Then(/^the response should be JSON:$/) do |json|
+      Then('the response should be JSON:') do |json|
         expect(JSON.parse(last_response.body)).to eq(JSON.parse(json))
       end
       """

data/features/step_definitions/cucumber_rails_steps.rb

@@ -3,20 +3,17 @@
 Given('I have created a new Rails app and installed cucumber-rails, accidentally outside of the test group in my Gemfile') do
   rails_new
   install_cucumber_rails :not_in_test_group
-  create_web_steps
 end
 
 Given('I have created a new Rails app and installed cucumber-rails') do
   rails_new
   install_cucumber_rails
-  create_web_steps
 end
 
 Given('I have created a new Rails app with no database and installed cucumber-rails') do
   rails_new args: '--skip-active-record'
   install_cucumber_rails :no_database_cleaner, :no_factory_bot
   overwrite_file('features/support/env.rb', "require 'cucumber/rails'\n")
-  create_web_steps
 end
 
 Given('I have a {string} ActiveRecord model object') do |name|
@@ -24,6 +21,19 @@ Given('I have a {string} ActiveRecord model object') do |name|
   run_command_and_stop('bundle exec rake db:migrate RAILS_ENV=test')
 end
 
+Given('I remove the {string} gem from the Gemfile') do |gem_name|
+  content = File.open(expand_path('Gemfile'), 'r').readlines
+  new_content = []
+
+  content.each do |line|
+    next if line =~ /gem ["|']#{gem_name}["|'].*/
+
+    new_content << line
+  end
+
+  overwrite_file('Gemfile', new_content.join("\r\n"))
+end
+
 Given('I force selenium to run Firefox in headless mode') do
   selenium_config = %{
     Capybara.register_driver :selenium do |app|
@@ -57,16 +67,3 @@ Then(/^the feature run should pass with:$/) do |string|
   step 'the exit status should be 0'
   step 'the output should contain:', string
 end
-
-Given('I remove the {string} gem from the Gemfile') do |gem_name|
-  content = File.open(expand_path('Gemfile'), 'r').readlines
-  new_content = []
-
-  content.each do |line|
-    next if line =~ /gem ["|']#{gem_name}["|'].*/
-
-    new_content << line
-  end
-
-  overwrite_file('Gemfile', new_content.join("\r\n"))
-end

data/features/support/cucumber_rails_helper.rb

@@ -46,10 +46,6 @@ module CucumberRailsHelper
     end
   end
 
-  def fixture(path)
-    File.expand_path(File.dirname(__FILE__) + "./../support/fixtures/#{path}")
-  end
-
   private
 
   def rails6?

data/features/support/env.rb

@@ -1,14 +1,6 @@
 # frozen_string_literal: true
 
 $LOAD_PATH.unshift(File.dirname(__FILE__) + '/../../lib')
-require 'rubygems'
-require 'bundler/setup'
+
 require 'rspec/expectations'
 require 'aruba/cucumber'
-
-After do |scenario|
-  if scenario.failed?
-    puts last_command_stopped.stdout
-    puts last_command_stopped.stderr
-  end
-end

data/features/support/hooks.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+After do |scenario|
+  if scenario.failed?
+    puts last_command_stopped.stdout
+    puts last_command_stopped.stderr
+  end
+end

data/gemfiles/rails_5_1.gemfile

@@ -4,7 +4,7 @@ source "https://rubygems.org"
 
 gem "capybara", "< 3.16.0", platform: :mri_23
 gem "nokogiri", "< 1.9.1", platform: :mri_23
-gem "railties", "~> 5.1.0"
+gem "railties", "~> 5.1.7"
 gem "sqlite3", "~> 1.3.13"
 
 gemspec path: "../"

data/gemfiles/rails_5_2.gemfile

@@ -4,7 +4,7 @@ source "https://rubygems.org"
 
 gem "capybara", "< 3.16.0", platform: :mri_23
 gem "nokogiri", "< 1.9.1", platform: :mri_23
-gem "railties", "~> 5.2.3"
+gem "railties", "~> 5.2.0"
 gem "sqlite3", "~> 1.3.13"
 
 gemspec path: "../"

data/gemfiles/rails_6_0.gemfile

@@ -2,8 +2,8 @@
 
 source "https://rubygems.org"
 
-gem "railties", "~> 6.0.0.rc2"
-gem "rails", "~> 6.0.0.rc2"
+gem "railties", "~> 6.0.0"
+gem "rails", "~> 6.0.0"
 gem "sqlite3", "~> 1.4"
 
 gemspec path: "../"

data/lib/cucumber/rails/world.rb

@@ -7,10 +7,21 @@ rescue LoadError
   # Test Unit not found
 end
 
+module Cucumber
+  module Rails
+    class << self
+      def include_rack_test_helpers?
+        # Using ActiveModel Boolean casting here will give false positives more often than not!
+        !ENV['CR_REMOVE_RACK_TEST_HELPERS']&.casecmp('true')&.zero?
+      end
+    end
+  end
+end
+
 module Cucumber
   module Rails
     class World < ActionDispatch::IntegrationTest
-      include Rack::Test::Methods
+      include Rack::Test::Methods if Cucumber::Rails.include_rack_test_helpers?
       include ActiveSupport::Testing::SetupAndTeardown if ActiveSupport::Testing.const_defined?('SetupAndTeardown')
 
       def initialize

data/spec/cucumber/rails/database_spec.rb

@@ -11,10 +11,10 @@ describe Cucumber::Rails::Database do
   it 'forwards events to the selected strategy' do
     described_class.javascript_strategy = :truncation
 
-    expect(strategy).to receive(:before_non_js).ordered
+    expect(strategy).to receive(:before_non_js)
     described_class.before_non_js
 
-    expect(strategy).to receive(:before_js).ordered
+    expect(strategy).to receive(:before_js)
     described_class.before_js
   end
 
@@ -23,7 +23,7 @@ describe Cucumber::Rails::Database do
       .to raise_error(Cucumber::Rails::Database::InvalidStrategy)
   end
 
-  describe 'using a custom strategy' do
+  context 'using a custom strategy' do
     let(:strategy_type) { ValidStrategy }
 
     class ValidStrategy
@@ -38,23 +38,23 @@ describe Cucumber::Rails::Database do
 
     class InvalidStrategy; end
 
-    it 'raises an error if the strategy doens\'t support the protocol' do
+    it 'raises an error if the strategy does not have a valid interface' do
       expect { described_class.javascript_strategy = InvalidStrategy }
         .to raise_error(ArgumentError)
     end
 
-    it 'accepts a custom strategy with a valid interface' do
+    it 'accepts the strategy if it has a valid interface' do
       expect { described_class.javascript_strategy = ValidStrategy }
         .not_to raise_error
     end
 
-    it 'forwards events to a custom strategy' do
+    it 'forwards events to the strategy' do
       described_class.javascript_strategy = ValidStrategy
 
-      expect(strategy).to receive(:before_non_js).ordered
+      expect(strategy).to receive(:before_non_js)
       described_class.before_non_js
 
-      expect(strategy).to receive(:before_js).ordered
+      expect(strategy).to receive(:before_js)
       described_class.before_js
     end
   end

data/spec/generators/cucumber/install_generator_spec.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
-
 # Generators are not automatically loaded by Rails
 require 'generators/cucumber/install_generator'
 
@@ -15,7 +13,7 @@ describe Cucumber::InstallGenerator do
     '# IMPORTANT: This file is generated by cucumber-rails - edit at your own peril.'
   end
 
-  describe 'no arguments' do
+  context 'without arguments' do
     before { run_generator }
 
     describe 'config/cucumber.yml' do

data/spec/spec_helper.rb

@@ -7,7 +7,7 @@ ActiveRecord::Base.establish_connection adapter: 'sqlite3', database: ':memory:'
 
 module CucumberRails
   class Application < ::Rails::Application
-    config.secret_key_base = 'ASecretString' if config.respond_to? :secret_key_base
+    config.secret_key_base = 'ASecretString'
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cucumber-rails
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Aslak Hellesøy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-07 00:00:00.000000000 Z
+date: 2019-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -121,33 +121,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.1.4
 - !ruby/object:Gem::Dependency
-  name: appraisal
+  name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: 0.14.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: 0.14.4
 - !ruby/object:Gem::Dependency
-  name: aruba
+  name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.4
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.4
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -332,6 +332,7 @@ files:
 - features/annotations.feature
 - features/capybara_javascript_drivers.feature
 - features/choose_javascript_database_strategy.feature
+- features/configuration.feature
 - features/database_cleaner.feature
 - features/disable_automatic_database_cleaning.feature
 - features/emulate_javascript.feature
@@ -344,7 +345,7 @@ files:
 - features/support/aruba.rb
 - features/support/cucumber_rails_helper.rb
 - features/support/env.rb
-- features/support/legacy_web_steps_support.rb
+- features/support/hooks.rb
 - gemfiles/rails_4_2.gemfile
 - gemfiles/rails_5_0.gemfile
 - gemfiles/rails_5_1.gemfile
@@ -397,28 +398,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubyforge_project: 
+rubygems_version: 2.7.9
 signing_key: 
 specification_version: 4
-summary: cucumber-rails-1.8.0
-test_files:
-- features/allow_rescue.feature
-- features/annotations.feature
-- features/capybara_javascript_drivers.feature
-- features/choose_javascript_database_strategy.feature
-- features/database_cleaner.feature
-- features/disable_automatic_database_cleaning.feature
-- features/emulate_javascript.feature
-- features/install_cucumber_rails.feature
-- features/no_database.feature
-- features/raising_errors.feature
-- features/rerun_profile.feature
-- features/rest_api.feature
-- features/step_definitions/cucumber_rails_steps.rb
-- features/support/aruba.rb
-- features/support/cucumber_rails_helper.rb
-- features/support/env.rb
-- features/support/legacy_web_steps_support.rb
-- spec/cucumber/rails/database_spec.rb
-- spec/generators/cucumber/install_generator_spec.rb
-- spec/spec_helper.rb
+summary: cucumber-rails-2.0.0
+test_files: []

data/features/support/legacy_web_steps_support.rb

@@ -1,289 +0,0 @@
-module WebSteps
-  def create_web_steps
-    write_file('features/step_definitions/web_steps.rb', <<-EOF)
-# web_steps.rb used to be in Cucumber-Rails, but was removed in 1.1.0. We're still using them in the tests because
-# the tests were written while we still thought web_steps.rb was a good idea. We don't think so anymore:
-#
-#    http://groups.google.com/group/cukes/browse_thread/thread/26f80b93c94f2952
-#    https://github.com/cucumber/cucumber-rails/issues/174
-#    http://benmabey.com/2008/05/19/imperative-vs-declarative-scenarios-in-user-stories.html
-#    http://dannorth.net/2011/01/31/whose-domain-is-it-anyway/
-#    http://elabs.se/blog/15-you-re-cuking-it-wrong
-#
-# I'm sure someone will find this and paste it into their own projects. Go ahead. It's a bad idea.
-# You have been warned.
-#
-# Aslak
-
-require 'uri'
-require 'cgi'
-require File.expand_path(File.join(File.dirname(__FILE__), "..", "support", "paths"))
-
-module WithinHelpers
-  def with_scope(locator)
-    locator ? within(*selector_for(locator)) { yield } : yield
-  end
-end
-World(WithinHelpers)
-
-# Single-line step scoper
-When /^(.*) within (.*[^:])$/ do |step, parent|
-  with_scope(parent) { When step }
-end
-
-# Multi-line step scoper
-When /^(.*) within (.*[^:]):$/ do |step, parent, table_or_string|
-  with_scope(parent) { When "\#{step}:", table_or_string }
-end
-
-Given /^(?:|I )am on (.+)$/ do |page_name|
-  visit path_to(page_name)
-end
-
-When /^(?:|I )go to (.+)$/ do |page_name|
-  visit path_to(page_name)
-end
-
-When /^(?:|I )press "([^"]*)"$/ do |button|
-  click_button(button)
-end
-
-When /^(?:|I )follow "([^"]*)"$/ do |link|
-  click_link(link)
-end
-
-When /^(?:|I )fill in "([^"]*)" with "([^"]*)"$/ do |field, value|
-  fill_in(field, with: value)
-end
-
-When /^(?:|I )fill in "([^"]*)" for "([^"]*)"$/ do |value, field|
-  fill_in(field, with: value)
-end
-
-# Use this to fill in an entire form with data from a table. Example:
-#
-#   When I fill in the following:
-#     | Account Number | 5002       |
-#     | Expiry date    | 2009-11-01 |
-#     | Note           | Nice guy   |
-#     | Wants Email?   |            |
-#
-# TODO: Add support for checkbox, select or option
-# based on naming conventions.
-#
-When /^(?:|I )fill in the following:$/ do |fields|
-  fields.rows_hash.each do |name, value|
-    When %{I fill in "\#{name}" with "\#{value}"}
-  end
-end
-
-When /^(?:|I )select "([^"]*)" from "([^"]*)"$/ do |value, field|
-  select(value, from: field)
-end
-
-When /^(?:|I )check "([^"]*)"$/ do |field|
-  check(field)
-end
-
-When /^(?:|I )uncheck "([^"]*)"$/ do |field|
-  uncheck(field)
-end
-
-When /^(?:|I )choose "([^"]*)"$/ do |field|
-  choose(field)
-end
-
-When /^(?:|I )attach the file "([^"]*)" to "([^"]*)"$/ do |path, field|
-  attach_file(field, File.expand_path(path))
-end
-
-Then /^(?:|I )should see "([^"]*)"$/ do |text|
-  if page.respond_to? :should
-    page.should have_content(text)
-  else
-    assert page.has_content?(text)
-  end
-end
-
-Then /^(?:|I )should see \\/([^\\/]*)\\/$/ do |regexp|
-  regexp = Regexp.new(regexp)
-
-  if page.respond_to? :should
-    page.should have_xpath('//*', text: regexp)
-  else
-    assert page.has_xpath?('//*', text: regexp)
-  end
-end
-
-Then /^(?:|I )should not see "([^"]*)"$/ do |text|
-  if page.respond_to? :should
-    page.should have_no_content(text)
-  else
-    assert page.has_no_content?(text)
-  end
-end
-
-Then /^(?:|I )should not see \\/([^\\/]*)\\/$/ do |regexp|
-  regexp = Regexp.new(regexp)
-
-  if page.respond_to? :should
-    page.should have_no_xpath('//*', text: regexp)
-  else
-    assert page.has_no_xpath?('//*', text: regexp)
-  end
-end
-
-Then /^the "([^"]*)" field(?: within (.*))? should contain "([^"]*)"$/ do |field, parent, value|
-  with_scope(parent) do
-    field = find_field(field)
-    field_value = (field.tag_name == 'textarea') ? field.text : field.value
-    if field_value.respond_to? :should
-      field_value.should =~ /\#{value}/
-    else
-      assert_match(/\#{value}/, field_value)
-    end
-  end
-end
-
-Then /^the "([^"]*)" field(?: within (.*))? should not contain "([^"]*)"$/ do |field, parent, value|
-  with_scope(parent) do
-    field = find_field(field)
-    field_value = (field.tag_name == 'textarea') ? field.text : field.value
-    if field_value.respond_to? :should_not
-      field_value.should_not =~ /\#{value}/
-    else
-      assert_no_match(/\#{value}/, field_value)
-    end
-  end
-end
-
-Then /^the "([^"]*)" field should have the error "([^"]*)"$/ do |field, error_message|
-  element = find_field(field)
-  classes = element.find(:xpath, '..')[:class].split(' ')
-
-  form_for_input = element.find(:xpath, 'ancestor::form[1]')
-  using_formtastic = form_for_input[:class].include?('formtastic')
-  error_class = using_formtastic ? 'error' : 'field_with_errors'
-
-  if classes.respond_to? :should
-    classes.should include(error_class)
-  else
-    assert classes.include?(error_class)
-  end
-
-  if page.respond_to?(:should)
-    if using_formtastic
-      error_paragraph = element.find(:xpath, '../*[@class="inline-errors"][1]')
-      error_paragraph.should have_content(error_message)
-    else
-      page.should have_content("\#{field.titlecase} \#{error_message}")
-    end
-  else
-    if using_formtastic
-      error_paragraph = element.find(:xpath, '../*[@class="inline-errors"][1]')
-      assert error_paragraph.has_content?(error_message)
-    else
-      assert page.has_content?("\#{field.titlecase} \#{error_message}")
-    end
-  end
-end
-
-Then /^the "([^"]*)" field should have no error$/ do |field|
-  element = find_field(field)
-  classes = element.find(:xpath, '..')[:class].split(' ')
-  if classes.respond_to? :should
-    classes.should_not include('field_with_errors')
-    classes.should_not include('error')
-  else
-    assert !classes.include?('field_with_errors')
-    assert !classes.include?('error')
-  end
-end
-
-Then /^the "([^"]*)" checkbox(?: within (.*))? should be checked$/ do |label, parent|
-  with_scope(parent) do
-    field_checked = find_field(label)['checked']
-    if field_checked.respond_to? :should
-      field_checked.should be_true
-    else
-      assert field_checked
-    end
-  end
-end
-
-Then /^the "([^"]*)" checkbox(?: within (.*))? should not be checked$/ do |label, parent|
-  with_scope(parent) do
-    field_checked = find_field(label)['checked']
-    if field_checked.respond_to? :should
-      field_checked.should be_false
-    else
-      assert !field_checked
-    end
-  end
-end
-
-Then /^(?:|I )should be on (.+)$/ do |page_name|
-  current_path = URI.parse(current_url).path
-  if current_path.respond_to? :should
-    current_path.should == path_to(page_name)
-  else
-    assert_equal path_to(page_name), current_path
-  end
-end
-
-Then /^(?:|I )should have the following query string:$/ do |expected_pairs|
-  query = URI.parse(current_url).query
-  actual_params = query ? CGI.parse(query) : {}
-  expected_params = {}
-  expected_pairs.rows_hash.each_pair{|k,v| expected_params[k] = v.split(',')}
-
-  if actual_params.respond_to? :should
-    actual_params.should == expected_params
-  else
-    assert_equal expected_params, actual_params
-  end
-end
-
-Then /^show me the page$/ do
-  save_and_open_page
-end
-    EOF
-
-    write_file('features/support/paths.rb', <<-EOF)
-module NavigationHelpers
-  # Maps a name to a path. Used by the
-  #
-  #   When /^I go to (.+)$/ do |page_name|
-  #
-  # step definition in web_steps.rb
-  #
-  def path_to(page_name)
-    case page_name
-
-    when /^the home\s?page$/
-      '/'
-
-    # Add more mappings here.
-    # Here is an example that pulls values out of the Regexp:
-    #
-    #   when /^(.*)'s profile page$/i
-    #     user_profile_path(User.find_by_login($1))
-
-    else
-      begin
-        page_name =~ /^the (.*) page$/
-        path_components = $1.split(/\s+/)
-        self.send(path_components.push('path').join('_').to_sym)
-      rescue NoMethodError, ArgumentError
-        raise "Can't find mapping from \"\#{page_name}\" to a path.\\n" +
-          "Now, go and add a mapping in \#{__FILE__}"
-      end
-    end
-  end
-end
-
-World(NavigationHelpers)
-    EOF
-  end
-end
-World(WebSteps)