cucumber-rails 1.5.0 → 2.1.0

data/features/database_cleaner.feature

@@ -1,44 +1,44 @@
-Feature: DatabaseCleaner
+Feature: Database Cleaner
 
   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: 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
       """
-    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}"
+      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|
-          Widget.create! :name => "Widget #{Widget.count + 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
       """
@@ -27,29 +27,23 @@ 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}"
+      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)
+      """

data/features/emulate_javascript.feature

@@ -1,44 +1,53 @@
 Feature: Emulate Javascript
 
-  Scenario: See a widget
+  Background:
     Given I have created a new Rails app and installed cucumber-rails
-    And I successfully 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:
-      """
-      Given /^there is a widget named "([^"]*)"$/ do |name|
-        FactoryGirl.create(:widget, :name => name)
+    And I force selenium to run Firefox in headless mode
+    When I run `rails generate scaffold widget name:string`
+    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:
       """
-      FactoryGirl.define do
+      FactoryBot.define do
         factory :widget do
-          name 'testwidget'
+          name { 'testwidget' }
         end
       end
       """
-    When I run `bundle exec rake db:migrate`
+
+  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:
-       """
-       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 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`
+    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:
       """
       class SessionController < ApplicationController
@@ -51,42 +60,50 @@ 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
       """
-    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 "([^"]*)"$/ do |name|
-        FactoryGirl.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:
-      """
-      FactoryGirl.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
       """
-    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/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
+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,11 +1,11 @@
 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 +17,7 @@ Feature: No Database
 
       module TestApp
         class Application < Rails::Application
-          config.encoding = "utf-8"
+          config.encoding = 'utf-8'
           config.filter_parameters += [:password]
         end
       end
@@ -26,24 +26,13 @@ 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
         def index
-          raise "There is an error in index"
+          raise 'There is an error in index'
         end
       end
       """
@@ -57,11 +46,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,12 +1,18 @@
 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/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
@@ -8,6 +9,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,23 +17,31 @@ Feature: Rerun profile
         Scenario: failing before
           Given fixed now
 
+        Scenario: still failing
+          Given broken
+
         Scenario: always passing
           Given passing
       """
     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
+        raise "I'm broken"
       end
 
-      Given /passing/ do
+      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

@@ -1,18 +1,18 @@
 Feature: REST API
 
   Scenario: Compare JSON
-    Given I have created a new Rails app "rails-3-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
-          render :json => {'hello' => 'world'}.to_json
+          render json: {'hello' => 'world'}.to_json
         end
       end
       """
     And I write to "config/routes.rb" with:
       """
-      Rails3App::Application.routes.draw do
+      TestApp::Application.routes.draw do
         resources :posts
       end
       """
@@ -28,20 +28,20 @@ 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 (.*)$/ 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)
+      """