Skip to content

Commit 77553c7

Browse files
committed
Fix tests
1 parent d91d5e1 commit 77553c7

10 files changed

+37
-4
lines changed

Appraisals

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,37 @@ end
1111
appraise "rails_7_1_sprockets" do
1212
gem "rails", "~> 7.1.0"
1313
gem "sprockets-rails"
14+
15+
group :test do
16+
remove_gem "concurrent-ruby"
17+
end
1418
end
1519

1620
appraise "rails_7_1_propshaft" do
1721
gem "rails", "~> 7.1.0"
1822
gem "propshaft"
23+
24+
group :test do
25+
remove_gem "concurrent-ruby"
26+
end
1927
end
2028

2129
appraise "rails_main_sprockets" do
2230
gem "rails", github: "rails/rails", branch: "main"
2331
gem "sprockets-rails"
32+
gem "sqlite3", ">= 2.1"
33+
34+
group :test do
35+
remove_gem "concurrent-ruby"
36+
end
2437
end
2538

2639
appraise "rails_main_propshaft" do
2740
gem "rails", github: "rails/rails", branch: "main"
2841
gem "propshaft"
42+
gem "sqlite3", ">= 2.1"
43+
44+
group :test do
45+
remove_gem "concurrent-ruby"
46+
end
2947
end

Gemfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,6 @@ group :test do
2222
gem "capybara"
2323
gem "selenium-webdriver"
2424
gem "webdrivers"
25+
26+
gem "concurrent-ruby", "1.3.4"
2527
end

Gemfile.lock

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -213,6 +213,7 @@ DEPENDENCIES
213213
appraisal
214214
byebug
215215
capybara
216+
concurrent-ruby (= 1.3.4)
216217
importmap-rails!
217218
rails (~> 6.1.0)
218219
rexml

gemfiles/rails_7_0_propshaft.gemfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ group :test do
1818
gem "capybara"
1919
gem "selenium-webdriver"
2020
gem "webdrivers"
21+
gem "concurrent-ruby", "1.3.4"
2122
end
2223

2324
gemspec path: "../"

gemfiles/rails_7_0_propshaft.gemfile.lock

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -219,6 +219,7 @@ DEPENDENCIES
219219
appraisal
220220
byebug
221221
capybara
222+
concurrent-ruby (= 1.3.4)
222223
importmap-rails!
223224
propshaft
224225
rails (~> 7.0.0)

gemfiles/rails_7_0_sprockets.gemfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ group :test do
1818
gem "capybara"
1919
gem "selenium-webdriver"
2020
gem "webdrivers"
21+
gem "concurrent-ruby", "1.3.4"
2122
end
2223

2324
gemspec path: "../"

gemfiles/rails_7_0_sprockets.gemfile.lock

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -221,6 +221,7 @@ DEPENDENCIES
221221
appraisal
222222
byebug
223223
capybara
224+
concurrent-ruby (= 1.3.4)
224225
importmap-rails!
225226
rails (~> 7.0.0)
226227
rexml

gemfiles/rails_main_propshaft.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
source "https://rubygems.org"
44

55
gem "rails", branch: "main", git: "https://github.com/rails/rails.git"
6-
gem "sqlite3"
6+
gem "sqlite3", ">= 2.1"
77
gem "propshaft"
88

99
group :development do

gemfiles/rails_main_sprockets.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
source "https://rubygems.org"
44

55
gem "rails", branch: "main", git: "https://github.com/rails/rails.git"
6-
gem "sqlite3"
6+
gem "sqlite3", ">= 2.1"
77
gem "sprockets-rails"
88

99
group :development do

test/installer_test.rb

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,13 +55,21 @@ def with_new_rails_app
5555
Rails::Generators::AppGenerator.start([app_dir, "--quiet", "--skip-bundle", "--skip-bootsnap"])
5656

5757
Dir.chdir(app_dir) do
58+
if Rails::VERSION::PRE == "alpha" && Gem.loaded_specs["sprockets-rails"]
59+
FileUtils.mkdir_p("app/assets/config")
60+
File.write("app/assets/config/manifest.js", "")
61+
end
62+
5863
gemfile = File.read("Gemfile")
59-
gemfile.gsub!(/^gem "importmap-rails".*/, "")
60-
gemfile << %(gem "importmap-rails", path: #{File.expand_path("..", __dir__).inspect}\n)
64+
if Gem.loaded_specs["rails"].version < Gem::Version.new("7.1")
65+
gemfile << %(gem "concurrent-ruby", "1.3.4"\n)
66+
end
6167
if Rails::VERSION::PRE == "alpha"
6268
gemfile.gsub!(/^gem "rails".*/, "")
6369
gemfile << %(gem "rails", path: #{Gem.loaded_specs["rails"].full_gem_path.inspect}\n)
6470
end
71+
gemfile.gsub!(/^gem "importmap-rails".*/, "")
72+
gemfile << %(gem "importmap-rails", path: #{File.expand_path("..", __dir__).inspect}\n)
6573
File.write("Gemfile", gemfile)
6674

6775
run_command("bundle", "install")

0 commit comments

Comments
 (0)