cucumber-rails 1.7.0 → 1.8.0

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

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,26 +1,31 @@
-# -*- encoding: utf-8 -*-
+# frozen_string_literal: true
+
 require 'cucumber/rails/database'
 
 describe Cucumber::Rails::Database do
+  before { allow(strategy_type).to receive(:new).and_return(strategy) }
 
-  let(:strategy) { double(before_js: nil, before_non_js: nil) }
+  let(:strategy) { instance_double(strategy_type, before_js: nil, before_non_js: nil) }
+  let(:strategy_type) { Cucumber::Rails::Database::TruncationStrategy }
 
   it 'forwards events to the selected strategy' do
-    allow(Cucumber::Rails::Database::TruncationStrategy).to receive_messages(new: strategy)
-    Cucumber::Rails::Database.javascript_strategy = :truncation
+    described_class.javascript_strategy = :truncation
 
     expect(strategy).to receive(:before_non_js).ordered
-    Cucumber::Rails::Database.before_non_js
+    described_class.before_non_js
 
     expect(strategy).to receive(:before_js).ordered
-    Cucumber::Rails::Database.before_js
+    described_class.before_js
   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)
+    expect { described_class.javascript_strategy = :invalid }
+      .to raise_error(Cucumber::Rails::Database::InvalidStrategy)
   end
 
   describe 'using a custom strategy' do
+    let(:strategy_type) { ValidStrategy }
+
     class ValidStrategy
       def before_js
         # Anything
@@ -31,27 +36,26 @@ describe Cucumber::Rails::Database do
       end
     end
 
-    class InvalidStrategy
-    end
+    class InvalidStrategy; end
 
     it 'raises an error if the strategy doens\'t support the protocol' do
-      expect { Cucumber::Rails::Database.javascript_strategy = InvalidStrategy }.to raise_error(ArgumentError)
+      expect { described_class.javascript_strategy = InvalidStrategy }
+        .to raise_error(ArgumentError)
     end
 
     it 'accepts a custom strategy with a valid interface' do
-      expect { Cucumber::Rails::Database.javascript_strategy = ValidStrategy }.not_to raise_error
+      expect { described_class.javascript_strategy = ValidStrategy }
+        .not_to raise_error
     end
 
     it 'forwards events to a custom strategy' do
-      allow(ValidStrategy).to receive_messages(new: strategy)
-      Cucumber::Rails::Database.javascript_strategy = ValidStrategy
+      described_class.javascript_strategy = ValidStrategy
 
       expect(strategy).to receive(:before_non_js).ordered
-      Cucumber::Rails::Database.before_non_js
+      described_class.before_non_js
 
       expect(strategy).to receive(:before_js).ordered
-      Cucumber::Rails::Database.before_js
+      described_class.before_js
     end
   end
-
 end

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

@@ -1,47 +1,57 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 # 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 }
 
+  let(:auto_generated_message) do
+    '# IMPORTANT: This file is generated by cucumber-rails - edit at your own peril.'
+  end
+
   describe 'no arguments' do
-    before { run_generator  }
+    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' if config.respond_to? :secret_key_base
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cucumber-rails
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.8.0
 platform: ruby
 authors:
 - Aslak Hellesøy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-18 00:00:00.000000000 Z
+date: 2019-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: '2.12'
     - - "<"
       - !ruby/object:Gem::Version
         version: '4'
@@ -28,7 +28,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: '2.12'
     - - "<"
       - !ruby/object:Gem::Version
         version: '4'
@@ -52,6 +52,26 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '4'
+- !ruby/object:Gem::Dependency
+  name: mime-types
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -86,206 +106,194 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '7'
-- !ruby/object:Gem::Dependency
-  name: mime-types
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.17'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.17'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4'
 - !ruby/object:Gem::Dependency
   name: ammeter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
