From 9de5e2b765679355c266277c5424242d1c815fe4 Mon Sep 17 00:00:00 2001 From: Christina Entcheva Date: Mon, 11 Jan 2021 23:06:27 -0500 Subject: [PATCH] Skip Spring version 2.1.1 (#389) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Skip Spring version 2.1.1 Changes introduced in spring 2.1.1 (https://github.com/rails/spring/pull/621) are breaking some tests. That change was reverted in https://github.com/rails/spring/pull/629, but hasn't been released yet. Until #629 is released, this PR skips Spring version 2.1.1. * Bump to latest standard to match CI We are using the latest standard on CI. This bumps the version in the dev Gemfile to match, and fixes one violation. Co-authored-by: Daniel J. Colson --- Appraisals | 8 ++++---- Gemfile.lock | 31 ++++++++++++++++--------------- features/reloading.feature | 16 ++++++++-------- features/support/env.rb | 2 +- features/support/rails_template | 2 ++ gemfiles/rails5.0.gemfile | 2 +- gemfiles/rails5.1.gemfile | 2 +- gemfiles/rails5.2.gemfile | 2 +- gemfiles/rails6.0.gemfile | 2 +- 9 files changed, 35 insertions(+), 32 deletions(-) diff --git a/Appraisals b/Appraisals index 488a77f..9d4326e 100644 --- a/Appraisals +++ b/Appraisals @@ -4,7 +4,7 @@ appraise "rails5.0" do gem "listen", "~> 3.0.5" gem "puma", "~> 3.0" gem "rails", "~> 5.0.7", ">= 5.0.7.2" - gem "spring" + gem "spring", "!= 2.1.1" gem "spring-watcher-listen", "~> 2.0.0" gem "sqlite3", "~> 1.3.6" end @@ -14,7 +14,7 @@ appraise "rails5.1" do gem "listen", ">= 3.0.5", "< 3.2" gem "puma", "~> 3.7" gem "rails", "~> 5.1.7" - gem "spring" + gem "spring", "!= 2.1.1" gem "spring-watcher-listen", "~> 2.0.0" gem "sqlite3", "~> 1.3.6" end @@ -24,7 +24,7 @@ appraise "rails5.2" do gem "listen", ">= 3.0.5", "< 3.2" gem "puma", "~> 3.11" gem "rails", "~> 5.2.4", ">= 5.2.4.2" - gem "spring" + gem "spring", "!= 2.1.1" gem "spring-watcher-listen", "~> 2.0.0" gem "sqlite3", "~> 1.3.6" end @@ -34,7 +34,7 @@ appraise "rails6.0" do gem "listen", "~> 3.2" gem "puma", "~> 4.1" gem "rails", "~> 6.0.2", ">= 6.0.2.2" - gem "spring" + gem "spring", "!= 2.1.1" gem "spring-watcher-listen", "~> 2.0.0" gem "sqlite3", "~> 1.4" end diff --git a/Gemfile.lock b/Gemfile.lock index 1c8b388..da39cbe 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -73,8 +73,8 @@ GEM nokogiri (1.10.9) mini_portile2 (~> 2.4.0) nokogiri (1.10.9-java) - parallel (1.19.2) - parser (2.7.1.4) + parallel (1.20.1) + parser (3.0.0.0) ast (~> 2.4.1) rack (2.2.3) rack-test (1.1.0) @@ -92,7 +92,7 @@ GEM thor (>= 0.20.3, < 2.0) rainbow (3.0.0) rake (13.0.1) - regexp_parser (1.7.1) + regexp_parser (2.0.3) rexml (3.2.4) rspec-core (3.9.2) rspec-support (~> 3.9.3) @@ -111,23 +111,24 @@ GEM rspec-mocks (~> 3.9) rspec-support (~> 3.9) rspec-support (3.9.3) - rubocop (0.85.1) + rubocop (1.7.0) parallel (~> 1.10) - parser (>= 2.7.0.1) + parser (>= 2.7.1.5) rainbow (>= 2.2.2, < 4.0) - regexp_parser (>= 1.7) + regexp_parser (>= 1.8, < 3.0) rexml - rubocop-ast (>= 0.0.3) + rubocop-ast (>= 1.2.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 2.0) - rubocop-ast (0.1.0) - parser (>= 2.7.0.1) - rubocop-performance (1.6.1) - rubocop (>= 0.71.0) - ruby-progressbar (1.10.1) - standard (0.4.7) - rubocop (~> 0.85.0) - rubocop-performance (~> 1.6.0) + rubocop-ast (1.4.0) + parser (>= 2.7.1.5) + rubocop-performance (1.9.2) + rubocop (>= 0.90.0, < 2.0) + rubocop-ast (>= 0.4.0) + ruby-progressbar (1.11.0) + standard (0.11.0) + rubocop (= 1.7.0) + rubocop-performance (= 1.9.2) thor (1.0.1) thread_safe (0.3.6) thread_safe (0.3.6-java) diff --git a/features/reloading.feature b/features/reloading.feature index 94477be..39f1de2 100644 --- a/features/reloading.feature +++ b/features/reloading.feature @@ -13,7 +13,7 @@ Feature: automatically reloading factory_bot definitions end end """ - And I run `bundle exec rake db:migrate` with a clean environment + And I run `bin/rails db:migrate` with a clean environment Scenario: When using factory_bot_rails together with Spring I want changes to my application to trigger the factory_bot_rails reloader @@ -44,14 +44,14 @@ Feature: automatically reloading factory_bot definitions end end """ - And I run `bundle binstubs bundler rake spring --force` with a clean environment + And I run `bundle binstubs bundler spring --force` with a clean environment And I run `bin/spring binstub --all` with a clean environment - And I run `bin/rake test` with Spring enabled + And I run `bin/rails test` with Spring enabled And I append to "app/models/user.rb" with: """ # User model edited """ - And I run `bin/rake test` with Spring enabled + And I run `bin/rails test` with Spring enabled And I run `spring stop` with a clean environment Then the output should contain "1 runs, 1 assertions" And the output should not contain "Failure:" @@ -70,9 +70,9 @@ Feature: automatically reloading factory_bot definitions # Empty definition file to be picked up by the file watcher """ - And I run `bundle binstubs bundler rake spring --force` with a clean environment + And I run `bundle binstubs bundler spring --force` with a clean environment And I run `bin/spring binstub --all` with a clean environment - And I run `bin/rake test` with Spring enabled + And I run `bin/rails test` with Spring enabled And I append to "test/factories.rb" with: """ FactoryBot.define do @@ -93,7 +93,7 @@ Feature: automatically reloading factory_bot definitions end end """ - And I run `bin/rake test` with Spring enabled + And I run `bin/rails test` with Spring enabled And I run `spring stop` with a clean environment Then the output should contain "1 runs, 1 assertions" And the output should not contain "Failure:" @@ -130,6 +130,6 @@ Feature: automatically reloading factory_bot definitions end end """ - And I run `bundle exec rake test` with a clean environment + And I run `bin/rails test` with a clean environment Then the output should contain "1 runs, 1 assertions" And the output should not contain "Failure:" diff --git a/features/support/env.rb b/features/support/env.rb index 07116c6..ad198f4 100644 --- a/features/support/env.rb +++ b/features/support/env.rb @@ -4,7 +4,7 @@ PROJECT_ROOT = File.expand_path(File.join(File.dirname(__FILE__), "..", "..")).freeze Aruba.configure do |config| - config.exit_timeout = Integer ENV.fetch("ARUBA_TIMEOUT") { 120 } + config.exit_timeout = Integer ENV.fetch("ARUBA_TIMEOUT", 120) end if RUBY_PLATFORM == "java" diff --git a/features/support/rails_template b/features/support/rails_template index e78f549..6b085b7 100644 --- a/features/support/rails_template +++ b/features/support/rails_template @@ -1,3 +1,5 @@ if Rails.gem_version < Gem::Version.new('6') gsub_file "Gemfile", /^gem 'sqlite3'$/, 'gem "sqlite3", "~> 1.3.6"' end + +gsub_file "Gemfile", /^ gem 'spring'$/, ' gem "spring", "!= 2.1.1"' diff --git a/gemfiles/rails5.0.gemfile b/gemfiles/rails5.0.gemfile index 9d38bc3..df56be8 100644 --- a/gemfiles/rails5.0.gemfile +++ b/gemfiles/rails5.0.gemfile @@ -12,7 +12,7 @@ gem "byebug" gem "listen", "~> 3.0.5" gem "puma", "~> 3.0" gem "rails", "~> 5.0.7", ">= 5.0.7.2" -gem "spring" +gem "spring", "!= 2.1.1" gem "spring-watcher-listen", "~> 2.0.0" gem "sqlite3", "~> 1.3.6" diff --git a/gemfiles/rails5.1.gemfile b/gemfiles/rails5.1.gemfile index 5744131..7468b1e 100644 --- a/gemfiles/rails5.1.gemfile +++ b/gemfiles/rails5.1.gemfile @@ -12,7 +12,7 @@ gem "byebug" gem "listen", ">= 3.0.5", "< 3.2" gem "puma", "~> 3.7" gem "rails", "~> 5.1.7" -gem "spring" +gem "spring", "!= 2.1.1" gem "spring-watcher-listen", "~> 2.0.0" gem "sqlite3", "~> 1.3.6" diff --git a/gemfiles/rails5.2.gemfile b/gemfiles/rails5.2.gemfile index 4baa2f7..ab2384e 100644 --- a/gemfiles/rails5.2.gemfile +++ b/gemfiles/rails5.2.gemfile @@ -12,7 +12,7 @@ gem "byebug" gem "listen", ">= 3.0.5", "< 3.2" gem "puma", "~> 3.11" gem "rails", "~> 5.2.4", ">= 5.2.4.2" -gem "spring" +gem "spring", "!= 2.1.1" gem "spring-watcher-listen", "~> 2.0.0" gem "sqlite3", "~> 1.3.6" diff --git a/gemfiles/rails6.0.gemfile b/gemfiles/rails6.0.gemfile index 556751d..8ef5084 100644 --- a/gemfiles/rails6.0.gemfile +++ b/gemfiles/rails6.0.gemfile @@ -12,7 +12,7 @@ gem "byebug" gem "listen", "~> 3.2" gem "puma", "~> 4.1" gem "rails", "~> 6.0.2", ">= 6.0.2.2" -gem "spring" +gem "spring", "!= 2.1.1" gem "spring-watcher-listen", "~> 2.0.0" gem "sqlite3", "~> 1.4"