cucumber-rails 1.5.0 → 1.6.0

data/Rakefile

@@ -14,9 +14,9 @@ Dir["#{File.dirname(__FILE__)}/dev_tasks/*.rake"].sort.each { |ext| load ext }
 
 CLEAN.include('doc', 'tmp')
 
-task :default => :test
+task default: :test
 
-task :test => [:spec, :cucumber]
+task test: [:spec, :cucumber]
 
 namespace :test do
   desc "Run tests against all gemfiles"
@@ -45,5 +45,5 @@ namespace :gemfiles do
   end
 
   desc "Rebuild generated gemfiles and install dependencies"
-  task :rebuild => [:clean, :install]
+  task rebuild: [:clean, :install]
 end

data/config/cucumber.yml

@@ -5,7 +5,7 @@ path = if failing_scenarios.empty?
   'features'
 else
   puts "Running failed scenarios"
-  failing_scenarios
+  failing_scenarios.gsub /\s/, ' '
 end
 opts = [
   "--format #{path == 'features' ? 'progress' : 'pretty'}",
@@ -13,8 +13,8 @@ opts = [
 ]
 rails_version = `bundle exec rails --version`.match(/[\d.]+$/).to_s
 if Gem::Version.new(rails_version) < Gem::Version.new('4.2')
-  opts << '--tags ~@requires-rails-version-42'
+  opts << "--tags 'not @requires-rails-version-42'"
 end
 optlist = opts.join(' ')
 %>
-default: <%= path %> <%= optlist %> --tags ~@broken
+default: <%= path %> <%= optlist %> --tags 'not @broken'

data/cucumber-rails.gemspec

@@ -3,7 +3,7 @@ $LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = 'cucumber-rails'
-  s.version     = '1.5.0'
+  s.version     = '1.6.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}"
@@ -12,30 +12,32 @@ Gem::Specification.new do |s|
 
   s.license = 'MIT'
 
-  s.add_runtime_dependency('capybara', ['>= 1.1.2', '< 3'])
-  s.add_runtime_dependency('cucumber', ['>= 1.3.8', '< 4'])
-  s.add_runtime_dependency('nokogiri', '~> 1.5')
-  s.add_runtime_dependency('railties', ['>= 4', '< 5.2'])
+  s.add_runtime_dependency('capybara', ['>= 1.1.2', '< 4'])
+  s.add_runtime_dependency('cucumber', ['>= 3.0.2', '< 4'])
+  s.add_runtime_dependency('nokogiri', '~> 1.8')
+  s.add_runtime_dependency('railties', ['>= 4', '< 6'])
   s.add_runtime_dependency('mime-types', ['>= 1.17', '< 4'])
 
   # Main development dependencies
-  s.add_development_dependency('ammeter', ['>= 1.0.0', '< 1.1.3'])
+  s.add_development_dependency('ammeter', ['>= 1.0.0', '!= 1.1.3'])
   s.add_development_dependency('appraisal', '>= 0.5.1')
   s.add_development_dependency('aruba', '~> 0.14.2')
   s.add_development_dependency('builder', ['>= 3.1.0', '< 4'])
   s.add_development_dependency('bundler', '>= 1.3.5')
-  s.add_development_dependency('selenium-webdriver', '>= 2.45.0')
+  s.add_development_dependency('selenium-webdriver', '>= 3.4.1')
   s.add_development_dependency('database_cleaner', '>= 1.0.0')
-  s.add_development_dependency('factory_girl', '>= 3.2')
+  s.add_development_dependency('factory_bot', '>= 3.2')
   s.add_development_dependency('rake', '>= 0.9.2.2')
   s.add_development_dependency('rspec', '~> 3.0')
   s.add_development_dependency('rails')
+  s.add_development_dependency('sqlite3')
 
   # For Documentation:
   s.add_development_dependency('rdiscount', '>= 2.0.7')
   s.add_development_dependency('rdoc', '>= 3.4')
   s.add_development_dependency('yard', '>= 0.8.7')
 
+  s.required_ruby_version = '>= 2.2.0'
   s.rubygems_version = ">= 1.6.1"
   s.files            = `git ls-files`.split("\n")
   s.test_files       = `git ls-files -- {spec,features}/*`.split("\n")

data/dev_tasks/yard.rake

@@ -20,7 +20,7 @@ namespace :api do
     mkdir_p dir
     yard.options = ["--out", dir]
   end
-  task :yard => :dir
+  task yard: :dir
 
   task :release do
     Dir.chdir(SITE_DIR) do
@@ -31,5 +31,5 @@ namespace :api do
   end
 
   desc "Generate YARD docs for Cucumber-Rails' API"
-  task :doc => [:yard, :release]
+  task doc: [:yard, :release]
 end

data/features/capybara_javascript_drivers.feature

@@ -3,19 +3,20 @@ Feature: Capybara Javascript Drivers
 
   Background: A simple calendar app
     Given I have created a new Rails app and installed cucumber-rails
-    And I successfully run `bundle exec rails g scaffold appointment name:string when:datetime`
+    And I force selenium to run Firefox in headless mode
+    And 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 "([^"]+)" as the "([^"]+)" time$/ do |time, selector|
-        select_time(time, :from => selector)
+        select_time(time, from: selector)
       end
 
       When /^(?:|I )select "([^"]+)" as the "([^"]+)" date$/ do |date, selector|
-        select_date(date, :from => selector)
+        select_date(date, from: selector)
       end
 
       When /^(?:|I )select "([^"]+)" as the "([^"]+)" date and time$/ do |datetime, selector|
-        select_datetime(datetime, :from => selector)
+        select_datetime(datetime, from: selector)
       end
       """
 
@@ -55,7 +56,7 @@ Feature: Capybara Javascript Drivers
     And I write to "features/step_definitions/custom_steps.rb" with:
       """
       Given /^a random appointment$/ do
-        @appointment = Appointment.create!(:name => 'Random appointment', :when => DateTime.now)
+        @appointment = Appointment.create!(name: 'Random appointment', when: DateTime.now)
       end
 
       Given /^I am viewing random appointment$/ do

data/features/choose_javascript_database_strategy.feature

@@ -3,7 +3,7 @@ Feature: Choose javascript database strategy
   When running a scenario with the @javascript tag, Capybara will fire up a web server
   in the same process in a separate thread to your cukes. By default, this means ActiveRecord will give it a
   separate database connection, which in turn means data you put into your database from
-  Cucumber step definitions (e.g. using FactoryGirl) won't be visible to the web server
+  Cucumber step definitions (e.g. using FactoryBot) won't be visible to the web server
   until the database transaction is committed.
 
   So if you use a transaction strategy for cleaning up your database at the end of a scenario,

data/features/database_cleaner.feature

@@ -16,18 +16,18 @@ Feature: DatabaseCleaner
           When I create 7 more widgets
           Then I should have 9 widgets
       """
-    And I successfully run `rails generate model widget name:string`
+    And I run `rails generate model widget name:string`
     And I write to "features/step_definitions/widget_steps.rb" with:
       """
       Given /^I have (\d+) widgets$/ do |n|
         n.to_i.times do |i|
-          Widget.create! :name => "Widget #{Widget.count + i}"
+          Widget.create! name: "Widget #{Widget.count + i}"
         end
       end
 
       When /^I create (\d+) more widgets$/ do |n|
         n.to_i.times do |i|
-          Widget.create! :name => "Widget #{Widget.count + i}"
+          Widget.create! name: "Widget #{Widget.count + i}"
         end
       end
 

data/features/disable_automatic_database_cleaning.feature

@@ -27,18 +27,18 @@ Feature: Disable automatic database cleaning
           When I create 5 widgets
           Then I should have 8 widgets
       """
-    And I successfully run `rails generate model widget name:string`
+    And I run `rails generate model widget name:string`
     And I write to "features/step_definitions/widget_steps.rb" with:
       """
       Given /^I have (\d+) widgets$/ do |n|
         n.to_i.times do |i|
-          Widget.create! :name => "Widget #{Widget.count + i}"
+          Widget.create! name: "Widget #{Widget.count + i}"
         end
       end
 
       When /^I create (\d+) widgets$/ do |n|
         n.to_i.times do |i|
-          Widget.create! :name => "Widget #{Widget.count + i}"
+          Widget.create! name: "Widget #{Widget.count + i}"
         end
       end
 

data/features/emulate_javascript.feature

@@ -2,7 +2,8 @@ Feature: Emulate Javascript
 
   Scenario: See a widget
     Given I have created a new Rails app and installed cucumber-rails
-    And I successfully run `rails generate scaffold widget name:string`
+    And I force selenium to run Firefox in headless mode
+    And I run `rails generate scaffold widget name:string`
     And I write to "features/f.feature" with:
       """
       @javascript
@@ -15,12 +16,12 @@ Feature: Emulate Javascript
     And I write to "features/step_definitions/s.rb" with:
       """
       Given /^there is a widget named "([^"]*)"$/ do |name|
