cucumber-rails 1.7.0 → 1.8.0

data/dev_tasks/cucumber.rake

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'cucumber/rake/task'
 
 Cucumber::Rake::Task.new

data/dev_tasks/rspec.rake

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new

data/dev_tasks/yard.rake

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'yard'
 require 'yard/rake/yardoc_task'
 
@@ -6,9 +8,8 @@ API_DIR = File.join(SITE_DIR, 'api', 'cucumber-rails', 'ruby', 'yardoc')
 
 namespace :api do
   file :dir do
-    unless File.directory?(SITE_DIR)
-      raise "You need to git clone git@github.com:cucumber/cucumber.github.com.git #{SITE_DIR}"
-    end
+    raise "You need to git clone git@github.com:cucumber/cucumber.github.com.git #{SITE_DIR}" unless File.directory?(SITE_DIR)
+
     sh('git pull origin master')
     mkdir_p API_DIR
   end
@@ -18,7 +19,7 @@ namespace :api do
   YARD::Rake::YardocTask.new(:yard) do |yard|
     dir = API_DIR
     mkdir_p dir
-    yard.options = ["--out", dir]
+    yard.options = ['--out', dir]
   end
   task yard: :dir
 
@@ -31,5 +32,5 @@ namespace :api do
   end
 
   desc "Generate YARD docs for Cucumber-Rails' API"
-  task doc: [:yard, :release]
+  task doc: %i[yard release]
 end

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

@@ -1,4 +1,9 @@
+# frozen_string_literal: true
+
 def init
   super
-  options[:serializer].serialize('/images/bubble_32x32.png', IO.read(File.dirname(__FILE__) + '/bubble_32x32.png'))
+  options[:serializer].serialize(
+    '/images/bubble_32x32.png',
+    IO.read(File.dirname(__FILE__) + '/bubble_32x32.png')
+  )
 end

data/features/allow_rescue.feature

@@ -1,37 +1,37 @@
 Feature: Allow Cucumber to rescue exceptions
 
   Background: A controller that raises an exception
-    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
-          raise "There is an error in index"
+          raise 'There is an error in index'
         end
       end
       """
     And I write to "config/routes.rb" with:
       """
-      RailsApp::Application.routes.draw do
+      TestApp::Application.routes.draw do
         resources :posts
       end
       """
 
   Scenario: Allow rescue
-    Given I write to "features/posts.feature" with:
+    When I write to "features/posts.feature" with:
       """
       Feature: posts
         @allow-rescue
         Scenario: See posts
-        When I look at the posts
-        Then I should see the public error page
+          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
+      When('I look at the posts') do
         visit '/posts'
       end
-      Then /^I should see the public error page$/ do
+      Then('I should see the public error page') do
         expect(page).to have_content "We're sorry, but something went wrong."
       end
       """
@@ -44,7 +44,7 @@ Feature: Allow Cucumber to rescue exceptions
       """
 
   Scenario: Don't allow rescue
-    Given I write to "features/posts.feature" with:
+    When I write to "features/posts.feature" with:
       """
       Feature: posts
         Scenario: See them
@@ -52,7 +52,7 @@ Feature: Allow Cucumber to rescue exceptions
       """
     And I write to "features/step_definitions/posts_steps.rb" with:
       """
-      When /^I look at the posts$/ do
+      When('I look at the posts') do
         visit '/posts'
       end
       """

data/features/annotations.feature

@@ -5,8 +5,8 @@ Feature: Annotations
   I should be able to list annotations in my features
 
   Background:
-    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/capybara_javascript_drivers.feature

@@ -4,37 +4,28 @@ Feature: Capybara Javascript Drivers
   Background: A simple calendar app
     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 `bundle exec rails g scaffold appointment name:string when:datetime`
