Skip to content

Commit a67fb9d

Browse files
committed

File tree

7 files changed

+5
-38
lines changed

7 files changed

+5
-38
lines changed

Gemfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,5 +29,4 @@ end
2929
custom_gemfile = File.expand_path('Gemfile-custom', __dir__)
3030
eval_gemfile custom_gemfile if File.exist?(custom_gemfile)
3131

32-
eval_gemfile 'Gemfile-sqlite-dependencies'
3332
eval_gemfile 'Gemfile-rails-dependencies'

Gemfile-rails-dependencies

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ def add_net_gems_dependency
1111
end
1212
end
1313

14+
# sqlite3 is an optional, unspecified, dependency and Rails 6.0 only supports `~> 1.4`
15+
gem 'sqlite3', '~> 1.4', platforms: [:ruby]
16+
1417
case version = ENV['RAILS_VERSION'] || (File.exist?(version_file) && File.read(version_file).chomp) || ''
1518
when /main/
1619
gem "rails", :git => "https://github.com/rails/rails.git"

Gemfile-sqlite-dependencies

Lines changed: 0 additions & 20 deletions
This file was deleted.

example_app_generator/config/initializers/sqlite3_fix.rb

Lines changed: 0 additions & 3 deletions
This file was deleted.

example_app_generator/generate_app.rb

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
'ci_retry_bundle_install.sh'
1212
)
1313
function_script_file = File.join(rspec_rails_repo_path, 'script/functions.sh')
14-
sqlite_initializer = File.join(rspec_rails_repo_path, "example_app_generator/config/initializers/sqlite3_fix.rb")
1514

1615
in_root do
1716
prepend_to_file "Rakefile", "require 'active_support/all'"
@@ -36,23 +35,14 @@
3635
EOT
3736
end
3837

39-
if Rails::VERSION::STRING >= '6'
40-
# sqlite3 is an optional, unspecified, dependency and Rails 6.0 only supports `~> 1.4`
41-
gsub_file "Gemfile", /.*gem..sqlite3.*/, "gem 'sqlite3', '~> 1.4'"
42-
else
43-
# Similarly, Rails 5.0 only supports '~> 1.3.6'. Rails 5.1-5.2 support '~> 1.3', '>= 1.3.6'
44-
gsub_file "Gemfile", /.*gem..sqlite3.*/, "gem 'sqlite3', '~> 1.3.6'"
45-
end
38+
# sqlite3 is an optional, unspecified, dependency and Rails 6.0 only supports `~> 1.4`
39+
gsub_file "Gemfile", /.*gem..sqlite3.*/, "gem 'sqlite3', '~> 1.4'"
4640

4741
# webdrivers 4 up until 4.3.0 don't specify `required_ruby_version`, but contain
4842
# Ruby 2.2-incompatible syntax (safe navigation).
4943
# That basically means we use pre-4.0 for Ruby 2.2, and 4.3+ for newer Rubies.
5044
gsub_file "Gemfile", /.*chromedriver-helper.*/, "gem 'webdrivers', '!= 4.0.0', '!= 4.0.1', '!= 4.1.0', '!= 4.1.1', '!= 4.1.2', '!= 4.1.3', '!= 4.2.0'"
5145

52-
if Rails::VERSION::STRING < '6'
53-
copy_file sqlite_initializer, 'config/initializers/sqlite3_fix.rb'
54-
end
55-
5646
if RUBY_ENGINE == "jruby"
5747
gsub_file "Gemfile", /.*jdbc.*/, ''
5848
end

snippets/avoid_fixture_name_collision.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
# Those Gemfiles carefully pick the right versions depending on
2121
# settings in the ENV, `.rails-version` and `maintenance-branch`.
2222
Dir.chdir('..') do
23-
eval_gemfile 'Gemfile-sqlite-dependencies'
2423
# This Gemfile expects `maintenance-branch` file to be present
2524
# in the current directory.
2625
eval_gemfile 'Gemfile-rspec-dependencies'

snippets/use_active_record_false.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
# Those Gemfiles carefully pick the right versions depending on
2121
# settings in the ENV, `.rails-version` and `maintenance-branch`.
2222
Dir.chdir('..') do
23-
eval_gemfile 'Gemfile-sqlite-dependencies'
2423
# This Gemfile expects `maintenance-branch` file to be present
2524
# in the current directory.
2625
eval_gemfile 'Gemfile-rspec-dependencies'

0 commit comments

Comments
 (0)