-        FactoryGirl.create(:widget, :name => name)
+        FactoryBot.create(:widget, name: name)
       end
       """
     And I write to "features/support/factories.rb" with:
       """
-      FactoryGirl.define do
+      FactoryBot.define do
         factory :widget do
           name 'testwidget'
         end
@@ -36,9 +37,9 @@ Feature: Emulate Javascript
 
   Scenario: Pass on the CSRF token
     Given I have created a new Rails app and installed cucumber-rails
-    And I successfully run `rails generate scaffold widget name:string`
-    And I successfully run `sed -i -e 's/forgery_protection *= false/forgery_protection = true/' config/environments/test.rb`
-    And I successfully run `rails generate controller session establish`
+    And 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`
+    And I run `rails generate controller session establish`
     And I write to "app/controllers/session_controller.rb" with:
       """
       class SessionController < ApplicationController
@@ -51,8 +52,8 @@ Feature: Emulate Javascript
       """
       class ApplicationController < ActionController::Base
         protect_from_forgery
-        before_action :except => :establish do
-          render :text => "denied", :status => :forbidden and return false unless session[:verified]
+        before_action except: :establish do
+          render text: "denied", status: :forbidden and return false unless session[:verified]
         end
       end
       """
@@ -72,12 +73,12 @@ Feature: Emulate Javascript
     And I write to "features/step_definitions/s.rb" with:
       """
       Given /^there is a widget named "([^"]*)"$/ do |name|
-        FactoryGirl.create(:widget, :name => name)
+        FactoryBot.create(:widget, name: name)
       end
       """
     And I write to "features/support/factories.rb" with:
       """
-      FactoryGirl.define do
+      FactoryBot.define do
         factory :widget do
           name 'testwidget'
         end
@@ -90,3 +91,4 @@ Feature: Emulate Javascript
        1 scenario (1 passed)
        8 steps (8 passed)
        """
+

data/features/no_database.feature

@@ -26,19 +26,8 @@ Feature: No Database
       """
       require 'cucumber/rails'
       """
-    # Remove DatabaseCleaner and SQLite
-    And I write to "Gemfile" with:
-      """
-      source 'http://rubygems.org'
-      gem 'rails'
-      gem "cucumber-rails", :group => :test, :path => "../../.."
-      gem "capybara", :group => :test
-      gem "rspec-rails", :group => :test
-      if RUBY_VERSION >= '2.0.0'
-        gem 'sass-rails'
-        gem 'uglifier'
-      end
-      """
+    And I remove the 'database_cleaner' gem from the Gemfile
+    And I remove the 'sqlite' gem from the Gemfile
     And I write to "app/controllers/posts_controller.rb" with:
       """
       class PostsController < ApplicationController

data/features/rerun_profile.feature

@@ -8,6 +8,7 @@ Feature: Rerun profile
     And a file named "rerun.txt" with:
       """
       features/rerun_test.feature:2
+      features/rerun_test.feature:5
       """
     And a file named "features/rerun_test.feature" with:
       """
@@ -15,6 +16,9 @@ Feature: Rerun profile
         Scenario: failing before
           Given fixed now
 
+        Scenario: still failing
+          Given broken
+
         Scenario: always passing
           Given passing
       """
@@ -24,14 +28,19 @@ Feature: Rerun profile
         puts "All fixed now"
       end
 
+      Given /broken/ do
+        raise "I'm broken"
+      end
+
       Given /passing/ do
         puts "I've always been passing"
       end
       """
-    When I successfully run `bundle exec cucumber -p rerun`
-    Then the feature run should pass with:
+    When I run `bundle exec cucumber -p rerun`
+    Then it should fail with:
       """
-      1 scenario (1 passed)
-      1 step (1 passed)
+      2 scenarios (1 failed, 1 passed)
+      2 steps (1 failed, 1 passed)
       """
     And the file "rerun.txt" should not contain "features/rerun_test.feature:2"
+    And the file "rerun.txt" should contain "features/rerun_test.feature:5"

data/features/rest_api.feature

@@ -6,7 +6,7 @@ Feature: REST API
       """
       class PostsController < ApplicationController
         def index
-          render :json => {'hello' => 'world'}.to_json
+          render json: {'hello' => 'world'}.to_json
         end
       end
       """

data/features/step_definitions/cucumber_rails_steps.rb

@@ -8,8 +8,7 @@ module CucumberRailsHelper
     delete_environment_variable 'RUBYOPT'
     delete_environment_variable 'BUNDLE_BIN_PATH'
     delete_environment_variable 'BUNDLE_GEMFILE'
-    # Force older version of nokogiri on older Rubies
-    gem 'nokogiri', '~> 1.6.8' if RUBY_VERSION < '2.1.0'
+
     run_simple 'bundle install'
   end
 
@@ -23,16 +22,12 @@ module CucumberRailsHelper
     if Gem.loaded_specs['rails'].version < Gem::Version.new('5.1.0')
       gem 'capybara', group: :test
       gem 'selenium-webdriver', group: :test
-    else
-      # Make sure to restrict the selected selenium-webdriver version
-      # Since version 3 geckodriver is required to be installed
-      gemfile_text = File.read(expand_path('Gemfile'))
-      gemfile_text.gsub!("gem 'selenium-webdriver'", "gem 'selenium-webdriver', '~> 2.0'")
-      overwrite_file('Gemfile', gemfile_text)
     end
+
+    gem 'geckodriver-helper', group: :test
     gem 'rspec-rails', group: :test
     gem 'database_cleaner', group: :test unless options.include?(:no_database_cleaner)
-    gem 'factory_girl', group: :test unless options.include?(:no_factory_girl)
+    gem 'factory_bot', group: :test unless options.include?(:no_factory_bot)
     # Newer versions of rake remove a method used by RSpec older versions
     # See https://stackoverflow.com/questions/35893584/nomethoderror-undefined-method-last-comment-after-upgrading-to-rake-11#35893625
     if Gem::Version.new(RSpec::Support::Version::STRING) < Gem::Version.new('3.4.4')
@@ -83,14 +78,14 @@ 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_girl
+  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 created a new Rails app "(.*?)" with no database and installed cucumber\-rails$/ do |app_name|
   rails_new name: app_name, args: '--skip-active-record'
-  install_cucumber_rails :no_database_cleaner, :no_factory_girl
+  install_cucumber_rails :no_database_cleaner, :no_factory_bot
   overwrite_file('features/support/env.rb', "require 'cucumber/rails'\n")
   create_web_steps
 end
@@ -100,6 +95,18 @@ Given /^I have a "([^"]*)" ActiveRecord model object$/ do |name|
   run_simple('bundle exec rake db:migrate RAILS_ENV=test')
 end
 
+Given /^I force selenium to run Firefox in headless mode$/ do
+  selenium_config = %{
+    Capybara.register_driver :selenium do |app|
+      browser_options = ::Selenium::WebDriver::Firefox::Options.new()
+      browser_options.args << '--headless'
+      Capybara::Selenium::Driver.new(app, browser: :firefox, options: browser_options)
+    end
+  }
+
+  step 'I append to "features/support/env.rb" with:', selenium_config
+end
+
 When /^I run the cukes$/ do
   run_simple('bundle exec cucumber')
 end
@@ -111,3 +118,20 @@ 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|
+  run 'pwd'
+  app_path = last_command_started.output.strip
+  gemfile_path = File.join(app_path, 'Gemfile')
+
+  content = File.open(gemfile_path, 'r').readlines
+  new_content = []
+
+  content.each do |line|
+    next if line =~ /gem ["|']#{gem_name}["|'].*/
+    
+    new_content << line
+  end
+
+  overwrite_file(gemfile_path, new_content.join("\r\n"))
+end

data/features/support/env.rb

@@ -30,3 +30,11 @@ if(ENV['ARUBA_REPORT_DIR'])
     end
   end
 end
+
+After do |scenario|
+  if scenario.failed?
+    puts last_command_stopped.stdout
+    puts last_command_stopped.stderr
+  end
+ end
+ 

data/features/support/legacy_web_steps_support.rb

@@ -53,11 +53,11 @@ When /^(?:|I )follow "([^"]*)"$/ do |link|
 end
 
 When /^(?:|I )fill in "([^"]*)" with "([^"]*)"$/ do |field, value|
-  fill_in(field, :with => value)
+  fill_in(field, with: value)
 end
 
 When /^(?:|I )fill in "([^"]*)" for "([^"]*)"$/ do |value, field|
-  fill_in(field, :with => value)
+  fill_in(field, with: value)
 end
 
 # Use this to fill in an entire form with data from a table. Example:
@@ -78,7 +78,7 @@ When /^(?:|I )fill in the following:$/ do |fields|
 end
 
 When /^(?:|I )select "([^"]*)" from "([^"]*)"$/ do |value, field|
-  select(value, :from => field)
+  select(value, from: field)
 end
 
 When /^(?:|I )check "([^"]*)"$/ do |field|
@@ -109,9 +109,9 @@ Then /^(?:|I )should see \\/([^\\/]*)\\/$/ do |regexp|
   regexp = Regexp.new(regexp)
 
   if page.respond_to? :should
-    page.should have_xpath('//*', :text => regexp)
+    page.should have_xpath('//*', text: regexp)
   else
-    assert page.has_xpath?('//*', :text => regexp)
+    assert page.has_xpath?('//*', text: regexp)
   end
 end
 
@@ -127,9 +127,9 @@ Then /^(?:|I )should not see \\/([^\\/]*)\\/$/ do |regexp|
   regexp = Regexp.new(regexp)
 
   if page.respond_to? :should
-    page.should have_no_xpath('//*', :text => regexp)
+    page.should have_no_xpath('//*', text: regexp)
   else
-    assert page.has_no_xpath?('//*', :text => regexp)
+    assert page.has_no_xpath?('//*', text: regexp)
   end
 end