+    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 "([^"]+)" as the "([^"]+)" time$/ do |time, selector|
-        select_time(time, from: selector)
-      end
-
-      When /^(?:|I )select "([^"]+)" as the "([^"]+)" date$/ do |date, selector|
-        select_date(date, from: selector)
-      end
-
-      When /^(?:|I )select "([^"]+)" as the "([^"]+)" date and time$/ do |datetime, selector|
+      When('I select {string} as the {string} date and time') do |datetime, selector|
         select_datetime(datetime, from: selector)
       end
       """
 
   Scenario: Use a particular driver
-    Given I write to "features/create_appointment.feature" with:
+    When I write to "features/create_appointment.feature" with:
       """
       @javascript
       Feature: Create appointments
-        Scenario: Constitution on May 17
+        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"
-
       """
-    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:
       """
@@ -43,28 +34,26 @@ Feature: Capybara Javascript Drivers
       """
 
   Scenario: Mixed DB access
-    Given I write to "features/create_appointment.feature" with:
+    When I write to "features/create_appointment.feature" with:
       """
       @javascript
       Feature: Create appointments
-        Scenario: Constitution on May 17
+        Scenario: Visit the Constitution on May 17
           Given a random appointment
-          And I am viewing random appointment
+          And I am viewing a random appointment
           Then I should see "Random appointment"
-
       """
     And I write to "features/step_definitions/custom_steps.rb" with:
       """
-      Given /^a random appointment$/ do
+      Given('a random appointment') do
         @appointment = Appointment.create!(name: 'Random appointment', when: DateTime.now)
       end
 
-      Given /^I am viewing random appointment$/ do
+      Given('I am viewing a random appointment') do
         visit appointment_path(@appointment)
       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:
       """

data/features/choose_javascript_database_strategy.feature

@@ -1,6 +1,6 @@
 Feature: Choose javascript database strategy
 
-  When running a scenario with the @javascript tag, Capybara will fire up a web server
+  Whilst 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 FactoryBot) won't be visible to the web server
@@ -26,9 +26,23 @@ Feature: Choose javascript database strategy
   Background:
     Given I have created a new Rails app and installed cucumber-rails
     And I have a "Widget" ActiveRecord model object
+    When I write to "features/step_definitions/widget_steps.rb" with:
+      """
+      When('I create {int} widgets') do |number|
+        number.times { Widget.create! }
+      end
+
+      Then('I should have {int} widgets') do |number|
+        expect(Widget.count).to eq(number)
+      end
+
+      Then('the DatabaseCleaner strategy should be {word}') do |strategy_name|
+        expect(DatabaseCleaner.connections.first.strategy.to_s).to match(/#{strategy_name}/i)
+      end
+      """
 
   Scenario: Set the strategy to truncation and run a javascript scenario.
-    Given I append to "features/env.rb" with:
+    When I append to "features/env.rb" with:
       """
       DatabaseCleaner.strategy = :transaction
       Cucumber::Rails::Database.javascript_strategy = :truncation
@@ -37,13 +51,13 @@ Feature: Choose javascript database strategy
       """
       Feature:
         Background:
-          Given I have created 2 widgets
+          When I create 2 widgets
 
         @javascript
         Scenario:
-          Then the DatabaseCleaner strategy should be truncation
           When I create 3 widgets
-          Then I should have 5 widgets
+          Then the DatabaseCleaner strategy should be truncation
+          And I should have 5 widgets
 
         @javascript
         Scenario:
@@ -54,29 +68,15 @@ Feature: Choose javascript database strategy
           Then the DatabaseCleaner strategy should be transaction
           And I should have 2 widgets
       """
-    And I write to "features/step_definitions/widget_steps.rb" with:
+    And I run the cukes
+    Then the feature run should pass with:
       """
-      Given /created? (\d) widgets/ do |num|
-        num.to_i.times { Widget.create! }
-      end
-
-      Then /should have (\d) widgets/ do |num|
-        Widget.count.should == num.to_i
-      end
-
-     Then /^the DatabaseCleaner strategy should be (\w+)$/ do |strategy_name|
-        DatabaseCleaner.connections.first.strategy.to_s.should =~ /#{strategy_name}/i
-      end
+      3 scenarios (3 passed)
+      10 steps (10 passed)
       """
-    When I run the cukes
-    Then the feature run should pass with:
-       """
-       3 scenarios (3 passed)
-       10 steps (10 passed)
-       """
 
- Scenario: Set the strategy to deletion and run a javascript scenario.
-    Given I append to "features/env.rb" with:
+  Scenario: Set the strategy to deletion and run a javascript scenario.
+    When I append to "features/env.rb" with:
       """
       Cucumber::Rails::Database.javascript_strategy = :deletion
       """
@@ -85,7 +85,7 @@ Feature: Choose javascript database strategy
       @javascript
       Feature:
         Background:
-          Given I have created 2 widgets
+          When I create 2 widgets
 
         Scenario:
           When I create 3 widgets
@@ -94,27 +94,17 @@ Feature: Choose javascript database strategy
         Scenario:
           Then I should have 2 widgets
       """
-    And I write to "features/step_definitions/widget_steps.rb" with:
+    And I run the cukes
+    Then the feature run should pass with:
       """
-      Given /created? (\d) widgets/ do |num|
-        num.to_i.times { Widget.create! }
-      end
-
-      Then /should have (\d) widgets/ do |num|
-        Widget.count.should == num.to_i
-      end
+      2 scenarios (2 passed)
+      5 steps (5 passed)
       """
-    When I run the cukes
-    Then the feature run should pass with:
-       """
-       2 scenarios (2 passed)
-       5 steps (5 passed)
-     """
 
   Scenario: Set the strategy to truncation with an except option and run a javascript scenario.
-    Given I append to "features/env.rb" with:
+    When I append to "features/env.rb" with:
       """
-     Cucumber::Rails::Database.javascript_strategy = :truncation, {:except=>%w[widgets]}
+      Cucumber::Rails::Database.javascript_strategy = :truncation, { except: %w[widgets] }
       """
     And I write to "features/widgets.feature" with:
       """
@@ -127,19 +117,9 @@ Feature: Choose javascript database strategy
         Scenario:
           Then I should have 3 widgets
       """
-    And I write to "features/step_definitions/widget_steps.rb" with:
+    And I run the cukes
+    Then the feature run should pass with:
       """
-      Given /created? (\d) widgets/ do |num|
-        num.to_i.times { Widget.create! }
-      end
-
-      Then /should have (\d) widgets/ do |num|
-        Widget.count.should == num.to_i
-      end
+      2 scenarios (2 passed)
+      3 steps (3 passed)
       """
-    When I run the cukes
-    Then the feature run should pass with:
-       """
-       2 scenarios (2 passed)
-       3 steps (3 passed)
-       """

data/features/database_cleaner.feature

@@ -2,10 +2,10 @@ Feature: DatabaseCleaner
 
   Scenario: Create records in background
     Given I have created a new Rails app and installed cucumber-rails
-    And I write to "features/widgets.feature" with:
+    When I write to "features/widgets.feature" with:
       """
       Feature: Create widgets
-        Background: some widdgets
+        Background: some widgets
           Given I have 2 widgets
 
         Scenario: Add 3
@@ -19,26 +19,26 @@ Feature: DatabaseCleaner
     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|
+      Given('I have {int} widgets') do |number|
+        number.times do |i|
           Widget.create! name: "Widget #{Widget.count + i}"
         end
       end
 
-      When /^I create (\d+) more widgets$/ do |n|
-        n.to_i.times do |i|
+      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 (\d+) widgets$/ do |n|
-        Widget.count.should == n.to_i
+      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)
-       """
+      """
+      2 scenarios (2 passed)
+      6 steps (6 passed)
+      """

data/features/disable_automatic_database_cleaning.feature

@@ -12,7 +12,7 @@ Feature: Disable automatic database cleaning
 
   Scenario: Disabling automatic cleaning
     Given I have created a new Rails app and installed cucumber-rails
-    And I append to "features/env.rb" with:
+    When I append to "features/env.rb" with:
       """
       Cucumber::Rails::Database.autorun_database_cleaner = false
       """
@@ -30,26 +30,20 @@ Feature: Disable automatic database cleaning
     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|
+      When('I create {int} widgets') do |number|
+        number.times do |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}"
-        end
-      end
-
-      Then /^I should have (\d+) widgets$/ do |n|
-        Widget.count.should == n.to_i
+      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)
-       4 steps (4 passed)
-       """
+      """
+      2 scenarios (2 passed)
+      4 steps (4 passed)
+      """