cucumber-rails 1.6.0 → 2.2.0

data/lib/cucumber/rails/database/truncation_strategy.rb

@@ -0,0 +1,11 @@
+module Cucumber
+  module Rails
+    module Database
+      class TruncationStrategy < Strategy
+        def before_js
+          super :truncation
+        end
+      end
+    end
+  end
+end

data/lib/cucumber/rails/hooks.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'cucumber/rails/hooks/active_record'
 require 'cucumber/rails/hooks/database_cleaner'
 require 'cucumber/rails/hooks/allow_rescue'

data/lib/cucumber/rails/hooks/active_record.rb

@@ -1,9 +1,13 @@
+# frozen_string_literal: true
+
 if defined?(ActiveRecord::Base)
-  class ActiveRecord::Base
-    class_attribute :shared_connection
+  module ActiveRecord
+    class Base
+      class_attribute :shared_connection
 
-    def self.connection
-      self.shared_connection || retrieve_connection
+      def self.connection
+        shared_connection || retrieve_connection
+      end
     end
   end
 

data/lib/cucumber/rails/hooks/allow_rescue.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Before('@allow-rescue') do
   @__orig_allow_rescue = ActionController::Base.allow_rescue
   ActionController::Base.allow_rescue = true

data/lib/cucumber/rails/hooks/database_cleaner.rb

@@ -1,6 +1,16 @@
+# frozen_string_literal: true
+
 begin
-  require 'database_cleaner'
+  require 'database_cleaner/core'
+rescue LoadError
+  begin
+    require 'database_cleaner'
+  rescue LoadError
+    Cucumber.logger.debug('neither database_cleaner v1 or v2 present')
+  end
+end
 
+if defined?(DatabaseCleaner)
   Before('not @no-database-cleaner') do
     DatabaseCleaner.start if Cucumber::Rails::Database.autorun_database_cleaner
   end
@@ -8,6 +18,4 @@ begin
   After('not @no-database-cleaner') do
     DatabaseCleaner.clean if Cucumber::Rails::Database.autorun_database_cleaner
   end
-
-rescue LoadError => ignore_if_database_cleaner_not_present
 end

data/lib/cucumber/rails/hooks/mail.rb

@@ -1,4 +1,6 @@
-if defined?(ActionMailer::Base)
+# frozen_string_literal: true
+
+if defined?(::ActionMailer)
   Before do
     ActionMailer::Base.deliveries = []
   end

data/lib/cucumber/rails/rspec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'cucumber/rails/world'
 
 begin
@@ -8,7 +10,7 @@ begin
       include RSpec::Matchers
     end
   end
-rescue LoadError => try_rspec_1
+rescue LoadError
   require 'spec/expectations'
   require 'spec/rails'
 

data/lib/cucumber/rails/world.rb

@@ -1,21 +1,38 @@
+# frozen_string_literal: true
+
 begin
   # Try to load it so we can assign @_result below if needed.
   require 'test/unit/testresult'
-rescue LoadError => ignore
+rescue LoadError
+  Cucumber.logger.debug('Minitest not found.')
+end
+
+module Cucumber
+  module Rails
+    class << self
+      def include_rack_test_helpers?
+        # Using ActiveModel Boolean casting here will give false positives more often than not!
+        !ENV['CR_REMOVE_RACK_TEST_HELPERS']&.casecmp('true')&.zero?
+      end
+    end
+  end
 end
 
-module Cucumber #:nodoc:
-  module Rails #:nodoc:
-    class World < ActionDispatch::IntegrationTest #:nodoc:
-      include Rack::Test::Methods
+module Cucumber
+  module Rails
+    class World < ::ActionDispatch::IntegrationTest
+      include Rack::Test::Methods if Cucumber::Rails.include_rack_test_helpers?
       include ActiveSupport::Testing::SetupAndTeardown if ActiveSupport::Testing.const_defined?('SetupAndTeardown')
 
-      def initialize #:nodoc:
+      def initialize
         @_result = Test::Unit::TestResult.new if defined?(Test::Unit::TestResult)
       end
 
       unless defined?(ActiveRecord::Base)
-        def self.fixture_table_names; []; end # Workaround for projects that don't use ActiveRecord
+        # Workaround for projects that don't use ActiveRecord
+        def self.fixture_table_names
+          []
+        end
       end
     end
   end

data/lib/generators/cucumber/{install/install_generator.rb → install_generator.rb}

@@ -1,13 +1,22 @@
+# frozen_string_literal: true
+
 require 'rbconfig'
 
 module Cucumber
   class InstallGenerator < ::Rails::Generators::Base
