cucumber-rails 1.7.0 → 1.8.0

data/features/emulate_javascript.feature

@@ -3,7 +3,7 @@ Feature: Emulate Javascript
   Scenario: See a widget
     Given I have created a new Rails app and installed cucumber-rails
     And I force selenium to run Firefox in headless mode
-    And I run `rails generate scaffold widget name:string`
+    When I run `rails generate scaffold widget name:string`
     And I write to "features/f.feature" with:
       """
       @javascript
@@ -15,7 +15,7 @@ Feature: Emulate Javascript
       """
     And I write to "features/step_definitions/s.rb" with:
       """
-      Given /^there is a widget named "([^"]*)"$/ do |name|
+      Given('there is a widget named {string}') do |name|
         FactoryBot.create(:widget, name: name)
       end
       """
@@ -27,17 +27,17 @@ Feature: Emulate Javascript
         end
       end
       """
-    When I run `bundle exec rake db:migrate`
+    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)
-       3 steps (3 passed)
-       """
+      """
+      1 scenario (1 passed)
+      3 steps (3 passed)
+      """
 
   Scenario: Pass on the CSRF token
     Given I have created a new Rails app and installed cucumber-rails
-    And I run `rails generate scaffold widget name:string`
+    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`
     And I run `rails generate controller session establish`
     And I write to "app/controllers/session_controller.rb" with:
@@ -52,8 +52,9 @@ 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]
+          render text: 'denied', status: :forbidden and return false unless session[:verified]
         end
       end
       """
@@ -72,7 +73,7 @@ Feature: Emulate Javascript
       """
     And I write to "features/step_definitions/s.rb" with:
       """
-      Given /^there is a widget named "([^"]*)"$/ do |name|
+      Given('there is a widget named {string}') do |name|
         FactoryBot.create(:widget, name: name)
       end
       """
@@ -84,11 +85,10 @@ Feature: Emulate Javascript
         end
       end
       """
-    When I run `bundle exec rake db:migrate`
+    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)
-       8 steps (8 passed)
-       """
-
+      """
+      1 scenario (1 passed)
+      8 steps (8 passed)
+      """

data/features/no_database.feature

@@ -1,11 +1,10 @@
 Feature: No Database
   Allow Cucumber to work with a Rails app without a database
 
-  @fails-on-travis
   Scenario: No ActiveRecord and DatabaseCleaner
     Given I have created a new Rails app with no database and installed cucumber-rails
     # Turn off ActiveRecord
-    And I write to "config/application.rb" with:
+    When I write to "config/application.rb" with:
       """
       require File.expand_path('../boot', __FILE__)
 
@@ -17,7 +16,7 @@ Feature: No Database
 
       module TestApp
         class Application < Rails::Application
-          config.encoding = "utf-8"
+          config.encoding = 'utf-8'
           config.filter_parameters += [:password]
         end
       end
@@ -32,7 +31,7 @@ Feature: No Database
       """
       class PostsController < ApplicationController
         def index
-          raise "There is an error in index"
+          raise 'There is an error in index'
         end
       end
       """
@@ -46,11 +45,11 @@ Feature: No Database
       """
       Feature: posts
         Scenario: See them
-          When I do it
+          When I view the posts
       """
     And I write to "features/step_definitions/posts_steps.rb" with:
       """
-      When /^I do it$/ do
+      When('I view the posts') do
         visit '/posts'
       end
       """

data/features/raising_errors.feature

@@ -1,8 +1,8 @@
 Feature: Raise Errors
 
   Scenario: Raise error for undefined route
-    Given I have created a new Rails app "test-app" with no database and installed cucumber-rails
-    And I write to "features/tests.feature" with:
+    Given I have created a new Rails app with no database and installed cucumber-rails
+    When I write to "features/tests.feature" with:
       """
       Feature: Tests
         Scenario: Tests

data/features/rerun_profile.feature

@@ -24,15 +24,15 @@ Feature: Rerun profile
       """
     And a file named "features/step_definitions/rerun_steps.rb" with:
       """
-      Given /fixed now/ do
-        puts "All fixed now"
+      Given('fixed now') do
+        puts 'All fixed now'
       end
 
-      Given /broken/ do
+      Given('broken') do
         raise "I'm broken"
       end
 
-      Given /passing/ do
+      Given('passing') do
         puts "I've always been passing"
       end
       """

data/features/rest_api.feature

@@ -1,8 +1,8 @@
 Feature: REST API
 
   Scenario: Compare JSON
-    Given I have created a new Rails app "rails-app" and installed cucumber-rails
-    And I write to "app/controllers/posts_controller.rb" with:
+    Given I have created a new Rails app and installed cucumber-rails
+    When I write to "app/controllers/posts_controller.rb" with:
       """
       class PostsController < ApplicationController
         def index
@@ -12,7 +12,7 @@ Feature: REST API
       """
     And I write to "config/routes.rb" with:
       """
-      RailsApp::Application.routes.draw do
+      TestApp::Application.routes.draw do
         resources :posts
       end
       """
@@ -30,18 +30,18 @@ Feature: REST API
       """
     And I write to "features/step_definitions/rest_steps.rb" with:
       """
-      When /^the client requests GET (.*)$/ do |path|
+      When('the client requests GET /{word}') do |path|
         get(path)
       end
 
-      Then /^the response should be JSON:$/ do |json|
-        JSON.parse(last_response.body).should == JSON.parse(json)
+      Then(/^the response should be JSON:$/) do |json|
+        expect(JSON.parse(last_response.body)).to eq(JSON.parse(json))
       end
       """
     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)
-       2 steps (2 passed)
-       """
+      """
+      1 scenario (1 passed)
+      2 steps (2 passed)
+      """

data/features/step_definitions/cucumber_rails_steps.rb

@@ -1,124 +1,43 @@
-module CucumberRailsHelper
-  def rails_new(options = {})
-    options[:name] ||= 'test_app'
-    command = run "bundle exec rails new #{options[:name]} --skip-bundle --skip-test-unit --skip-spring #{options[:args]}"
-    expect(command).to have_output /README/
-    expect(last_command_started).to be_successfully_executed
-    cd options[:name]
-    delete_environment_variable 'RUBYOPT'
-    delete_environment_variable 'BUNDLE_BIN_PATH'
-    delete_environment_variable 'BUNDLE_GEMFILE'
-  end
-
-  def install_cucumber_rails(*options)
-    if options.include?(:not_in_test_group)
-      gem 'cucumber-rails', path: "#{File.expand_path('.')}"
-    else
-      gem 'cucumber-rails' , group: :test, require: false, path: "#{File.expand_path('.')}"
-    end
-
-    gem 'sqlite3', '~> 1.3.13'
-    if RUBY_VERSION < '2.4.0'
-      gem 'capybara', '< 3.16.0', group: :test
-    else
-      gem 'capybara', group: :test
-    end
-    gem 'selenium-webdriver', '~> 3.11', group: :test
-
-    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, *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
+# frozen_string_literal: true
 
-  def prepare_aruba_report
-    if(ENV['ARUBA_REPORT_DIR'])
-      @aruba_report_start = Time.new
-      sleep(1)
-    end
-  end
-
-  def fixture(path)
-    File.expand_path(File.dirname(__FILE__) + "./../support/fixtures/#{path}")
-  end
-end
-World(CucumberRailsHelper)
-
-Given /^I have created a new Rails app and installed cucumber\-rails, accidentally outside of the test group in my Gemfile$/ do
+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
-  prepare_aruba_report
-end
-
-Given /^I have created a new Rails app "([^"]*)" and installed cucumber\-rails$/ do |app_name|
-  rails_new name: app_name
-  install_cucumber_rails
-  create_web_steps
-  prepare_aruba_report
 end
 
-Given /^I have created a new Rails app and installed cucumber\-rails$/ do
+Given('I have created a new Rails app and installed cucumber-rails') do
   rails_new
   install_cucumber_rails
   create_web_steps
-  prepare_aruba_report
 end
 
-Given /^I have created a new Rails app with no database and installed cucumber-rails$/ do
+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 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_bot
-  overwrite_file('features/support/env.rb', "require 'cucumber/rails'\n")
-  create_web_steps
-end
-
-Given /^I have a "([^"]*)" ActiveRecord model object$/ do |name|
-  run_simple("bundle exec rails g model #{name}")
-  run_simple('bundle exec rake db:migrate RAILS_ENV=test')
+Given('I have a {string} ActiveRecord model object') do |name|
+  run_command_and_stop("bundle exec rails g model #{name}")
+  run_command_and_stop('bundle exec rake db:migrate RAILS_ENV=test')
 end
 
-Given /^I force selenium to run Firefox in headless mode$/ do
+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 = Selenium::WebDriver::Firefox::Options.new
       browser_options.args << '--headless'
-      Capybara::Selenium::Driver.new(app, browser: :firefox, options: browser_options, http_client: http_client)
+      Capybara::Selenium::Driver.new(
+        app,
+        browser: :firefox,
+        options: browser_options,
+        http_client: http_client
+      )
     end
 
     Capybara.server = :webrick
@@ -127,25 +46,25 @@ Given /^I force selenium to run Firefox in headless mode$/ do
   step 'I append to "features/support/env.rb" with:', selenium_config
 end
 
-When /^I run the cukes$/ do
-  run_simple('bundle exec cucumber')
+When('I run the cukes') do
+  run_command_and_stop('bundle exec cucumber')
 end
 
 # Copied from Aruba
-Then /^the feature run should pass with:$/ do |string|
+Then(/^the feature run should pass with:$/) do |string|
   step 'the output should not contain " failed)"'
   step 'the output should not contain " undefined)"'
   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|
+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
 

data/features/support/aruba.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Aruba.configure do |config|
   config.exit_timeout = 120
 end

data/features/support/cucumber_rails_helper.rb

@@ -0,0 +1,80 @@
+# frozen_string_literal: true
+
+module CucumberRailsHelper
+  def rails_new(options = {})
+    options[:name] ||= 'test_app'
+    command_result =
+      run_command "bundle exec rails new #{options[:name]} --skip-bundle --skip-test-unit --skip-spring --skip-bootsnap #{options[:args]}"
+    expect(command_result).to have_output(/README/)
+    expect(last_command_started).to be_successfully_executed
+    cd options[:name]
+    delete_environment_variable 'RUBYOPT'
+    delete_environment_variable 'BUNDLE_BIN_PATH'
+    delete_environment_variable 'BUNDLE_GEMFILE'
+  end
+
+  def install_cucumber_rails(*options)
+    add_conditional_gems(options)
+
+    gem 'selenium-webdriver', '~> 3.11', group: :test
+    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_command_and_stop 'bundle install'
+    run_command_and_stop 'bundle exec rails webpacker:install' if rails6?
+    run_command_and_stop 'bundle exec rails generate cucumber:install'
+  end
+
+  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 fixture(path)
+    File.expand_path(File.dirname(__FILE__) + "./../support/fixtures/#{path}")
+  end
+
+  private
+
+  def rails6?
+    `bundle exec rails -v`.start_with?('Rails 6')
+  end
+
+  def add_conditional_gems(options)
+    if options.include?(:not_in_test_group)
+      gem 'cucumber-rails', path: File.expand_path('.').to_s
+    else
+      gem 'cucumber-rails', group: :test, require: false, path: File.expand_path('.').to_s
+    end
+
+    if rails6?
+      gem 'sqlite3', '~> 1.4'
+    else
+      gem 'sqlite3', '~> 1.3.13'
+    end
+
+    if RUBY_VERSION < '2.4.0'
+      gem 'capybara', '< 3.16.0', group: :test
+    else
+      gem 'capybara', group: :test
+    end
+  end
+end
+
+World(CucumberRailsHelper)