From 0afa65723a061d247d4a599398056030b10f982a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?= Date: Wed, 15 Dec 2021 21:20:38 +0000 Subject: [PATCH] Make sure test pass with minitest 5.15 --- Gemfile | 2 + Gemfile.lock | 225 +++++++++--------- railties/test/application/test_runner_test.rb | 2 +- 3 files changed, 121 insertions(+), 108 deletions(-) diff --git a/Gemfile b/Gemfile index b91c5b40fec..3a9b02ba744 100644 --- a/Gemfile +++ b/Gemfile @@ -6,6 +6,8 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" } gemspec +gem "minitest", ">= 5.15.0" + # We need a newish Rake since Active Job sets its test tasks' descriptions. gem "rake", ">= 11.1" diff --git a/Gemfile.lock b/Gemfile.lock index 94766670248..e0fdf236995 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: https://github.com/brianmario/mysql2.git - revision: 7f4e844fccf6afa888d0bd108d4707a2a7784484 + revision: 25c42c712118b046eb9df7a0f50ffde1a04ee6d1 specs: mysql2 (0.5.3) @@ -112,40 +112,40 @@ GEM public_suffix (>= 2.0.2, < 5.0) amq-protocol (2.3.2) ast (2.4.2) - aws-eventstream (1.1.1) - aws-partitions (1.469.0) - aws-sdk-core (3.114.3) + aws-eventstream (1.2.0) + aws-partitions (1.541.0) + aws-sdk-core (3.124.0) aws-eventstream (~> 1, >= 1.0.2) - aws-partitions (~> 1, >= 1.239.0) + aws-partitions (~> 1, >= 1.525.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-kms (1.44.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-kms (1.52.0) + aws-sdk-core (~> 3, >= 3.122.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.96.1) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-s3 (1.109.0) + aws-sdk-core (~> 3, >= 3.122.0) aws-sdk-kms (~> 1) + aws-sigv4 (~> 1.4) + aws-sdk-sns (1.49.0) + aws-sdk-core (~> 3, >= 3.122.0) aws-sigv4 (~> 1.1) - aws-sdk-sns (1.41.0) - aws-sdk-core (~> 3, >= 3.112.0) - aws-sigv4 (~> 1.1) - aws-sigv4 (1.2.3) + aws-sigv4 (1.4.0) aws-eventstream (~> 1, >= 1.0.2) - azure-storage-blob (2.0.1) + azure-storage-blob (2.0.3) azure-storage-common (~> 2.0) - nokogiri (~> 1.11.0.rc2) - azure-storage-common (2.0.2) + nokogiri (~> 1, >= 1.10.8) + azure-storage-common (2.0.4) faraday (~> 1.0) - faraday_middleware (~> 1.0.0.rc1) + faraday_middleware (~> 1.0, >= 1.0.0.rc1) net-http-persistent (~> 4.0) - nokogiri (~> 1.11.0.rc2) + nokogiri (~> 1, >= 1.10.8) backburner (1.5.0) beaneater (~> 1.0) concurrent-ruby (~> 1.0, >= 1.0.1) dante (> 0.1.5) bcrypt (3.1.16) beaneater (1.1.1) - benchmark-ips (2.9.1) + benchmark-ips (2.9.2) blade (0.7.2) activesupport (>= 3.0.0) blade-qunit_adapter (>= 2.0.1) @@ -159,10 +159,10 @@ GEM thor (>= 0.19.1) useragent (>= 0.16.7) blade-qunit_adapter (2.0.1) - bootsnap (1.7.5) + bootsnap (1.9.3) msgpack (~> 1.0) builder (3.2.4) - bunny (2.18.0) + bunny (2.19.0) amq-protocol (~> 2.3, >= 2.3.1) sorted_set (~> 1, >= 1.0.2) capybara (3.36.0) @@ -185,14 +185,14 @@ GEM crack (0.4.5) rexml crass (1.0.6) - cssbundling-rails (0.2.2) + cssbundling-rails (1.0.0) railties (>= 6.0.0) curses (1.4.2) - daemons (1.4.0) - dalli (3.0.1) + daemons (1.4.1) + dalli (3.1.3) dante (0.2.0) - debug (1.1.0) - irb + debug (1.3.4) + irb (>= 1.3.6) reline (>= 0.2.7) declarative (0.0.20) delayed_job (4.1.9) @@ -200,7 +200,7 @@ GEM delayed_job_active_record (4.1.6) activerecord (>= 3.0, < 6.2) delayed_job (>= 3.0, < 5) - digest-crc (0.6.3) + digest-crc (0.6.4) rake (>= 12.0.0, < 14.0.0) em-http-request (1.1.7) addressable (>= 2.3.4) @@ -211,25 +211,31 @@ GEM em-socksify (0.3.2) eventmachine (>= 1.0.0.beta.4) erubi (1.10.0) - et-orbi (1.2.4) + et-orbi (1.2.6) tzinfo event_emitter (0.2.6) eventmachine (1.2.7) execjs (2.8.1) - faraday (1.4.2) + faraday (1.8.0) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) faraday-excon (~> 1.1) + faraday-httpclient (~> 1.0.1) faraday-net_http (~> 1.0) faraday-net_http_persistent (~> 1.1) + faraday-patron (~> 1.0) + faraday-rack (~> 1.0) multipart-post (>= 1.2, < 3) ruby2_keywords (>= 0.0.4) faraday-em_http (1.0.0) faraday-em_synchrony (1.0.0) faraday-excon (1.1.0) + faraday-httpclient (1.0.1) faraday-net_http (1.0.1) - faraday-net_http_persistent (1.1.0) - faraday_middleware (1.0.0) + faraday-net_http_persistent (1.2.0) + faraday-patron (1.0.0) + faraday-rack (1.0.0) + faraday_middleware (1.2.0) faraday (~> 1.0) faye (1.4.0) cookiejar (>= 0.3.0) @@ -242,74 +248,74 @@ GEM faye-websocket (0.11.1) eventmachine (>= 0.12.0) websocket-driver (>= 0.5.1) - ffi (1.15.3) - fugit (1.5.0) + ffi (1.15.4) + fugit (1.5.2) et-orbi (~> 1.1, >= 1.1.8) raabro (~> 1.4) globalid (1.0.0) activesupport (>= 5.0) - google-apis-core (0.3.0) + google-apis-core (0.4.1) addressable (~> 2.5, >= 2.5.1) - googleauth (~> 0.14) - httpclient (>= 2.8.1, < 3.0) + googleauth (>= 0.16.2, < 2.a) + httpclient (>= 2.8.1, < 3.a) mini_mime (~> 1.0) representable (~> 3.0) - retriable (>= 2.0, < 4.0) + retriable (>= 2.0, < 4.a) rexml - signet (~> 0.14) webrick - google-apis-iamcredentials_v1 (0.4.0) - google-apis-core (~> 0.1) - google-apis-storage_v1 (0.4.0) - google-apis-core (~> 0.1) + google-apis-iamcredentials_v1 (0.9.0) + google-apis-core (>= 0.4, < 2.a) + google-apis-storage_v1 (0.10.0) + google-apis-core (>= 0.4, < 2.a) google-cloud-core (1.6.0) google-cloud-env (~> 1.0) google-cloud-errors (~> 1.0) google-cloud-env (1.5.0) faraday (>= 0.17.3, < 2.0) - google-cloud-errors (1.1.0) - google-cloud-storage (1.31.1) - addressable (~> 2.5) + google-cloud-errors (1.2.0) + google-cloud-storage (1.35.0) + addressable (~> 2.8) digest-crc (~> 0.4) google-apis-iamcredentials_v1 (~> 0.1) google-apis-storage_v1 (~> 0.1) - google-cloud-core (~> 1.2) - googleauth (~> 0.9) + google-cloud-core (~> 1.6) + googleauth (>= 0.16.2, < 2.a) mini_mime (~> 1.0) - googleauth (0.16.2) + googleauth (1.1.0) faraday (>= 0.17.3, < 2.0) jwt (>= 1.4, < 3.0) memoist (~> 0.16) multi_json (~> 1.11) os (>= 0.9, < 2.0) - signet (~> 0.14) + signet (>= 0.16, < 2.a) hashdiff (1.0.1) hiredis (0.6.3) - http_parser.rb (0.6.0) + http_parser.rb (0.8.0) httpclient (2.8.3) i18n (1.8.11) concurrent-ruby (~> 1.0) image_processing (1.12.1) mini_magick (>= 4.9.5, < 5) ruby-vips (>= 2.0.17, < 3) - importmap-rails (0.7.3) - rails (>= 6.0.0) + importmap-rails (1.0.1) + actionpack (>= 6.0.0) + railties (>= 6.0.0) io-console (0.5.9) irb (1.3.7) reline (>= 0.2.7) jmespath (1.4.0) - jsbundling-rails (0.1.7) + jsbundling-rails (1.0.0) railties (>= 6.0.0) - json (2.5.1) - jwt (2.2.3) + json (2.6.1) + jwt (2.3.0) kindlerb (1.2.0) mustache nokogiri libxml-ruby (3.2.1) - listen (3.6.0) + listen (3.7.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) - loofah (2.12.0) + loofah (2.13.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.1) @@ -320,8 +326,8 @@ GEM method_source (1.0.0) mini_magick (4.11.0) mini_mime (1.1.2) - mini_portile2 (2.5.3) - minitest (5.14.4) + mini_portile2 (2.6.1) + minitest (5.15.0) minitest-bisect (1.5.1) minitest-server (~> 1.0) path_expander (~> 1.1) @@ -341,30 +347,33 @@ GEM net-http-persistent (4.0.1) connection_pool (~> 2.2) nio4r (2.5.8) - nokogiri (1.11.7) - mini_portile2 (~> 2.5.0) + nokogiri (1.12.5) + mini_portile2 (~> 2.6.1) racc (~> 1.4) - nokogiri (1.11.7-x86_64-darwin) + nokogiri (1.12.5-x86_64-darwin) racc (~> 1.4) - nokogiri (1.11.7-x86_64-linux) + nokogiri (1.12.5-x86_64-linux) racc (~> 1.4) - os (1.1.1) - parallel (1.20.1) - parser (3.0.2.0) + os (1.1.4) + parallel (1.21.0) + parser (3.0.3.2) ast (~> 2.4.1) path_expander (1.1.0) pg (1.2.3) - propshaft (0.1.7) - rails (>= 7.0.0.alpha2) + propshaft (0.4.4) + actionpack (>= 7.0.0.alpha2) + activesupport (>= 7.0.0.alpha2) + rack + railties (>= 7.0.0.alpha2) psych (3.3.2) public_suffix (4.0.6) - puma (5.3.2) + puma (5.5.2) nio4r (~> 2.0) que (0.14.3) raabro (1.4.0) racc (1.6.0) rack (2.2.3) - rack-cache (1.12.1) + rack-cache (1.13.0) rack (>= 0.4) rack-protection (2.1.0) rack @@ -381,9 +390,9 @@ GEM rb-inotify (0.10.1) ffi (~> 1.0) rbtree (0.4.4) - rdoc (6.3.1) + rdoc (6.3.3) redcarpet (3.2.3) - redis (4.3.1) + redis (4.5.1) redis-namespace (1.8.1) redis (>= 3.0.4) regexp_parser (2.2.0) @@ -393,66 +402,66 @@ GEM declarative (< 0.1.0) trailblazer-option (>= 0.1.1, < 0.2.0) uber (< 0.2.0) - resque (2.0.0) + resque (2.2.0) mono_logger (~> 1.0) multi_json (~> 1.0) redis-namespace (~> 1.6) sinatra (>= 0.9.2) vegas (~> 0.1.2) - resque-scheduler (4.4.0) + resque-scheduler (4.5.0) mono_logger (~> 1.0) redis (>= 3.3) - resque (>= 1.26) - rufus-scheduler (~> 3.2) + resque (>= 1.27) + rufus-scheduler (~> 3.2, < 3.7) retriable (3.1.2) rexml (3.2.5) - rouge (3.26.0) - rubocop (1.19.0) + rouge (3.27.0) + rubocop (1.23.0) parallel (~> 1.10) parser (>= 3.0.0.0) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml - rubocop-ast (>= 1.9.1, < 2.0) + rubocop-ast (>= 1.12.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.9.1) + rubocop-ast (1.15.0) parser (>= 3.0.1.1) - rubocop-minitest (0.15.0) + rubocop-minitest (0.17.0) rubocop (>= 0.90, < 2.0) rubocop-packaging (0.5.1) rubocop (>= 0.89, < 2.0) - rubocop-performance (1.11.4) + rubocop-performance (1.12.0) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) - rubocop-rails (2.11.3) + rubocop-rails (2.12.4) activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 1.7.0, < 2.0) ruby-progressbar (1.11.0) - ruby-vips (2.1.2) + ruby-vips (2.1.4) ffi (~> 1.12) - ruby2_keywords (0.0.4) + ruby2_keywords (0.0.5) rubyzip (2.3.2) - rufus-scheduler (3.7.0) + rufus-scheduler (3.6.0) fugit (~> 1.1, >= 1.1.6) sdoc (2.2.0) rdoc (>= 5.0) - selenium-webdriver (4.0.3) + selenium-webdriver (4.1.0) childprocess (>= 0.5, < 5.0) rexml (~> 3.2, >= 3.2.5) rubyzip (>= 1.2.2) - sequel (5.45.0) + sequel (5.51.0) serverengine (2.0.7) sigdump (~> 0.2.2) - set (1.0.1) - sidekiq (6.2.1) + set (1.0.2) + sidekiq (6.3.1) connection_pool (>= 2.2.2) rack (~> 2.0) redis (>= 4.2.0) sigdump (0.2.4) - signet (0.15.0) - addressable (~> 2.3) + signet (0.16.0) + addressable (~> 2.8) faraday (>= 0.17.3, < 2.0) jwt (>= 1.5, < 3.0) multi_json (~> 1.10) @@ -474,19 +483,19 @@ GEM concurrent-ruby (~> 1.0) rack (> 1, < 3) sprockets-export (1.0.0) - sprockets-rails (3.2.2) - actionpack (>= 4.0) - activesupport (>= 4.0) + sprockets-rails (3.4.2) + actionpack (>= 5.2) + activesupport (>= 5.2) sprockets (>= 3.0.0) sqlite3 (1.4.2) stackprof (0.2.17) - stimulus-rails (0.5.4) - rails (>= 6.0.0) + stimulus-rails (1.0.0) + railties (>= 6.0.0) sucker_punch (3.0.1) concurrent-ruby (~> 1.0) - tailwindcss-rails (0.4.3) - rails (>= 6.0.0) - terser (1.1.4) + tailwindcss-rails (1.0.0) + railties (>= 6.0.0) + terser (1.1.8) execjs (>= 0.3.0, < 3) thin (1.8.1) daemons (~> 1.0, >= 1.0.9) @@ -494,13 +503,14 @@ GEM rack (>= 1, < 3) thor (1.1.0) tilt (2.0.10) - trailblazer-option (0.1.1) - turbo-rails (0.7.14) - rails (>= 6.0.0) + trailblazer-option (0.1.2) + turbo-rails (1.0.0) + actionpack (>= 6.0.0) + railties (>= 6.0.0) tzinfo (2.0.4) concurrent-ruby (~> 1.0) uber (0.1.0) - unicode-display_width (2.0.0) + unicode-display_width (2.1.0) useragent (0.16.10) vegas (0.1.11) rack (>= 1.0.0) @@ -512,8 +522,8 @@ GEM nokogiri (~> 1.6) rubyzip (>= 1.3.0) selenium-webdriver (~> 4.0) - webmock (3.13.0) - addressable (>= 2.3.6) + webmock (3.14.0) + addressable (>= 2.8.0) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) webrick (1.7.0) @@ -559,6 +569,7 @@ DEPENDENCIES kindlerb (~> 1.2.0) libxml-ruby listen (~> 3.3) + minitest (>= 5.15.0) minitest-bisect minitest-ci minitest-retry @@ -609,4 +620,4 @@ DEPENDENCIES websocket-client-simple! BUNDLED WITH - 2.2.29 + 2.2.32 diff --git a/railties/test/application/test_runner_test.rb b/railties/test/application/test_runner_test.rb index 7a880a50fff..9ed87aa39e1 100644 --- a/railties/test/application/test_runner_test.rb +++ b/railties/test/application/test_runner_test.rb @@ -671,7 +671,7 @@ module ApplicationTests output = run_test_command(file) - assert_match "DRb::DRbRemoteError: FailTest::BadError", output + assert_match "RuntimeError: Wrapped undumpable exception for: FailTest::BadError", output assert_match "1 runs, 0 assertions, 0 failures, 1 errors", output end