-    source_root File.expand_path('../templates', __FILE__)
+    source_root File.expand_path('templates', __dir__)
 
     DEFAULT_SHEBANG = File.join(RbConfig::CONFIG['bindir'], RbConfig::CONFIG['ruby_install_name'])
 
-    class_option :spork,         type: :boolean, desc: 'Use Spork'
-    class_option :skip_database, type: :boolean, desc: 'Skip modification of database.yml', aliases: '-D', default: false
+    class_option :spork,
+                 type: :boolean,
+                 desc: 'Use Spork'
+
+    class_option :skip_database,
+                 type: :boolean,
+                 desc: 'Skip modification of database.yml',
+                 aliases: '-D',
+                 default: false
 
     def create_templates
       template 'config/cucumber.yml.erb', 'config/cucumber.yml'
@@ -39,13 +48,13 @@ module Cucumber
 
     def create_database
       return unless File.exist?('config/database.yml')
-      unless File.read('config/database.yml').include? 'cucumber:'
-        gsub_file 'config/database.yml', /^test:.*\n/, "test: &test\n"
-        gsub_file 'config/database.yml', /\z/, "\ncucumber:\n  <<: *test\n"
+      return unless File.read('config/database.yml').include? 'cucumber:'
 
-        # Since gsub_file doesn't ask the user, just inform user that the file was overwritten.
-        puts '       force  config/database.yml'
-      end
+      gsub_file 'config/database.yml', /^test:.*\n/, "test: &test\n"
+      gsub_file 'config/database.yml', /\z/, "\ncucumber:\n  <<: *test\n"
+
+      # Since gsub_file doesn't ask the user, just inform user that the file was overwritten.
+      puts '       force  config/database.yml'
     end
 
     protected
@@ -60,7 +69,11 @@ module Cucumber
 
     def embed_template(source, indent = '')
       template = File.join(self.class.source_root, source)
-      ERB.new(IO.read(template), nil, '-').result(binding).gsub(/^/, indent)
+      if RUBY_VERSION >= '2.6'
+        ERB.new(IO.read(template), trim_mode: '-').result(binding).gsub(/^/, indent)
+      else
+        ERB.new(IO.read(template), nil, '-').result(binding).gsub(/^/, indent)
+      end
     end
   end
 end

data/lib/generators/cucumber/{install/templates → templates}/script/cucumber

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 vendored_cucumber_bin = Dir["#{File.dirname(__FILE__)}/../vendor/{gems,plugins}/cucumber*/bin/cucumber"].first
 if vendored_cucumber_bin

data/lib/generators/cucumber/{install/templates → templates}/support/capybara.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Capybara defaults to CSS3 selectors rather than XPath.
 # If you'd prefer to use XPath, just uncomment this line and adjust any
 # selectors in your step definitions to use the XPath syntax.

data/spec/cucumber/rails/database_spec.rb

@@ -1,57 +1,74 @@
-# -*- encoding: utf-8 -*-
+# frozen_string_literal: true
+
+require 'cucumber/rails/database/strategy'
+require 'cucumber/rails/database/deletion_strategy'
+require 'cucumber/rails/database/shared_connection_strategy'
+require 'cucumber/rails/database/truncation_strategy'
 require 'cucumber/rails/database'
 
 describe Cucumber::Rails::Database do
+  before { allow(strategy_type).to receive(:new).and_return(strategy) }
+
+  let(:strategy) { instance_double(strategy_type, before_js: nil, before_non_js: nil) }
+  let(:strategy_type) { Cucumber::Rails::Database::TruncationStrategy }
 
-  let(:strategy) { double(before_js: nil, before_non_js: nil) }
+  context 'when using a valid pre-determined strategy' do
+    before { described_class.javascript_strategy = :truncation }
 
-  it 'forwards events to the selected strategy' do
-    allow(Cucumber::Rails::Database::TruncationStrategy).to receive_messages(new: strategy)
-    Cucumber::Rails::Database.javascript_strategy = :truncation
+    it 'forwards a `before_non_js` event to the selected strategy' do
+      expect(strategy).to receive(:before_non_js)
+
+      described_class.before_non_js
+    end
 
-    expect(strategy).to receive(:before_non_js).ordered
-    Cucumber::Rails::Database.before_non_js
+    it 'forwards a `before_js` event to the selected strategy' do
+      expect(strategy).to receive(:before_js)
 
-    expect(strategy).to receive(:before_js).ordered
-    Cucumber::Rails::Database.before_js
+      described_class.before_js
+    end
   end
 
-  it 'raises an error if you use a non-understood strategy' do
-    expect { Cucumber::Rails::Database.javascript_strategy = :invalid }.to raise_error(Cucumber::Rails::Database::InvalidStrategy)
+  context 'when using an invalid pre-determined strategy' do
+    it 'raises an error if you use a non-understood strategy' do
+      expect { described_class.javascript_strategy = :invalid }
+        .to raise_error(Cucumber::Rails::Database::InvalidStrategy)
+    end
   end
 
