cucumber-rails 2.1.0 → 2.2.0

data/features/step_definitions/cucumber_rails_steps.rb

@@ -10,6 +10,17 @@ Given('I have created a new Rails app and installed cucumber-rails') do
   install_cucumber_rails
 end
 
+Given('I have created a new Rails app and installed cucumber-rails with database_cleaner-active_record') do
+  rails_new
+  install_cucumber_rails :no_database_cleaner, :database_cleaner_active_record
+end
+
+Given('I have created a new Rails app and installed cucumber-rails without database_cleaner') do
+  rails_new
+  install_cucumber_rails :no_database_cleaner
+  overwrite_file('features/support/env.rb', "require 'cucumber/rails'\n")
+end
+
 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

data/features/support/cucumber_rails_helper.rb

@@ -13,6 +13,7 @@ module CucumberRailsHelper
     add_gem 'selenium-webdriver', '~> 3.11', group: :test
     add_gem 'rspec-expectations', '~> 3.7', group: :test
     add_gem 'database_cleaner', '>= 1.8.0', group: :test unless options.include?(:no_database_cleaner)
+    add_gem 'database_cleaner-active_record', '>= 2.0.0.beta2', group: :test if options.include?(:database_cleaner_active_record)
     add_gem 'factory_bot', '>= 3.2', group: :test unless options.include?(:no_factory_bot)
 
     run_command_and_stop 'bundle install'

data/features/support/env.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-$LOAD_PATH.unshift(File.dirname(__FILE__) + '/../../lib')
+$LOAD_PATH.unshift("#{File.dirname(__FILE__)}/../../lib")
 
 require 'rspec/expectations'
 require 'aruba/cucumber'

data/gemfiles/rails_5_0.gemfile

@@ -2,9 +2,9 @@
 
 source "https://rubygems.org"
 
-gem "capybara", "< 3.16.0", platform: :mri_23
-gem "nokogiri", "< 1.9.1", platform: :mri_23
-gem "railties", "~> 5.0.7"
+gem "capybara", "< 3"
+gem "cucumber", "< 4"
+gem "rails", "~> 5.0.7"
 gem "sqlite3", "~> 1.3.13"
 
 gemspec path: "../"

data/gemfiles/rails_5_1.gemfile

@@ -2,9 +2,9 @@
 
 source "https://rubygems.org"
 
-gem "capybara", "< 3.16.0", platform: :mri_23
-gem "nokogiri", "< 1.9.1", platform: :mri_23
-gem "railties", "~> 5.1.7"
+gem "capybara", "< 3.15"
+gem "cucumber", "< 5"
+gem "rails", "~> 5.1.7"
 gem "sqlite3", "~> 1.3.13"
 
 gemspec path: "../"

data/gemfiles/rails_5_2.gemfile

@@ -2,9 +2,8 @@
 
 source "https://rubygems.org"
 
-gem "capybara", "< 3.16.0", platform: :mri_23
-gem "nokogiri", "< 1.9.1", platform: :mri_23
-gem "railties", "~> 5.2.0"
+gem "capybara", "< 3.33"
+gem "rails", "~> 5.2.4"
 gem "sqlite3", "~> 1.3.13"
 
 gemspec path: "../"

data/gemfiles/rails_6_0.gemfile

@@ -2,8 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "railties", "~> 6.0.0"
-gem "rails", "~> 6.0.0"
+gem "rails", "~> 6.0.3"
 gem "sqlite3", "~> 1.4"
 
 gemspec path: "../"

data/lib/cucumber/rails.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-called_from_env_rb = caller.detect { |f| f =~ /\/env\.rb:/ }
+called_from_env_rb = caller.detect { |f| f.include? '/env.rb:' }
 
 if called_from_env_rb
   env_caller = File.dirname(called_from_env_rb)
@@ -8,8 +8,8 @@ if called_from_env_rb
   require 'rails'
   require 'cucumber/rails/application'
   ENV['RAILS_ENV'] ||= 'test'
-  ENV['RAILS_ROOT'] ||= File.expand_path(env_caller + '/../..')
-  require File.expand_path(ENV['RAILS_ROOT'] + '/config/environment')
+  ENV['RAILS_ROOT'] ||= File.expand_path("#{env_caller}/../..")
+  require File.expand_path("#{ENV['RAILS_ROOT']}/config/environment")
   require 'cucumber/rails/action_dispatch'
   require 'rails/test_help'
 
@@ -22,6 +22,10 @@ if called_from_env_rb
   require 'cucumber/rails/world'
   require 'cucumber/rails/hooks'
   require 'cucumber/rails/capybara'
+  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'
 
   MultiTest.disable_autorun

data/lib/cucumber/rails/database.rb

@@ -25,6 +25,11 @@ module Cucumber
           validate_interface!
         end
 
+        def default_strategy!
+          self.javascript_strategy = :truncation
+          self.autorun_database_cleaner = true
+        end
+
         def before_js
           @strategy.before_js
         end
@@ -70,66 +75,7 @@ module Cucumber
         end
       end
 