-    - - "!="
-      - !ruby/object:Gem::Version
-        version: 1.1.3
+        version: 1.1.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
-    - - "!="
-      - !ruby/object:Gem::Version
-        version: 1.1.3
+        version: 1.1.4
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.2
+        version: 0.14.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.2
+        version: 0.14.4
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.5
+        version: '1.17'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.5
+        version: '1.17'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.2'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.66.0
+        version: '7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.2'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.66.0
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '10.3'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '10.3'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '3.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '3.6'
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.2'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: 0.72.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
-    - - "<"
+        version: 0.72.0
+- !ruby/object:Gem::Dependency
+  name: rubocop-performance
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: 1.4.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.13
+        version: 1.33.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.13
+        version: 1.33.0
 - !ruby/object:Gem::Dependency
-  name: rdiscount
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.7
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.7
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '6.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.7
+        version: 0.9.10
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.7
+        version: 0.9.10
 description: Cucumber Generator and Runtime for Rails
 email: cukes@googlegroups.com
 executables: []
@@ -334,10 +342,8 @@ files:
 - features/rest_api.feature
 - features/step_definitions/cucumber_rails_steps.rb
 - features/support/aruba.rb
-- features/support/bundler_pre_support.rb
+- features/support/cucumber_rails_helper.rb
 - features/support/env.rb
-- features/support/fixtures/bundler-1.0.21.gem
-- features/support/fixtures/bundler-1.1.rc.gem
 - features/support/legacy_web_steps_support.rb
 - gemfiles/rails_4_2.gemfile
 - gemfiles/rails_5_0.gemfile
@@ -358,19 +364,19 @@ files:
 - lib/cucumber/rails/hooks/mail.rb
 - lib/cucumber/rails/rspec.rb
 - lib/cucumber/rails/world.rb
-- lib/generators/cucumber/install/USAGE
-- lib/generators/cucumber/install/install_generator.rb
-- lib/generators/cucumber/install/templates/config/cucumber.yml.erb
-- lib/generators/cucumber/install/templates/script/cucumber
-- lib/generators/cucumber/install/templates/support/_rails_each_run.rb.erb
-- lib/generators/cucumber/install/templates/support/_rails_prefork.rb.erb
-- lib/generators/cucumber/install/templates/support/capybara.rb
-- lib/generators/cucumber/install/templates/support/edit_warning.txt
-- lib/generators/cucumber/install/templates/support/rails.rb.erb
-- lib/generators/cucumber/install/templates/support/rails_spork.rb.erb
-- lib/generators/cucumber/install/templates/tasks/cucumber.rake.erb
+- lib/generators/cucumber/USAGE
+- lib/generators/cucumber/install_generator.rb
+- lib/generators/cucumber/templates/config/cucumber.yml.erb
+- lib/generators/cucumber/templates/script/cucumber
+- lib/generators/cucumber/templates/support/_rails_each_run.rb.erb
+- lib/generators/cucumber/templates/support/_rails_prefork.rb.erb
+- lib/generators/cucumber/templates/support/capybara.rb
+- lib/generators/cucumber/templates/support/edit_warning.txt
+- lib/generators/cucumber/templates/support/rails.rb.erb
+- lib/generators/cucumber/templates/support/rails_spork.rb.erb
+- lib/generators/cucumber/templates/tasks/cucumber.rake.erb
 - spec/cucumber/rails/database_spec.rb
-- spec/generators/cucumber/install/install_generator_spec.rb
+- spec/generators/cucumber/install_generator_spec.rb
 - spec/spec_helper.rb
 homepage: http://cukes.info
 licenses:
@@ -384,18 +390,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.0
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
-summary: cucumber-rails-1.7.0
+summary: cucumber-rails-1.8.0
 test_files:
 - features/allow_rescue.feature
 - features/annotations.feature
@@ -411,11 +416,9 @@ test_files:
 - features/rest_api.feature
 - features/step_definitions/cucumber_rails_steps.rb
 - features/support/aruba.rb
-- features/support/bundler_pre_support.rb
+- features/support/cucumber_rails_helper.rb
 - features/support/env.rb
-- features/support/fixtures/bundler-1.0.21.gem
-- features/support/fixtures/bundler-1.1.rc.gem
 - features/support/legacy_web_steps_support.rb
 - spec/cucumber/rails/database_spec.rb
-- spec/generators/cucumber/install/install_generator_spec.rb
+- spec/generators/cucumber/install_generator_spec.rb
 - spec/spec_helper.rb