Skip to content

Commit 5ac412a

Browse files
committed
Fix tests
1 parent b9fd81e commit 5ac412a

File tree

4 files changed

+23
-2
lines changed

4 files changed

+23
-2
lines changed

Appraisals

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,46 @@
11
appraise "rails_7_0_sprockets" do
22
gem "rails", "~> 7.0.0"
33
gem "sprockets-rails"
4-
gem "concurrent-ruby", "1.3.4"
54
end
65

76
appraise "rails_7_0_propshaft" do
87
gem "rails", "~> 7.0.0"
98
gem "propshaft"
10-
gem "concurrent-ruby", "1.3.4"
119
end
1210

1311
appraise "rails_7_1_sprockets" do
1412
gem "rails", "~> 7.1.0"
1513
gem "sprockets-rails"
14+
15+
group :test do
16+
remove_gem "concurrent-ruby"
17+
end
1618
end
1719

1820
appraise "rails_7_1_propshaft" do
1921
gem "rails", "~> 7.1.0"
2022
gem "propshaft"
23+
24+
group :test do
25+
remove_gem "concurrent-ruby"
26+
end
2127
end
2228

29+
2330
appraise "rails_main_sprockets" do
2431
gem "rails", github: "rails/rails", branch: "main"
2532
gem "sprockets-rails"
33+
34+
group :test do
35+
remove_gem "concurrent-ruby"
36+
end
2637
end
2738

2839
appraise "rails_main_propshaft" do
2940
gem "rails", github: "rails/rails", branch: "main"
3041
gem "propshaft"
42+
43+
group :test do
44+
remove_gem "concurrent-ruby"
45+
end
3146
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

test/installer_test.rb

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,9 @@ def with_new_rails_app
5858
gemfile = File.read("Gemfile")
5959
gemfile.gsub!(/^gem "importmap-rails".*/, "")
6060
gemfile << %(gem "importmap-rails", path: #{File.expand_path("..", __dir__).inspect}\n)
61+
if Gem.loaded_specs["rails"].version < Gem::Version.new("7.1")
62+
gemfile << %(gem "concurrent-ruby", "1.3.4"\n)
63+
end
6164
if Rails::VERSION::PRE == "alpha"
6265
gemfile.gsub!(/^gem "rails".*/, "")
6366
gemfile << %(gem "rails", path: #{Gem.loaded_specs["rails"].full_gem_path.inspect}\n)

0 commit comments

Comments
 (0)