8000 Refactor/tidy up deps (#574) · cucumber/cucumber-rails@48d9f16 · GitHub
[go: up one dir, main page]
Skip to content

Commit 48d9f16

Browse files
luke-hillluke-hill
authored
Refactor/tidy up deps (#574)
* Remove duplicate requires * SQLite3 is added during the rails new phase in features * Remove bundler as a verbose dependency - it is installed during rails new feature tests * Force ammeter upgrade * Fix issue where database wasn't loading the database folder
1 parent dc4fa79 commit 48d9f16

File tree

5 files changed

+10
-19
lines changed

5 files changed

+10
-19
lines changed

‎Rakefile

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,9 @@
33
CUCUMBER_RAILS_VERSION =
44
Gem::Specification.load("#{File.dirname(__FILE__)}/cucumber-rails.gemspec").version.version
55
require 'rubygems'
6-
require 'bundler'
7-
require 'bundler/setup'
86
require 'appraisal'
97
require 'rake/clean'
108
require 'pathname'
11-
Bundler::GemHelper.install_tasks
129

1310
$LOAD_PATH.unshift("#{File.dirname(__FILE__)}/lib")
1411
Dir["#{File.dirname(__FILE__)}/dev_tasks/*.rake"].sort.each { |ext| load ext }

‎cucumber-rails.gemspec

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,9 @@ Gem::Specification.new do |s|
2626
s.add_runtime_dependency('railties', '>= 5.2', '< 8')
2727

2828
# Main development dependencies
29-
s.add_development_dependency('ammeter', '>= 1.1.4')
29+
s.add_development_dependency('ammeter', '>= 1.1.5')
3030
s.add_development_dependency('appraisal', '>= 2.4.1', '< 3')
3131
s.add_development_dependency('aruba', '>= 1.1.2', '< 3')
32-
s.add_development_dependency('bundler', '>= 1.17')
3332
s.add_development_dependency('database_cleaner', '>= 1.8', '< 3.0')
3433
s.add_development_dependency('rails', '>= 5.2', '< 8')
3534
s.add_development_dependency('rake', '>= 12.0')
@@ -38,7 +37,6 @@ Gem::Specification.new do |s|
3837
s.add_development_dependency('rubocop-packaging', '~> 0.5.1')
3938
s.add_development_dependency('rubocop-performance', '~> 1.13.3')
4039
s.add_development_dependency('rubocop-rspec', '~> 2.10.0')
41-
s.add_development_dependency('sqlite3', '~> 1.3')
4240

4341
# For Documentation:
4442
s.add_development_dependency('yard', '~> 0.9.10')

‎lib/cucumber/rails/database.rb

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# frozen_string_literal: true
22

3+
require_relative 'database/strategy'
4+
require_relative 'database/deletion_strategy'
5+
require_relative 'database/null_strategy'
6+
require_relative 'database/shared_connection_strategy'
7+
require_relative 'database/truncation_strategy'
8+
39
module Cucumber
410
module Rails
511
module Database

‎spec/cucumber/rails/database_spec.rb

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
11
# frozen_string_literal: true
22

33
require 'database_cleaner'
4-
require 'cucumber/rails/database/strategy'
5-
require 'cucumber/rails/database/deletion_strategy'
6-
require 'cucumber/rails/database/null_strategy'
7-
require 'cucumber/rails/database/shared_connection_strategy'
8-
require 'cucumber/rails/database/truncation_strategy'
94
require 'cucumber/rails/database'
105

116
describe Cucumber::Rails::Database do
@@ -29,15 +24,13 @@
2924
it 'raises an error on `before_js` if no DatabaseCleaner cleaners exist' do
3025
allow(DatabaseCleaner).to receive(:cleaners).and_return({})
3126

32-
expect { described_class.before_js }
33-
.to raise_error(/No DatabaseCleaner strategies found/)
27+
expect { described_class.before_js }.to raise_error(/No DatabaseCleaner strategies found/)
3428
end
3529
end
3630

3731
context 'when using an invalid pre-determined strategy' do
3832
it 'raises an error if you use a non-understood strategy' do
39-
expect { described_class.javascript_strategy = :invalid }
40-
.to raise_error(Cucumber::Rails::Database::InvalidStrategy)
33+
expect { described_class.javascript_strategy = :invalid }.to raise_error(Cucumber::Rails::Database::InvalidStrategy)
4134
end
4235
end
4336

@@ -73,8 +66,7 @@ def before_non_js
7366
let(:invalid_strategy) { Class.new }
7467

7568
it 'raises an error if the strategy does not have a valid interface' do
76-
expect { described_class.javascript_strategy = invalid_strategy }
77-
.to raise_error(ArgumentError)
69+
expect { described_class.javascript_strategy = invalid_strategy }.to raise_error(ArgumentError)
7870
end
7971
end
8072
end

‎spec/spec_helper.rb

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
# frozen_string_literal: true
22

3-
require 'rspec/rails/fixture_support'
43
require 'rails/all'
54

65
ActiveRecord::Base.establish_connection adapter: 'sqlite3', database: ':memory:'
@@ -12,5 +11,4 @@ class Application < ::Rails::Application
1211
end
1312

1413
require 'rspec/support/spec'
15-
require 'rspec/rails'
1614
require 'ammeter/init'

0 commit comments

Comments
 (0)
0