cucumber-rails 1.6.0 → 1.7.0

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright (c) 2008,2009,2010,2011,2012,2013 Aslak Hellesøy and the Cucumber Team.
+Copyright (c) 2008-2019 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

@@ -3,20 +3,22 @@
 [![Gem Version](https://badge.fury.io/rb/cucumber-rails.svg)](http://badge.fury.io/rb/cucumber-rails)
 [![Build Status](https://secure.travis-ci.org/cucumber/cucumber-rails.svg?branch=master)](http://travis-ci.org/cucumber/cucumber-rails)
 [![Code Climate](https://codeclimate.com/github/cucumber/cucumber-rails.svg)](https://codeclimate.com/github/cucumber/cucumber-rails)
-[![Dependency Status](https://gemnasium.com/Kosmas/cucumber-rails.svg)](https://gemnasium.com/Kosmas/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.x and 5.x. For Rails 3.x support, use version 1.4.5. For Rails 2.3.x support, see the [rails-2.3.x branch](https://github.com/cucumber/cucumber-rails/tree/rails-2.3.x).
+Cucumber-Rails brings Cucumber to Rails 4.2 and Rails 5.x. This gem is also compatible with Rails 6.0+
+but this is currently in a beta phase, so there may be issues.
 
 ## Installation
 
 Before you can use the generator, add the gem to your project's Gemfile as follows:
 
-    group :test do
-      gem 'cucumber-rails', require: false
-      # database_cleaner is not required, but highly recommended
-      gem 'database_cleaner'
-    end
+```ruby
+group :test do
+  gem 'cucumber-rails', require: false
+  # database_cleaner is not required, but highly recommended
+  gem 'database_cleaner'
+end
+```
 
 Then install it by running:
 
@@ -44,9 +46,11 @@ Without Rake:
 
 By default, cucumber-rails runs `DatabaseCleaner.start` and `DatabaseCleaner.clean` before and after your scenarios. You can disable this behaviour like so:
 
-    # features/support/env.rb
-    # ...
-    Cucumber::Rails::Database.autorun_database_cleaner = false
+```ruby
+# features/support/env.rb
+# ...
+Cucumber::Rails::Database.autorun_database_cleaner = false
+```
 
 ## Upgrading from a previous version
 
@@ -67,10 +71,12 @@ If you know how to fix the bug yourself, make a second commit (after committing
 
 ### Setting up your environment
 
-We strongly recommend that you use `rvm` or `rbenv` and ruby `2.2.0`. When you have that, cd into your cucumber-rails repository and:
+Make sure you have a supported ruby installed, cd into your cucumber-rails repository and:
 
     gem install bundler
     bundle install
+    bin/install_geckodriver.sh
+    bin/install_webpacker.sh
 
 ### Running all tests
 
@@ -87,7 +93,7 @@ In order to test against multiple versions of key dependencies, the [Appraisal](
 
 To run the suite against a named gemfile, use the following:
 
-    [bundle exec] appraisal rails_4_1 rake test
+    [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:
 
@@ -105,9 +111,11 @@ 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 Gemfile (for local test runs) and each appraisal section (if necessary).
+3. If it's a dependency of a generated rails app in a test, add it to [the helper] that modifies that Gemfile.
 
-For example, rspec is a primary development dependency, so it lives in the gemspec. By contrast, coffee-rails is a dependency of apps generated with rails 3.1 and 3.2, so lives in the main Gemfile and the rails 3.1 and 3.2 appraisal sections.
+For example, rspec is a primary development dependency, so it lives in the gemspec.
+
+[the helper]: https://github.com/cucumber/cucumber-rails/blob/5e37c530560ae1c1a79521c38a54bae0be94242b/features/step_definitions/cucumber_rails_steps.rb#L15
 
 ### NOTE
 

data/bin/install_geckodriver.sh

@@ -0,0 +1,19 @@
+#!/bin/bash
+
+set -xeuo pipefail
+
+curl --silent \
+     --show-error \
+     --location \
+     --fail \
+     --retry 3 \
+     --output /tmp/geckodriver_linux64.tar.gz \
+     https://github.com/mozilla/geckodriver/releases/download/v0.23.0/geckodriver-v0.23.0-linux64.tar.gz
+
+sudo tar -C /usr/local/bin -xvzf /tmp/geckodriver_linux64.tar.gz geckodriver
+
+rm /tmp/geckodriver_linux64.tar.gz
+
+geckodriver --version
+
+set +x

data/bin/install_webpacker.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+set -xeuo pipefail
+
+curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add -
+echo 'deb https://dl.yarnpkg.com/debian/ stable main' | sudo tee /etc/apt/sources.list.d/yarn.list
+sudo apt update && sudo apt install --yes yarn
+
+set +x

data/config/cucumber.yml

@@ -12,9 +12,6 @@ opts = [
   "--format rerun -o #{rerun_file}"
 ]
 rails_version = `bundle exec rails --version`.match(/[\d.]+$/).to_s
-if Gem::Version.new(rails_version) < Gem::Version.new('4.2')
-  opts << "--tags 'not @requires-rails-version-42'"
-end
 optlist = opts.join(' ')
 %>
 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.6.0'
+  s.version     = '1.7.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,25 +12,24 @@ Gem::Specification.new do |s|
 
   s.license = 'MIT'
 
-  s.add_runtime_dependency('capybara', ['>= 1.1.2', '< 4'])
+  s.required_ruby_version = '>= 2.2'
+
+  s.add_runtime_dependency('capybara', ['>= 2.3.0', '< 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('railties', ['>= 4.2', '< 7'])
   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('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', '>= 3.4.1')
-  s.add_development_dependency('database_cleaner', '>= 1.0.0')
-  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')
+  s.add_development_dependency('rubocop', '~> 0.66.0')
+  s.add_development_dependency('rake', '>= 10.3')
+  s.add_development_dependency('rspec', '~> 3.5')
+  s.add_development_dependency('rails', ['>= 4.2', '< 7'])
+  s.add_development_dependency('sqlite3', '~> 1.3.13')
 
   # For Documentation:
   s.add_development_dependency('rdiscount', '>= 2.0.7')
@@ -41,6 +40,5 @@ Gem::Specification.new do |s|
   s.rubygems_version = ">= 1.6.1"
   s.files            = `git ls-files`.split("\n")
   s.test_files       = `git ls-files -- {spec,features}/*`.split("\n")
-  s.executables      = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_path     = "lib"
 end

data/features/allow_rescue.feature

@@ -1,7 +1,7 @@
 Feature: Allow Cucumber to rescue exceptions
 
   Background: A controller that raises an exception
-    Given I have created a new Rails app "rails-3-app" and installed cucumber-rails
+    Given I have created a new Rails app "rails-app" and installed cucumber-rails
     And I write to "app/controllers/posts_controller.rb" with:
       """
       class PostsController < ApplicationController
@@ -12,7 +12,7 @@ Feature: Allow Cucumber to rescue exceptions
       """
     And I write to "config/routes.rb" with:
       """
-      Rails3App::Application.routes.draw do
+      RailsApp::Application.routes.draw do
         resources :posts
       end
       """
@@ -23,20 +23,24 @@ Feature: Allow Cucumber to rescue exceptions
       Feature: posts
         @allow-rescue
         Scenario: See posts
-          When I look at the posts
+        When I look at the posts
+        Then I should see the public error page
       """
     And I write to "features/step_definitions/posts_steps.rb" with:
       """
       When /^I look at the posts$/ do
         visit '/posts'
       end
+      Then /^I should see the public error page$/ do
+        expect(page).to have_content "We're sorry, but something went wrong."
+      end
       """
     And I run `bundle exec rake db:migrate`
     And I run `bundle exec cucumber`
     Then the feature run should pass with:
       """
       1 scenario (1 passed)
-      1 step (1 passed)
+      2 steps (2 passed)
       """
 
   Scenario: Don't allow rescue

data/features/annotations.feature

@@ -1,4 +1,3 @@
-@requires-rails-version-42
 Feature: Annotations
 
   I order to track my development progress

data/features/emulate_javascript.feature

@@ -23,7 +23,7 @@ Feature: Emulate Javascript
       """
       FactoryBot.define do
         factory :widget do
-          name 'testwidget'
+          name { 'testwidget' }
         end
       end
       """
@@ -80,7 +80,7 @@ Feature: Emulate Javascript
       """
       FactoryBot.define do
         factory :widget do
-          name 'testwidget'
+          name { 'testwidget' }
         end
       end
       """

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 3 or 4 and Ruby, with Capybara, Spork and DatabaseCleaner
+  of Rails and Ruby, with Capybara, Spork and DatabaseCleaner
 
   Scenario: Install Cucumber-Rails
     Given I have created a new Rails app and installed cucumber-rails

data/features/rest_api.feature

@@ -1,7 +1,7 @@
 Feature: REST API
 
   Scenario: Compare JSON
-    Given I have created a new Rails app "rails-3-app" and installed cucumber-rails
+    Given I have created a new Rails app "rails-app" and installed cucumber-rails
     And I write to "app/controllers/posts_controller.rb" with:
       """
       class PostsController < ApplicationController
@@ -12,7 +12,7 @@ Feature: REST API
       """
     And I write to "config/routes.rb" with:
       """
-      Rails3App::Application.routes.draw do
+      RailsApp::Application.routes.draw do
         resources :posts
       end
       """

data/features/step_definitions/cucumber_rails_steps.rb

@@ -8,8 +8,6 @@ module CucumberRailsHelper
     delete_environment_variable 'RUBYOPT'
     delete_environment_variable 'BUNDLE_BIN_PATH'
     delete_environment_variable 'BUNDLE_GEMFILE'
-
-    run_simple 'bundle install'
   end
 
   def install_cucumber_rails(*options)
@@ -18,28 +16,45 @@ module CucumberRailsHelper
     else
       gem 'cucumber-rails' , group: :test, require: false, path: "#{File.expand_path('.')}"
     end
-    # From Rails 5.1 some gems are already part of the Gemfile
-    if Gem.loaded_specs['rails'].version < Gem::Version.new('5.1.0')
+
+    gem 'sqlite3', '~> 1.3.13'
+    if RUBY_VERSION < '2.4.0'
+      gem 'capybara', '< 3.16.0', group: :test
+    else
       gem 'capybara', group: :test
-      gem 'selenium-webdriver', group: :test
     end
+    gem 'selenium-webdriver', '~> 3.11', group: :test
 
-    gem 'geckodriver-helper', group: :test
-    gem 'rspec-rails', group: :test
-    gem 'database_cleaner', group: :test unless options.include?(:no_database_cleaner)
-    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')
-      gem 'rake', '< 11.0'
-      run_simple 'bundle update rake --local'
+    gem 'rspec-expectations', '~> 3.7', group: :test
+    gem 'database_cleaner', '>= 1.1', group: :test unless options.include?(:no_database_cleaner)
+    gem 'factory_bot', '>= 3.2', group: :test unless options.include?(:no_factory_bot)
+    run_simple 'bundle install'
+
+    if `bundle exec rails -v`.split("\n").last.strip =~ /\ARails 6\./
+      run_simple 'bundle exec rails webpacker:install'
     end
+
     run_simple 'bundle exec rails generate cucumber:install'
   end
 
-  def gem(name, options)
-    line = %{gem "#{name}", #{options.inspect}\n}
-    append_to_file('Gemfile', line)
+  def gem(name, *args)
+    options = args.last.is_a?(Hash) ? args.pop : {}
+
+    parts = ["'#{name}'"]
+    parts << args.map(&:inspect) if args.any?
+    parts << options.inspect[1..-2] if options.any?
+
+    line = "gem #{parts.join(', ')}\n"
+
+    gem_regexp = /gem ["']#{name}["'].*$/
+    gemfile_content = File.read(expand_path('Gemfile'))
+
+    if gemfile_content =~ gem_regexp
+      gemfile_content.gsub!(gem_regexp, line)
+      overwrite_file('Gemfile', gemfile_content)
+    else
+      append_to_file('Gemfile', line)
+    end
   end
 
   def prepare_aruba_report
@@ -98,10 +113,15 @@ end
 Given /^I force selenium to run Firefox in headless mode$/ do
   selenium_config = %{
     Capybara.register_driver :selenium do |app|
+      http_client = Selenium::WebDriver::Remote::Http::Default.new
+      http_client.read_timeout = 180
+
       browser_options = ::Selenium::WebDriver::Firefox::Options.new()
       browser_options.args << '--headless'
-      Capybara::Selenium::Driver.new(app, browser: :firefox, options: browser_options)
+      Capybara::Selenium::Driver.new(app, browser: :firefox, options: browser_options, http_client: http_client)
     end
+
+    Capybara.server = :webrick
   }
 
   step 'I append to "features/support/env.rb" with:', selenium_config
@@ -120,11 +140,7 @@ Then /^the feature run should pass with:$/ do |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
+  content = File.open(expand_path('Gemfile'), 'r').readlines
   new_content = []
 
   content.each do |line|
@@ -133,5 +149,5 @@ Given("I remove the {string} gem from the Gemfile") do |gem_name|
     new_content << line
   end
 
-  overwrite_file(gemfile_path, new_content.join("\r\n"))
-end
+  overwrite_file('Gemfile', new_content.join("\r\n"))
+end

data/gemfiles/rails_4_2.gemfile

@@ -2,18 +2,9 @@
 
 source "https://rubygems.org"
 
-gem "rails", "~> 4.2.1"
 gem "railties", "~> 4.2.1"
-gem "capybara", "~> 2.0"
-gem "selenium-webdriver", "~> 3.4.1"
-gem "geckodriver-helper", "~> 0.0.5"
-gem "rspec-rails", "~> 3.1.0"
-gem "sass-rails", "~> 5.0"
-gem "coffee-rails", "~> 4.1.0"
-gem "jquery-rails"
-gem "uglifier", "~> 2.1.0"
-gem "sqlite3", "~> 1.3.7"
-gem "database_cleaner", "~> 1.0.1"
-gem "rake", "< 11.0"
+gem "i18n", "< 1.5.1", platform: :mri_22
+gem "capybara", "< 3.16.0", platform: [:mri_23, :mri_22]
+gem "nokogiri", "< 1.9.1", platform: [:mri_23, :mri_22]
 
 gemspec path: "../"

data/gemfiles/rails_5_0.gemfile

@@ -2,17 +2,9 @@
 
 source "https://rubygems.org"
 
-gem "rails", "~> 5.0.0"
 gem "railties", "~> 5.0.0"
-gem "capybara", "~> 2.7.1"
-gem "selenium-webdriver", "~> 3.9.0"
-gem "geckodriver-helper", "~> 0.0.5"
-gem "rspec-rails", "~> 3.5.0"
-gem "sass-rails", "~> 5.0"
-gem "coffee-rails", "~> 4.2.0"
-gem "jquery-rails"
-gem "uglifier", "~> 2.7.2"
-gem "sqlite3", "~> 1.3.7"
-gem "database_cleaner", ">= 1.1.0"
+gem "i18n", "< 1.5.1", platform: :mri_22
+gem "capybara", "< 3.16.0", platform: [:mri_23, :mri_22]
+gem "nokogiri", "< 1.9.1", platform: [:mri_23, :mri_22]
 
 gemspec path: "../"

data/gemfiles/rails_5_1.gemfile

@@ -2,16 +2,9 @@
 
 source "https://rubygems.org"
 
-gem "rails", "~> 5.1.0"
 gem "railties", "~> 5.1.0"
-gem "capybara", "~> 2.7.1"
-gem "selenium-webdriver", "~> 3.9.0"
-gem "geckodriver-helper", "~> 0.0.5"
-gem "rspec-rails", "~> 3.5.0"
-gem "sass-rails", "~> 5.0"
-gem "coffee-rails", "~> 4.2.0"
-gem "uglifier", "~> 3.2.0"
-gem "sqlite3", "~> 1.3.13"
-gem "database_cleaner", ">= 1.1.0"
+gem "i18n", "< 1.5.1", platform: :mri_22
+gem "capybara", "< 3.16.0", platform: [:mri_23, :mri_22]
+gem "nokogiri", "< 1.9.1", platform: [:mri_23, :mri_22]
 
 gemspec path: "../"