-      class Strategy
-        def initialize(options = {})
-          @options = options
-        end
-
-        def before_js(strategy)
-          @original_strategy = if Gem::Version.new(DatabaseCleaner::VERSION) >= Gem::Version.new('1.8.0.beta')
-                                 DatabaseCleaner.cleaners.values.first.strategy # that feels like a nasty hack
-                               else
-                                 DatabaseCleaner.connections.first.strategy # that feels like a nasty hack
-                               end
-          DatabaseCleaner.strategy = strategy, @options
-        end
-
-        def before_non_js
-          # no-op
-        end
-
-        def after
-          return unless @original_strategy
-
-          DatabaseCleaner.strategy = @original_strategy
-          @original_strategy = nil
-        end
-      end
-
-      class TruncationStrategy < Strategy
-        def before_js
-          super :truncation
-        end
-      end
-
-      class DeletionStrategy < Strategy
-        def before_js
-          super :deletion
-        end
-      end
-
-      class SharedConnectionStrategy < Strategy
-        def before_js
-          # Forces all threads to share a connection on a per-model basis,
-          # as connections may vary per model as per establish_connection. This works
-          # on Capybara because it starts the web server in a thread.
-          ActiveRecord::Base.shared_connection = ActiveRecord::Base.connection
-          ActiveRecord::Base.descendants.each do |model|
-            model.shared_connection = model.connection
-          end
-        end
-
-        def before_non_js
-          # Do not use a shared connection unless we're in a @javascript scenario
-          ActiveRecord::Base.shared_connection = nil
-          ActiveRecord::Base.descendants.each do |model|
-            model.shared_connection = nil
-          end
-        end
-      end
-
-      Database.javascript_strategy = :truncation
-      Database.autorun_database_cleaner = true
+      default_strategy!
     end
   end
 end

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

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

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

@@ -0,0 +1,25 @@
+module Cucumber
+  module Rails
+    module Database
+      class SharedConnectionStrategy < Strategy
+        def before_js
+          # Forces all threads to share a connection on a per-model basis,
+          # as connections may vary per model as per establish_connection. This works
+          # on Capybara because it starts the web server in a thread.
+          ActiveRecord::Base.shared_connection = ActiveRecord::Base.connection
+          ActiveRecord::Base.descendants.each do |model|
+            model.shared_connection = model.connection
+          end
+        end
+
+        def before_non_js
+          # Do not use a shared connection unless we're in a @javascript scenario
+          ActiveRecord::Base.shared_connection = nil
+          ActiveRecord::Base.descendants.each do |model|
+            model.shared_connection = nil
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,31 @@
+module Cucumber
+  module Rails
+    module Database
+      class Strategy
+        def initialize(options = {})
+          @options = options
+        end
+
+        def before_js(strategy)
+          @original_strategy = if defined?(DatabaseCleaner::VERSION) && Gem::Version.new(DatabaseCleaner::VERSION) >= Gem::Version.new('1.8.0.beta')
+                                 DatabaseCleaner.cleaners.values.first.strategy # that feels like a nasty hack
+                               else
+                                 DatabaseCleaner.connections.first.strategy # that feels like a nasty hack
+                               end
+          DatabaseCleaner.strategy = strategy, @options
+        end
+
+        def before_non_js
+          # no-op
+        end
+
+        def after
+          return unless @original_strategy
+
+          DatabaseCleaner.strategy = @original_strategy
+          @original_strategy = nil
+        end
+      end
+    end
+  end
+end

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/active_record.rb

@@ -1,23 +1,25 @@
 # frozen_string_literal: true
 
-module ActiveRecord
-  class Base
-    class_attribute :shared_connection
+if defined?(ActiveRecord::Base)
+  module ActiveRecord
+    class Base
+      class_attribute :shared_connection
 
-    def self.connection
-      shared_connection || retrieve_connection
+      def self.connection
+        shared_connection || retrieve_connection
+      end
     end
   end
-end
 
-Before('@javascript') do
-  Cucumber::Rails::Database.before_js if Cucumber::Rails::Database.autorun_database_cleaner
-end
+  Before('@javascript') do
+    Cucumber::Rails::Database.before_js if Cucumber::Rails::Database.autorun_database_cleaner
+  end
 
-Before('not @javascript') do
-  Cucumber::Rails::Database.before_non_js if Cucumber::Rails::Database.autorun_database_cleaner
-end
+  Before('not @javascript') do
+    Cucumber::Rails::Database.before_non_js if Cucumber::Rails::Database.autorun_database_cleaner
+  end
 
-After do
-  Cucumber::Rails::Database.after if Cucumber::Rails::Database.autorun_database_cleaner
+  After do
+    Cucumber::Rails::Database.after if Cucumber::Rails::Database.autorun_database_cleaner
+  end
 end

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

@@ -1,8 +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
@@ -10,6 +18,4 @@ begin
   After('not @no-database-cleaner') do
     DatabaseCleaner.clean if Cucumber::Rails::Database.autorun_database_cleaner
   end
-rescue LoadError
-  Cucumber.logger.debug('database_cleaner gem not present.')
 end

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

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

data/spec/cucumber/rails/database_spec.rb

@@ -1,5 +1,9 @@
 # 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

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/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