-  describe 'using a custom strategy' do
-    class ValidStrategy
-      def before_js
-        # Anything
-      end
+  context 'when using a valid custom strategy' do
+    before { described_class.javascript_strategy = strategy_type }
 
-      def before_non_js
-        # Likewise
+    let(:strategy_type) do
+      Class.new do
+        def before_js
+          # Anything
+        end
+
+        def before_non_js
+          # Likewise
+        end
       end
     end
 
-    class InvalidStrategy
-    end
+    it 'forwards a `before_non_js` event to the strategy' do
+      expect(strategy).to receive(:before_non_js)
 
-    it 'raises an error if the strategy doens\'t support the protocol' do
-      expect { Cucumber::Rails::Database.javascript_strategy = InvalidStrategy }.to raise_error(ArgumentError)
+      described_class.before_non_js
     end
 
-    it 'accepts a custom strategy with a valid interface' do
-      expect { Cucumber::Rails::Database.javascript_strategy = ValidStrategy }.not_to raise_error
-    end
+    it 'forwards a `before_js` event to the strategy' do
+      expect(strategy).to receive(:before_js)
 
-    it 'forwards events to a custom strategy' do
-      allow(ValidStrategy).to receive_messages(new: strategy)
-      Cucumber::Rails::Database.javascript_strategy = ValidStrategy
+      described_class.before_js
+    end
+  end
 
-      expect(strategy).to receive(:before_non_js).ordered
-      Cucumber::Rails::Database.before_non_js
+  context 'when using an invalid custom strategy' do
+    let(:invalid_strategy) { Class.new }
 
-      expect(strategy).to receive(:before_js).ordered
-      Cucumber::Rails::Database.before_js
+    it 'raises an error if the strategy does not have a valid interface' do
+      expect { described_class.javascript_strategy = invalid_strategy }
+        .to raise_error(ArgumentError)
     end
   end
-
 end

data/spec/examples.txt

@@ -0,0 +1,19 @@
+example_id                                                    | status | run_time        |
+------------------------------------------------------------- | ------ | --------------- |
+./spec/cucumber/rails/database_spec.rb[1:1:1]                 | passed | 0.00057 seconds |
+./spec/cucumber/rails/database_spec.rb[1:1:2]                 | passed | 0.00845 seconds |
+./spec/cucumber/rails/database_spec.rb[1:2:1]                 | passed | 0.00046 seconds |
+./spec/cucumber/rails/database_spec.rb[1:3:1]                 | passed | 0.00683 seconds |
+./spec/cucumber/rails/database_spec.rb[1:3:2]                 | passed | 0.00494 seconds |
+./spec/cucumber/rails/database_spec.rb[1:4:1]                 | passed | 0.69664 seconds |
+./spec/generators/cucumber/install_generator_spec.rb[1:1:1:1] | passed | 0.0271 seconds  |
+./spec/generators/cucumber/install_generator_spec.rb[1:1:1:2] | passed | 0.0285 seconds  |
+./spec/generators/cucumber/install_generator_spec.rb[1:1:2:1] | passed | 0.05333 seconds |
+./spec/generators/cucumber/install_generator_spec.rb[1:1:3:1] | passed | 0.02378 seconds |
+./spec/generators/cucumber/install_generator_spec.rb[1:1:3:2] | passed | 0.04247 seconds |
+./spec/generators/cucumber/install_generator_spec.rb[1:1:3:3] | passed | 0.05091 seconds |
+./spec/generators/cucumber/install_generator_spec.rb[1:1:4:1] | passed | 0.04202 seconds |
+./spec/generators/cucumber/install_generator_spec.rb[1:1:4:2] | passed | 0.04029 seconds |
+./spec/generators/cucumber/install_generator_spec.rb[1:1:4:3] | passed | 0.01359 seconds |
+./spec/generators/cucumber/install_generator_spec.rb[1:1:5:1] | passed | 0.04387 seconds |
+./spec/generators/cucumber/install_generator_spec.rb[1:1:5:2] | passed | 0.03496 seconds |

data/spec/generators/cucumber/{install/install_generator_spec.rb → install_generator_spec.rb}

@@ -1,47 +1,55 @@
-require 'spec_helper'
+# frozen_string_literal: true
 
 # Generators are not automatically loaded by Rails
-require 'generators/cucumber/install/install_generator'
+require 'generators/cucumber/install_generator'
 
 describe Cucumber::InstallGenerator do
   # Tell the generator where to put its output (what it thinks of as Rails.root)
