From 5325af589a4b55bfeeb3dffa10fa3bd006fd5b54 Mon Sep 17 00:00:00 2001 From: yuenmichelle1 Date: Thu, 26 Jan 2023 11:10:31 -0600 Subject: [PATCH] Rails 6.0 in next version (#4094) * test against restpack serializer branch with activerecord/support < 7.1 support * update restpack_serializer to newest commit * pull from panoptes-api-version branch * next lock to 6.0 * update run tests to run next tests --- .github/workflows/run_tests_CI.yml | 2 +- Gemfile | 2 +- Gemfile.next.lock | 138 ++++++++++++++++++----------- 3 files changed, 86 insertions(+), 56 deletions(-) diff --git a/.github/workflows/run_tests_CI.yml b/.github/workflows/run_tests_CI.yml index 27a67b797..8b6157fd1 100644 --- a/.github/workflows/run_tests_CI.yml +++ b/.github/workflows/run_tests_CI.yml @@ -25,7 +25,7 @@ jobs: matrix: gemfile: - Gemfile - # - Gemfile.next + - Gemfile.next ruby: - 2.7 spec-commands: diff --git a/Gemfile b/Gemfile index e23dd78da..4d9c7461b 100644 --- a/Gemfile +++ b/Gemfile @@ -43,7 +43,7 @@ gem 'puma', '~> 6.0.2' gem 'pundit', '~> 2.2.0' gem 'rack-cors', '~> 1.0', require: 'rack/cors' if next? - gem 'rails', '~> 5.2' + gem 'rails', '~> 6.0' else gem 'rails', '~> 5.2' end diff --git a/Gemfile.next.lock b/Gemfile.next.lock index 76324804c..65402e0a8 100644 --- a/Gemfile.next.lock +++ b/Gemfile.next.lock @@ -12,29 +12,42 @@ GIT GEM remote: https://rubygems.org/ specs: - actioncable (5.2.8.1) - actionpack (= 5.2.8.1) + actioncable (6.0.6.1) + actionpack (= 6.0.6.1) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailer (5.2.8.1) - actionpack (= 5.2.8.1) - actionview (= 5.2.8.1) - activejob (= 5.2.8.1) + actionmailbox (6.0.6.1) + actionpack (= 6.0.6.1) + activejob (= 6.0.6.1) + activerecord (= 6.0.6.1) + activestorage (= 6.0.6.1) + activesupport (= 6.0.6.1) + mail (>= 2.7.1) + actionmailer (6.0.6.1) + actionpack (= 6.0.6.1) + actionview (= 6.0.6.1) + activejob (= 6.0.6.1) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.2.8.1) - actionview (= 5.2.8.1) - activesupport (= 5.2.8.1) + actionpack (6.0.6.1) + actionview (= 6.0.6.1) + activesupport (= 6.0.6.1) rack (~> 2.0, >= 2.0.8) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.2.8.1) - activesupport (= 5.2.8.1) + rails-html-sanitizer (~> 1.0, >= 1.2.0) + actiontext (6.0.6.1) + actionpack (= 6.0.6.1) + activerecord (= 6.0.6.1) + activestorage (= 6.0.6.1) + activesupport (= 6.0.6.1) + nokogiri (>= 1.8.5) + actionview (6.0.6.1) + activesupport (= 6.0.6.1) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.0.3) + rails-html-sanitizer (~> 1.1, >= 1.2.0) active_interaction (3.8.3) activemodel (>= 4, < 7) active_model_serializers (0.10.13) @@ -42,36 +55,33 @@ GEM activemodel (>= 4.1, < 7.1) case_transform (>= 0.2) jsonapi-renderer (>= 0.1.1.beta1, < 0.3) - active_record_extended (3.0.0) + active_record_extended (3.1.0) activerecord (>= 5.2, < 7.1.0) - ar_outer_joins (~> 0.2) pg (< 3.0) - activejob (5.2.8.1) - activesupport (= 5.2.8.1) + activejob (6.0.6.1) + activesupport (= 6.0.6.1) globalid (>= 0.3.6) - activemodel (5.2.8.1) - activesupport (= 5.2.8.1) - activerecord (5.2.8.1) - activemodel (= 5.2.8.1) - activesupport (= 5.2.8.1) - arel (>= 9.0) + activemodel (6.0.6.1) + activesupport (= 6.0.6.1) + activerecord (6.0.6.1) + activemodel (= 6.0.6.1) + activesupport (= 6.0.6.1) activerecord-import (1.4.1) activerecord (>= 4.2) - activestorage (5.2.8.1) - actionpack (= 5.2.8.1) - activerecord (= 5.2.8.1) - marcel (~> 1.0.0) - activesupport (5.2.8.1) + activestorage (6.0.6.1) + actionpack (= 6.0.6.1) + activejob (= 6.0.6.1) + activerecord (= 6.0.6.1) + marcel (~> 1.0) + activesupport (6.0.6.1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) + zeitwerk (~> 2.2, >= 2.2.2) addressable (2.8.1) public_suffix (>= 2.0.2, < 6.0) aggregate (0.2.3) - ar_outer_joins (0.2.0) - activerecord (>= 3.2) - arel (9.0.0) ast (2.4.2) aws-eventstream (1.2.0) aws-sdk (2.11.632) @@ -99,6 +109,7 @@ GEM case_transform (0.2) activesupport coderay (1.1.3) + colorize (0.8.1) concurrent-ruby (1.1.10) congestion (0.1.0) connection_pool (>= 2.0) @@ -109,7 +120,7 @@ GEM crass (1.0.6) dalli (3.2.3) database_cleaner (1.99.0) - date (3.3.1) + date (3.3.3) deep_cloneable (3.2.0) activerecord (>= 3.1.0, < 8) deprecate (0.0.0) @@ -120,6 +131,8 @@ GEM responders warden (~> 1.2.3) diff-lcs (1.5.0) + domain_name (0.5.20190701) + unf (>= 0.0.5, < 1.0.0) doorkeeper (4.4.3) railties (>= 4.2) doorkeeper-jwt (0.2.1) @@ -178,7 +191,7 @@ GEM fugit (1.7.2) et-orbi (~> 1, >= 1.2.7) raabro (~> 1.4) - globalid (1.0.0) + globalid (1.1.0) activesupport (>= 5.0) graphiql-rails (1.8.0) railties @@ -201,6 +214,9 @@ GEM hashdiff (1.0.1) hashie (5.0.0) honeybadger (5.0.2) + http-accept (1.7.0) + http-cookie (1.0.5) + domain_name (~> 0.5) httparty (0.20.0) mime-types (~> 3.0) multi_xml (>= 0.5.2) @@ -243,7 +259,7 @@ GEM crass (~> 1.0.2) nokogiri (>= 1.5.9) lumberjack (1.2.8) - mail (2.8.0) + mail (2.8.0.1) mini_mime (>= 0.1.1) net-imap net-pop @@ -265,7 +281,7 @@ GEM nenv (0.3.0) net-http-persistent (4.0.1) connection_pool (~> 2.2) - net-imap (0.3.2) + net-imap (0.3.4) date net-protocol net-pop (0.1.2) @@ -274,6 +290,7 @@ GEM timeout net-smtp (0.3.3) net-protocol + netrc (0.11.0) newrelic_rpm (8.6.0) nio4r (2.5.8) nokogiri (1.13.10) @@ -333,30 +350,32 @@ GEM rack rack-test (2.0.2) rack (>= 1.3) - rails (5.2.8.1) - actioncable (= 5.2.8.1) - actionmailer (= 5.2.8.1) - actionpack (= 5.2.8.1) - actionview (= 5.2.8.1) - activejob (= 5.2.8.1) - activemodel (= 5.2.8.1) - activerecord (= 5.2.8.1) - activestorage (= 5.2.8.1) - activesupport (= 5.2.8.1) + rails (6.0.6.1) + actioncable (= 6.0.6.1) + actionmailbox (= 6.0.6.1) + actionmailer (= 6.0.6.1) + actionpack (= 6.0.6.1) + actiontext (= 6.0.6.1) + actionview (= 6.0.6.1) + activejob (= 6.0.6.1) + activemodel (= 6.0.6.1) + activerecord (= 6.0.6.1) + activestorage (= 6.0.6.1) + activesupport (= 6.0.6.1) bundler (>= 1.3.0) - railties (= 5.2.8.1) + railties (= 6.0.6.1) sprockets-rails (>= 2.0.0) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) rails-html-sanitizer (1.4.4) loofah (~> 2.19, >= 2.19.1) - railties (5.2.8.1) - actionpack (= 5.2.8.1) - activesupport (= 5.2.8.1) + railties (6.0.6.1) + actionpack (= 6.0.6.1) + activesupport (= 6.0.6.1) method_source rake (>= 0.8.7) - thor (>= 0.19.0, < 2.0) + thor (>= 0.20.3, < 2.0) rainbow (3.0.0) rake (13.0.6) ranked-model (0.4.8) @@ -371,6 +390,11 @@ GEM responders (3.0.1) actionpack (>= 5.0) railties (>= 5.0) + rest-client (2.1.0) + http-accept (>= 1.7.0, < 2.0) + http-cookie (>= 1.0.2, < 2.0) + mime-types (>= 1.16, < 4.0) + netrc (~> 0.8) rexml (3.2.5) rspec (3.12.0) rspec-core (~> 3.12.0) @@ -459,9 +483,11 @@ GEM stringex (2.8.5) strong_migrations (1.4.0) activerecord (>= 5.2) - ten_years_rails (1.0.2) - actionview (~> 5.2.3) - rainbow (~> 3.0.0) + ten_years_rails (0.2.0) + actionview + activesupport + colorize (>= 0.8.1) + rest-client (>= 2.0.2) thor (1.2.1) thread_safe (0.3.6) timeout (0.3.1) @@ -469,6 +495,9 @@ GEM thread_safe (~> 0.1) uglifier (4.2.0) execjs (>= 0.3.0, < 3) + unf (0.1.4) + unf_ext + unf_ext (0.0.8.2) unicode-display_width (1.8.0) version_gem (1.1.1) versionist (2.0.1) @@ -487,6 +516,7 @@ GEM websocket-extensions (0.1.5) yard (0.9.28) webrick (~> 1.7.0) + zeitwerk (2.6.6) zoo_stream (1.0.1) aws-sdk @@ -538,7 +568,7 @@ DEPENDENCIES puma (~> 6.0.2) pundit (~> 2.2.0) rack-cors (~> 1.0) - rails (~> 5.2) + rails (~> 6.0) ranked-model (~> 0.4.8) restpack_serializer! rspec