From fb74a7d3e3e4b7fc503d88f7ec637dc83c089f31 Mon Sep 17 00:00:00 2001 From: Eric Boehs Date: Fri, 24 Mar 2023 09:40:58 -0500 Subject: [PATCH] Update Rails to 6-1-stable (#12242) - Rack-test needs to be locked or tests fail --- Gemfile | 4 +- Gemfile.lock | 180 +++++++++++++++++++++++++-------------------------- 2 files changed, 91 insertions(+), 93 deletions(-) diff --git a/Gemfile b/Gemfile index 6623283c7a6..ea2429fed6e 100644 --- a/Gemfile +++ b/Gemfile @@ -32,7 +32,7 @@ path 'modules' do gem 'veteran_verification' end -gem 'rails', '~> 6.1.7' +gem 'rails', github: 'rails/rails', branch: '6-1-stable' gem 'aasm' gem 'active_model_serializers', git: 'https://github.com/department-of-veterans-affairs/active_model_serializers', branch: 'master' @@ -190,7 +190,7 @@ group :development, :test do gem 'guard-rspec' gem 'parallel_tests' gem 'pry-byebug' - gem 'rack-test', require: 'rack/test' + gem 'rack-test', '1.1.0', require: 'rack/test' gem 'rack-vcr' gem 'rainbow' # Used to colorize output for rake tasks gem 'rspec-instrumentation-matcher' diff --git a/Gemfile.lock b/Gemfile.lock index f561712fe07..a4b41835d60 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -64,6 +64,92 @@ GIT multi_json (~> 1.0) script_utils (= 0.0.4) +GIT + remote: https://github.com/rails/rails.git + revision: bc2f390f7d2a96030532f41c08205f159e05af10 + branch: 6-1-stable + specs: + actioncable (6.1.7.3) + actionpack (= 6.1.7.3) + activesupport (= 6.1.7.3) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) + actionmailbox (6.1.7.3) + actionpack (= 6.1.7.3) + activejob (= 6.1.7.3) + activerecord (= 6.1.7.3) + activestorage (= 6.1.7.3) + activesupport (= 6.1.7.3) + mail (>= 2.7.1) + actionmailer (6.1.7.3) + actionpack (= 6.1.7.3) + actionview (= 6.1.7.3) + activejob (= 6.1.7.3) + activesupport (= 6.1.7.3) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (6.1.7.3) + actionview (= 6.1.7.3) + activesupport (= 6.1.7.3) + rack (~> 2.0, >= 2.0.9) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.2.0) + actiontext (6.1.7.3) + actionpack (= 6.1.7.3) + activerecord (= 6.1.7.3) + activestorage (= 6.1.7.3) + activesupport (= 6.1.7.3) + nokogiri (>= 1.8.5) + actionview (6.1.7.3) + activesupport (= 6.1.7.3) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.1, >= 1.2.0) + activejob (6.1.7.3) + activesupport (= 6.1.7.3) + globalid (>= 0.3.6) + activemodel (6.1.7.3) + activesupport (= 6.1.7.3) + activerecord (6.1.7.3) + activemodel (= 6.1.7.3) + activesupport (= 6.1.7.3) + activestorage (6.1.7.3) + actionpack (= 6.1.7.3) + activejob (= 6.1.7.3) + activerecord (= 6.1.7.3) + activesupport (= 6.1.7.3) + marcel (~> 1.0) + mini_mime (>= 1.1.0) + activesupport (6.1.7.3) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 1.6, < 2) + minitest (>= 5.1) + tzinfo (~> 2.0) + zeitwerk (~> 2.3) + rails (6.1.7.3) + actioncable (= 6.1.7.3) + actionmailbox (= 6.1.7.3) + actionmailer (= 6.1.7.3) + actionpack (= 6.1.7.3) + actiontext (= 6.1.7.3) + actionview (= 6.1.7.3) + activejob (= 6.1.7.3) + activemodel (= 6.1.7.3) + activerecord (= 6.1.7.3) + activestorage (= 6.1.7.3) + activesupport (= 6.1.7.3) + bundler (>= 1.15.0) + railties (= 6.1.7.3) + sprockets-rails (>= 2.0.0) + railties (6.1.7.3) + actionpack (= 6.1.7.3) + activesupport (= 6.1.7.3) + method_source + rake (>= 12.2) + thor (~> 1.0) + PATH remote: modules specs: @@ -126,70 +212,11 @@ GEM Ascii85 (1.1.0) aasm (5.5.0) concurrent-ruby (~> 1.0) - actioncable (6.1.7.3) - actionpack (= 6.1.7.3) - activesupport (= 6.1.7.3) - nio4r (~> 2.0) - websocket-driver (>= 0.6.1) - actionmailbox (6.1.7.3) - actionpack (= 6.1.7.3) - activejob (= 6.1.7.3) - activerecord (= 6.1.7.3) - activestorage (= 6.1.7.3) - activesupport (= 6.1.7.3) - mail (>= 2.7.1) - actionmailer (6.1.7.3) - actionpack (= 6.1.7.3) - actionview (= 6.1.7.3) - activejob (= 6.1.7.3) - activesupport (= 6.1.7.3) - mail (~> 2.5, >= 2.5.4) - rails-dom-testing (~> 2.0) - actionpack (6.1.7.3) - actionview (= 6.1.7.3) - activesupport (= 6.1.7.3) - rack (~> 2.0, >= 2.0.9) - rack-test (>= 0.6.3) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (6.1.7.3) - actionpack (= 6.1.7.3) - activerecord (= 6.1.7.3) - activestorage (= 6.1.7.3) - activesupport (= 6.1.7.3) - nokogiri (>= 1.8.5) - actionview (6.1.7.3) - activesupport (= 6.1.7.3) - builder (~> 3.1) - erubi (~> 1.4) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (6.1.7.3) - activesupport (= 6.1.7.3) - globalid (>= 0.3.6) - activemodel (6.1.7.3) - activesupport (= 6.1.7.3) - activerecord (6.1.7.3) - activemodel (= 6.1.7.3) - activesupport (= 6.1.7.3) activerecord-import (1.4.1) activerecord (>= 4.2) activerecord-postgis-adapter (7.1.1) activerecord (~> 6.1) rgeo-activerecord (~> 7.0.0) - activestorage (6.1.7.3) - actionpack (= 6.1.7.3) - activejob (= 6.1.7.3) - activerecord (= 6.1.7.3) - activesupport (= 6.1.7.3) - marcel (~> 1.0) - mini_mime (>= 1.1.0) - activesupport (6.1.7.3) - concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (>= 1.6, < 2) - minitest (>= 5.1) - tzinfo (~> 2.0) - zeitwerk (~> 2.3) addressable (2.8.1) public_suffix (>= 2.0.2, < 6.0) adler32 (0.0.2) @@ -444,7 +471,7 @@ GEM git (1.13.0) addressable (~> 2.8) rchardet (~> 1.8) - globalid (1.0.1) + globalid (1.1.0) activesupport (>= 5.0) google-api-client (0.53.0) google-apis-core (~> 0.1) @@ -593,14 +620,6 @@ GEM nokogiri (1.14.2) mini_portile2 (~> 2.8.0) racc (~> 1.4) - nokogiri (1.14.2-java) - racc (~> 1.4) - nokogiri (1.14.2-x64-mingw32) - racc (~> 1.4) - nokogiri (1.14.2-x86-mingw32) - racc (~> 1.4) - nokogiri (1.14.2-x86_64-linux) - racc (~> 1.4) nori (2.6.0) notiffany (0.1.3) nenv (~> 0.1) @@ -698,21 +717,6 @@ GEM rack-timeout (0.6.3) rack-vcr (0.1.6) vcr (>= 2.9) - rails (6.1.7.3) - actioncable (= 6.1.7.3) - actionmailbox (= 6.1.7.3) - actionmailer (= 6.1.7.3) - actionpack (= 6.1.7.3) - actiontext (= 6.1.7.3) - actionview (= 6.1.7.3) - activejob (= 6.1.7.3) - activemodel (= 6.1.7.3) - activerecord (= 6.1.7.3) - activestorage (= 6.1.7.3) - activesupport (= 6.1.7.3) - bundler (>= 1.15.0) - railties (= 6.1.7.3) - sprockets-rails (>= 2.0.0) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) @@ -724,12 +728,6 @@ GEM rack railties (>= 5.1) semantic_logger (~> 4.9) - railties (6.1.7.3) - actionpack (= 6.1.7.3) - activesupport (= 6.1.7.3) - method_source - rake (>= 12.2) - thor (~> 1.0) rainbow (3.1.1) rake (13.0.6) rb-fsevent (0.11.0) @@ -1125,10 +1123,10 @@ DEPENDENCIES rack rack-attack rack-cors - rack-test + rack-test (= 1.1.0) rack-timeout rack-vcr - rails (~> 6.1.7) + rails! rails-session_cookie rails_semantic_logger rainbow