-  destination File.expand_path('../../../../../tmp', __FILE__)
+  destination File.expand_path('../../../../tmp', __dir__)
 
   before { prepare_destination }
 
-  describe 'no arguments' do
-    before { run_generator  }
+  let(:auto_generated_message) do
+    '# IMPORTANT: This file is generated by cucumber-rails - edit at your own peril.'
+  end
+
+  context 'without arguments' do
+    before { run_generator }
 
     describe 'config/cucumber.yml' do
       subject { file('config/cucumber.yml') }
+
       it { is_expected.to exist }
       it { is_expected.to contain 'default: <%= std_opts %> features' }
     end
 
     describe 'features/step_definitions folder' do
       subject { file('features/step_definitions') }
+
       it { is_expected.to exist }
     end
 
     describe 'features/support/env.rb' do
       subject { file('features/support/env.rb') }
+
       it { is_expected.to exist }
-      it { is_expected.to contain '# IMPORTANT: This file is generated by cucumber-rails - edit at your own peril.' }
+      it { is_expected.to contain auto_generated_message }
       it { is_expected.to contain "require 'cucumber/rails'" }
     end
 
     describe 'lib/tasks/cucumber.rake' do
       subject { file('lib/tasks/cucumber.rake') }
+
       it { is_expected.to exist }
-      it { is_expected.to contain '# IMPORTANT: This file is generated by cucumber-rails - edit at your own peril.' }
+      it { is_expected.to contain auto_generated_message }
       it { is_expected.to contain "task cucumber: 'cucumber:ok'" }
     end
 
     describe 'script/cucumber' do
       subject { file('script/cucumber') }
+
       it { is_expected.to exist }
       it { is_expected.to contain 'load Cucumber::BINARY' }
     end
-
   end
 end

data/spec/spec_helper.rb

@@ -1,11 +1,13 @@
+# frozen_string_literal: true
+
 require 'rspec/rails/fixture_support'
 require 'rails/all'
 
-ActiveRecord::Base.establish_connection adapter: "sqlite3", database: ":memory:"
+ActiveRecord::Base.establish_connection adapter: 'sqlite3', database: ':memory:'
 
 module CucumberRails
   class Application < ::Rails::Application
-    self.config.secret_key_base = 'ASecretString' if config.respond_to? :secret_key_base
+    config.secret_key_base = 'ASecretString'
   end
 end
 

data/tmp/aruba/test_app/Gemfile

@@ -0,0 +1,62 @@
+source 'https://rubygems.org'
+git_source(:github) { |repo| "https://github.com/#{repo}.git" }
+
+ruby '2.5.8'
+
+# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
+gem 'rails', '~> 5.2.4', '>= 5.2.4.3'
+# Use sqlite3 as the database for Active Record
+gem 'sqlite3', "~> 1.3.13"
+
+# Use Puma as the app server
+gem 'puma', '~> 3.11'
+# Use SCSS for stylesheets
+gem 'sass-rails', '~> 5.0'
+# Use Uglifier as compressor for JavaScript assets
+gem 'uglifier', '>= 1.3.0'
+# See https://github.com/rails/execjs#readme for more supported runtimes
+# gem 'mini_racer', platforms: :ruby
+
+# Use CoffeeScript for .coffee assets and views
+gem 'coffee-rails', '~> 4.2'
+# Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks
+gem 'turbolinks', '~> 5'
+# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
+gem 'jbuilder', '~> 2.5'
+# Use Redis adapter to run Action Cable in production
+# gem 'redis', '~> 4.0'
+# Use ActiveModel has_secure_password
+# gem 'bcrypt', '~> 3.1.7'
+
+# Use ActiveStorage variant
+# gem 'mini_magick', '~> 4.8'
+
+# Use Capistrano for deployment
+# gem 'capistrano-rails', group: :development
+
+group :development, :test do
+  # Call 'byebug' anywhere in the code to stop execution and get a debugger console
+  gem 'byebug', platforms: [:mri, :mingw, :x64_mingw]
+end
+
+group :development do
+  # Access an interactive console on exception pages or by calling 'console' anywhere in the code.
+  gem 'web-console', '>= 3.3.0'
+  gem 'listen', '>= 3.0.5', '< 3.2'
+end
+
+group :test do
+  # Adds support for Capybara system testing and selenium driver
+  gem 'capybara', group: :test
+
+  gem 'selenium-webdriver', "~> 3.11", group: :test
+
+  # Easy installation and use of chromedriver to run system tests with Chrome
+  gem 'chromedriver-helper'
+end
+
+# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
+gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
+gem 'cucumber-rails', group: :test, require: false, path: "/home/luke/Code/cucumber-rails"
+gem 'rspec-expectations', "~> 3.7", group: :test
+gem 'factory_bot', ">= 3.2", group: :test