Skip to content

Commit 413f481

Browse files
Christina Entchevacomposerinteralia
Christina Entcheva
andcommitted
Skip Spring version 2.1.1
Changes introduced in spring 2.1.1 (rails/spring#621) are breaking some tests. That change was reverted in rails/spring#629, but hasn't been released yet. Until #629 is released, this PR skips Spring version 2.1.1. Co-authored-by: Daniel J. Colson <daniel.colson@hey.com>
1 parent 9f5b5fc commit 413f481

File tree

7 files changed

+18
-16
lines changed

7 files changed

+18
-16
lines changed

Appraisals

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ appraise "rails5.0" do
44
gem "listen", "~> 3.0.5"
55
gem "puma", "~> 3.0"
66
gem "rails", "~> 5.0.7", ">= 5.0.7.2"
7-
gem "spring"
7+
gem "spring", "!= 2.1.1"
88
gem "spring-watcher-listen", "~> 2.0.0"
99
gem "sqlite3", "~> 1.3.6"
1010
end
@@ -14,7 +14,7 @@ appraise "rails5.1" do
1414
gem "listen", ">= 3.0.5", "< 3.2"
1515
gem "puma", "~> 3.7"
1616
gem "rails", "~> 5.1.7"
17-
gem "spring"
17+
gem "spring", "!= 2.1.1"
1818
gem "spring-watcher-listen", "~> 2.0.0"
1919
gem "sqlite3", "~> 1.3.6"
2020
end
@@ -24,7 +24,7 @@ appraise "rails5.2" do
2424
gem "listen", ">= 3.0.5", "< 3.2"
2525
gem "puma", "~> 3.11"
2626
gem "rails", "~> 5.2.4", ">= 5.2.4.2"
27-
gem "spring"
27+
gem "spring", "!= 2.1.1"
2828
gem "spring-watcher-listen", "~> 2.0.0"
2929
gem "sqlite3", "~> 1.3.6"
3030
end
@@ -34,7 +34,7 @@ appraise "rails6.0" do
3434
gem "listen", "~> 3.2"
3535
gem "puma", "~> 4.1"
3636
gem "rails", "~> 6.0.2", ">= 6.0.2.2"
37-
gem "spring"
37+
gem "spring", "!= 2.1.1"
3838
gem "spring-watcher-listen", "~> 2.0.0"
3939
gem "sqlite3", "~> 1.4"
4040
end

features/reloading.feature

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Feature: automatically reloading factory_bot definitions
1313
end
1414
end
1515
"""
16-
And I run `bundle exec rake db:migrate` with a clean environment
16+
And I run `bin/rails db:migrate` with a clean environment
1717

1818
Scenario: When using factory_bot_rails together with Spring
1919
I want changes to my application to trigger the factory_bot_rails reloader
@@ -44,14 +44,14 @@ Feature: automatically reloading factory_bot definitions
4444
end
4545
end
4646
"""
47-
And I run `bundle binstubs bundler rake spring --force` with a clean environment
47+
And I run `bundle binstubs bundler spring --force` with a clean environment
4848
And I run `bin/spring binstub --all` with a clean environment
49-
And I run `bin/rake test` with Spring enabled
49+
And I run `bin/rails test` with Spring enabled
5050
And I append to "app/models/user.rb" with:
5151
"""
5252
# User model edited
5353
"""
54-
And I run `bin/rake test` with Spring enabled
54+
And I run `bin/rails test` with Spring enabled
5555
And I run `spring stop` with a clean environment
5656
Then the output should contain "1 runs, 1 assertions"
5757
And the output should not contain "Failure:"
@@ -70,9 +70,9 @@ Feature: automatically reloading factory_bot definitions
7070
# Empty definition file to be picked up by the file watcher
7171
7272
"""
73-
And I run `bundle binstubs bundler rake spring --force` with a clean environment
73+
And I run `bundle binstubs bundler spring --force` with a clean environment
7474
And I run `bin/spring binstub --all` with a clean environment
75-
And I run `bin/rake test` with Spring enabled
75+
And I run `bin/rails test` with Spring enabled
7676
And I append to "test/factories.rb" with:
7777
"""
7878
FactoryBot.define do
@@ -93,7 +93,7 @@ Feature: automatically reloading factory_bot definitions
9393
end
9494
end
9595
"""
96-
And I run `bin/rake test` with Spring enabled
96+
And I run `bin/rails test` with Spring enabled
9797
And I run `spring stop` with a clean environment
9898
Then the output should contain "1 runs, 1 assertions"
9999
And the output should not contain "Failure:"
@@ -130,6 +130,6 @@ Feature: automatically reloading factory_bot definitions
130130
end
131131
end
132132
"""
133-
And I run `bundle exec rake test` with a clean environment
133+
And I run `bin/rails test` with a clean environment
134134
Then the output should contain "1 runs, 1 assertions"
135135
And the output should not contain "Failure:"

features/support/rails_template

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
if Rails.gem_version < Gem::Version.new('6')
22
gsub_file "Gemfile", /^gem 'sqlite3'$/, 'gem "sqlite3", "~> 1.3.6"'
33
end
4+
5+
gsub_file "Gemfile", /^ gem 'spring'$/, ' gem "spring", "!= 2.1.1"'

gemfiles/rails5.0.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ gem "byebug"
1212
gem "listen", "~> 3.0.5"
1313
gem "puma", "~> 3.0"
1414
gem "rails", "~> 5.0.7", ">= 5.0.7.2"
15-
gem "spring"
15+
gem "spring", "!= 2.1.1"
1616
gem "spring-watcher-listen", "~> 2.0.0"
1717
gem "sqlite3", "~> 1.3.6"
1818

gemfiles/rails5.1.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ gem "byebug"
1212
gem "listen", ">= 3.0.5", "< 3.2"
1313
gem "puma", "~> 3.7"
1414
gem "rails", "~> 5.1.7"
15-
gem "spring"
15+
gem "spring", "!= 2.1.1"
1616
gem "spring-watcher-listen", "~> 2.0.0"
1717
gem "sqlite3", "~> 1.3.6"
1818

gemfiles/rails5.2.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ gem "byebug"
1212
gem "listen", ">= 3.0.5", "< 3.2"
1313
gem "puma", "~> 3.11"
1414
gem "rails", "~> 5.2.4", ">= 5.2.4.2"
15-
gem "spring"
15+
gem "spring", "!= 2.1.1"
1616
gem "spring-watcher-listen", "~> 2.0.0"
1717
gem "sqlite3", "~> 1.3.6"
1818

gemfiles/rails6.0.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ gem "byebug"
1212
gem "listen", "~> 3.2"
1313
gem "puma", "~> 4.1"
1414
gem "rails", "~> 6.0.2", ">= 6.0.2.2"
15-
gem "spring"
15+
gem "spring", "!= 2.1.1"
1616
gem "spring-watcher-listen", "~> 2.0.0"
1717
gem "sqlite3", "~> 1.4"
1818

0 commit comments

Comments
 (0)