From ef303f13b5078a4e09b285096a48824812404b4c Mon Sep 17 00:00:00 2001 From: Geremia Taglialatela Date: Tue, 14 Dec 2021 13:04:13 +0100 Subject: [PATCH] Allow Rails 7.0 Also: - Update bundles - Strengthen jasmine dependency to prevent deprecation warnings - Strengthen pry dependency to prevent deprecation warnings Close #7196 --- .github/dependabot.yml | 6 + .github/workflows/ci.yaml | 11 +- Gemfile | 14 +- Gemfile.lock | 266 ++++++++------- activeadmin.gemspec | 2 +- gemfiles/rails_52/Gemfile | 6 +- gemfiles/rails_52/Gemfile.lock | 60 ++-- gemfiles/rails_60/Gemfile | 6 +- gemfiles/rails_60/Gemfile.lock | 46 +-- gemfiles/rails_61/Gemfile | 42 +++ gemfiles/rails_61/Gemfile.lock | 384 ++++++++++++++++++++++ gemfiles/rails_61_turbolinks/Gemfile | 6 +- gemfiles/rails_61_turbolinks/Gemfile.lock | 44 +-- gemfiles/rails_61_webpacker/Gemfile | 6 +- gemfiles/rails_61_webpacker/Gemfile.lock | 42 +-- tasks/test_application.rb | 4 +- 16 files changed, 707 insertions(+), 238 deletions(-) create mode 100644 gemfiles/rails_61/Gemfile create mode 100644 gemfiles/rails_61/Gemfile.lock diff --git a/.github/dependabot.yml b/.github/dependabot.yml index f46663d4d73e..307f8373ab16 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -33,6 +33,12 @@ updates: interval: daily versioning-strategy: lockfile-only + - package-ecosystem: bundler + directory: /gemfiles/rails_61 + schedule: + interval: daily + versioning-strategy: lockfile-only + - package-ecosystem: bundler directory: /gemfiles/rails_61_turbolinks schedule: diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 250797710a07..c2af67d3ffb7 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -81,7 +81,12 @@ jobs: os: [ubuntu-20.04] - deps: [rails_52, rails_60, rails_61, rails_61_turbolinks, rails_61_webpacker] + deps: [rails_52, rails_60, rails_61, rails_61_turbolinks, rails_61_webpacker, rails_70] + + exclude: + - ruby: { name: 2.6, value: 2.6.6 } + os: ubuntu-20.04 + deps: rails_70 include: - ruby: { name: 2.5, value: 2.5.8 } @@ -106,13 +111,13 @@ jobs: run: | echo "BUNDLE_GEMFILE=Gemfile" >> $GITHUB_ENV echo "BUNDLE_PATH=$(pwd)/vendor/bundle" >> $GITHUB_ENV - if: matrix.deps == 'rails_61' + if: matrix.deps == 'rails_70' - name: Configure bundler (alternative) run: | echo "BUNDLE_GEMFILE=gemfiles/${{ matrix.deps }}/Gemfile" >> $GITHUB_ENV echo "BUNDLE_PATH=$(pwd)/gemfiles/${{ matrix.deps }}/vendor/bundle" >> $GITHUB_ENV - if: matrix.deps != 'rails_61' + if: matrix.deps != 'rails_70' - uses: ruby/setup-ruby@v1 with: diff --git a/Gemfile b/Gemfile index c6bf6876a902..c71935a3cd9f 100644 --- a/Gemfile +++ b/Gemfile @@ -1,9 +1,11 @@ # frozen_string_literal: true source "https://rubygems.org" +gem "arbre", github: "activeadmin/arbre" # FIXME: remove + group :development, :test do gem "rake" - gem "pry" # Easily debug from your console with `binding.pry` + gem "pry", "~> 0.13.1" # Easily debug from your console with `binding.pry` gem "pry-byebug", platform: :mri # Step-by-step debugging gem "cancancan" @@ -13,7 +15,7 @@ group :development, :test do gem "draper" gem "devise" - gem "rails", "~> 6.1.0" + gem "rails", "~> 7.0.0" gem "activerecord-jdbcsqlite3-adapter", platform: :jruby gem "sprockets-rails" @@ -24,14 +26,14 @@ group :test do gem "cuprite" gem "capybara" gem "webrick" - gem "db-query-matchers" + gem "db-query-matchers", github: "tagliala/db-query-matchers", branch: "chore/allow-latest-gem-versions" # FIXME: revert to stable gem "simplecov", require: false # Test coverage generator. Go to /coverage/ after running tests - gem "cucumber-rails", require: false + gem "cucumber-rails", github: "cucumber/cucumber-rails", require: false # FIXME: revert to stable gem "cucumber" gem "database_cleaner" - gem "jasmine" - gem "jasmine-core" + gem "jasmine", "~> 2.99" + gem "jasmine-core", "~> 2.99" gem "launchy" gem "parallel_tests" gem "rails-i18n" # Provides default i18n for many languages diff --git a/Gemfile.lock b/Gemfile.lock index 121c5aec1c53..8d7fb03965de 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,3 +1,43 @@ +GIT + remote: https://github.com/activeadmin/arbre.git + revision: e4970e683c81c99432b73f0ceb5dff7d3fe50413 + specs: + arbre (1.4.0) + activesupport (>= 3.0.0, < 7.1) + ruby2_keywords (>= 0.0.2, < 1.0) + +GIT + remote: https://github.com/activeadmin/inherited_resources.git + revision: a0a350245a2ec76c040f8751707c1d98792534dd + specs: + inherited_resources (1.13.0) + actionpack (>= 5.2, < 7.1) + has_scope (~> 0.6) + railties (>= 5.2, < 7.1) + responders (>= 2, < 4) + +GIT + remote: https://github.com/cucumber/cucumber-rails.git + revision: fc0e34c741d723e51a7b97cb5cad37e343b54647 + specs: + cucumber-rails (2.4.0) + capybara (>= 2.18, < 4) + cucumber (>= 3.2, < 8) + mime-types (~> 3.3) + nokogiri (~> 1.10) + railties (>= 5.0, < 8) + rexml (~> 3.0) + webrick (~> 1.7) + +GIT + remote: https://github.com/tagliala/db-query-matchers.git + revision: 11863e26d1aa1e581d05548a0ed04e9903572e67 + branch: chore/allow-latest-gem-versions + specs: + db-query-matchers (0.10.0) + activesupport (>= 4.0, < 7.1) + rspec (~> 3.0) + PATH remote: . specs: @@ -8,93 +48,91 @@ PATH inherited_resources (~> 1.7) jquery-rails (~> 4.2) kaminari (~> 1.0, >= 1.2.1) - railties (>= 5.2, < 6.2) + railties (>= 5.2, < 7.1) ransack (~> 2.1, >= 2.1.1) GEM remote: https://rubygems.org/ specs: - actioncable (6.1.4.4) - actionpack (= 6.1.4.4) - activesupport (= 6.1.4.4) + actioncable (7.0.0) + actionpack (= 7.0.0) + activesupport (= 7.0.0) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (6.1.4.4) - actionpack (= 6.1.4.4) - activejob (= 6.1.4.4) - activerecord (= 6.1.4.4) - activestorage (= 6.1.4.4) - activesupport (= 6.1.4.4) + actionmailbox (7.0.0) + actionpack (= 7.0.0) + activejob (= 7.0.0) + activerecord (= 7.0.0) + activestorage (= 7.0.0) + activesupport (= 7.0.0) mail (>= 2.7.1) - actionmailer (6.1.4.4) - actionpack (= 6.1.4.4) - actionview (= 6.1.4.4) - activejob (= 6.1.4.4) - activesupport (= 6.1.4.4) + actionmailer (7.0.0) + actionpack (= 7.0.0) + actionview (= 7.0.0) + activejob (= 7.0.0) + activesupport (= 7.0.0) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (6.1.4.4) - actionview (= 6.1.4.4) - activesupport (= 6.1.4.4) - rack (~> 2.0, >= 2.0.9) + actionpack (7.0.0) + actionview (= 7.0.0) + activesupport (= 7.0.0) + rack (~> 2.0, >= 2.2.0) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (6.1.4.4) - actionpack (= 6.1.4.4) - activerecord (= 6.1.4.4) - activestorage (= 6.1.4.4) - activesupport (= 6.1.4.4) + actiontext (7.0.0) + actionpack (= 7.0.0) + activerecord (= 7.0.0) + activestorage (= 7.0.0) + activesupport (= 7.0.0) + globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (6.1.4.4) - activesupport (= 6.1.4.4) + actionview (7.0.0) + activesupport (= 7.0.0) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (6.1.4.4) - activesupport (= 6.1.4.4) + activejob (7.0.0) + activesupport (= 7.0.0) globalid (>= 0.3.6) - activemodel (6.1.4.4) - activesupport (= 6.1.4.4) + activemodel (7.0.0) + activesupport (= 7.0.0) activemodel-serializers-xml (1.0.2) activemodel (> 5.x) activesupport (> 5.x) builder (~> 3.1) - activerecord (6.1.4.4) - activemodel (= 6.1.4.4) - activesupport (= 6.1.4.4) - activerecord-jdbc-adapter (61.0-java) - activerecord (~> 6.1.0) - activerecord-jdbcsqlite3-adapter (61.0-java) - activerecord-jdbc-adapter (= 61.0) + activerecord (7.0.0) + activemodel (= 7.0.0) + activesupport (= 7.0.0) + activerecord-jdbc-adapter (50.0) + activerecord (>= 2.2) + activerecord-jdbcsqlite3-adapter (50.0) + activerecord-jdbc-adapter (~> 50.0) jdbc-sqlite3 (~> 3.8, < 3.30) - activestorage (6.1.4.4) - actionpack (= 6.1.4.4) - activejob (= 6.1.4.4) - activerecord (= 6.1.4.4) - activesupport (= 6.1.4.4) - marcel (~> 1.0.0) + activestorage (7.0.0) + actionpack (= 7.0.0) + activejob (= 7.0.0) + activerecord (= 7.0.0) + activesupport (= 7.0.0) + marcel (~> 1.0) mini_mime (>= 1.1.0) - activesupport (6.1.4.4) + activesupport (7.0.0) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) - zeitwerk (~> 2.3) addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) - arbre (1.4.0) - activesupport (>= 3.0.0, < 6.2) - ruby2_keywords (>= 0.0.2, < 1.0) ast (2.4.2) bcrypt (3.1.16) bcrypt (3.1.16-java) builder (3.2.4) - byebug (11.1.1) + byebug (11.1.3) cancancan (3.3.0) - capybara (3.35.3) + capybara (3.36.0) addressable + matrix mini_mime (>= 0.1.3) nokogiri (~> 1.8) rack (>= 1.6.0) @@ -104,9 +142,10 @@ GEM chandler (0.9.0) netrc octokit (>= 2.2.0) - chef-utils (16.4.41) + chef-utils (17.9.18) + concurrent-ruby cliver (0.3.2) - coderay (1.1.2) + coderay (1.1.3) concurrent-ruby (1.1.9) crass (1.0.6) cucumber (7.1.0) @@ -126,8 +165,8 @@ GEM cucumber-gherkin (~> 22.0, >= 22.0.0) cucumber-messages (~> 17.1, >= 17.1.1) cucumber-tag-expressions (~> 4.0, >= 4.0.2) - cucumber-create-meta (6.0.1) - cucumber-messages (~> 17.0, >= 17.0.1) + cucumber-create-meta (6.0.4) + cucumber-messages (~> 17.1, >= 17.1.1) sys-uname (~> 1.2, >= 1.2.2) cucumber-cucumber-expressions (14.0.0) cucumber-gherkin (22.0.0) @@ -135,14 +174,6 @@ GEM cucumber-html-formatter (17.0.0) cucumber-messages (~> 17.1, >= 17.1.0) cucumber-messages (17.1.1) - cucumber-rails (2.4.0) - capybara (>= 2.18, < 4) - cucumber (>= 3.2, < 8) - mime-types (~> 3.3) - nokogiri (~> 1.10) - railties (>= 5.0, < 7) - rexml (~> 3.0) - webrick (~> 1.7) cucumber-tag-expressions (4.1.0) cucumber-wire (6.2.0) cucumber-core (~> 10.1, >= 10.1.0) @@ -153,21 +184,18 @@ GEM ferrum (~> 0.11.0) database_cleaner (2.0.1) database_cleaner-active_record (~> 2.0.0) - database_cleaner-active_record (2.0.0) + database_cleaner-active_record (2.0.1) activerecord (>= 5.a) database_cleaner-core (~> 2.0.0) database_cleaner-core (2.0.1) - db-query-matchers (0.10.0) - activesupport (>= 4.0, < 7) - rspec (~> 3.0) devise (4.8.1) bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 4.1.0) responders warden (~> 1.2.3) - diff-lcs (1.4.4) - docile (1.3.4) + diff-lcs (1.5.0) + docile (1.4.0) draper (4.0.2) actionpack (>= 5.0) activemodel (>= 5.0) @@ -219,7 +247,7 @@ GEM concurrent-ruby (~> 1.0) i18n-spec (0.6.0) iso - i18n-tasks (0.9.36) + i18n-tasks (0.9.37) activesupport (>= 4.0.2) ast (>= 2.1.0) erubi @@ -234,7 +262,7 @@ GEM has_scope (~> 0.6) railties (>= 5.2, < 7.1) responders (>= 2, < 4) - iso (0.2.2) + iso (0.4.0) i18n jasmine (2.99.0) jasmine-core (>= 2.99.0, < 3.0.0) @@ -247,7 +275,7 @@ GEM rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) - jruby-openssl (0.10.7-java) + jruby-openssl (0.11.0-java) kaminari (1.2.2) activesupport (>= 4.1.0) kaminari-actionview (= 1.2.2) @@ -272,6 +300,7 @@ GEM mail (2.7.1) mini_mime (>= 0.1.1) marcel (1.0.2) + matrix (0.4.2) mdl (0.11.0) kramdown (~> 2.3) kramdown-parser-gfm (~> 1.1) @@ -279,16 +308,16 @@ GEM mixlib-config (>= 2.2.1, < 4) mixlib-shellout method_source (1.0.0) - mime-types (3.3.1) + mime-types (3.4.1) mime-types-data (~> 3.2015) - mime-types-data (3.2021.0901) + mime-types-data (3.2021.1115) mini_mime (1.1.2) mini_portile2 (2.6.1) minitest (5.15.0) mixlib-cli (2.1.8) mixlib-config (3.0.9) tomlrb - mixlib-shellout (3.1.4) + mixlib-shellout (3.2.5) chef-utils multi_test (0.1.2) multipart-post (2.1.1) @@ -330,21 +359,20 @@ GEM rack (2.2.3) rack-test (1.1.0) rack (>= 1.0, < 3) - rails (6.1.4.4) - actioncable (= 6.1.4.4) - actionmailbox (= 6.1.4.4) - actionmailer (= 6.1.4.4) - actionpack (= 6.1.4.4) - actiontext (= 6.1.4.4) - actionview (= 6.1.4.4) - activejob (= 6.1.4.4) - activemodel (= 6.1.4.4) - activerecord (= 6.1.4.4) - activestorage (= 6.1.4.4) - activesupport (= 6.1.4.4) + rails (7.0.0) + actioncable (= 7.0.0) + actionmailbox (= 7.0.0) + actionmailer (= 7.0.0) + actionpack (= 7.0.0) + actiontext (= 7.0.0) + actionview (= 7.0.0) + activejob (= 7.0.0) + activemodel (= 7.0.0) + activerecord (= 7.0.0) + activestorage (= 7.0.0) + activesupport (= 7.0.0) bundler (>= 1.15.0) - railties (= 6.1.4.4) - sprockets-rails (>= 2.0.0) + railties (= 7.0.0) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) @@ -353,19 +381,20 @@ GEM rails-i18n (7.0.1) i18n (>= 0.7, < 2) railties (>= 6.0.0, < 8) - railties (6.1.4.4) - actionpack (= 6.1.4.4) - activesupport (= 6.1.4.4) + railties (7.0.0) + actionpack (= 7.0.0) + activesupport (= 7.0.0) method_source - rake (>= 0.13) + rake (>= 12.2) thor (~> 1.0) + zeitwerk (~> 2.5) rainbow (3.0.0) rake (13.0.6) - ransack (2.4.1) + ransack (2.5.0) activerecord (>= 5.2.4) activesupport (>= 5.2.4) i18n - regexp_parser (2.1.1) + regexp_parser (2.2.0) request_store (1.5.0) rack (>= 1.4) responders (3.0.1) @@ -392,28 +421,27 @@ GEM rspec-expectations (~> 3.10) rspec-mocks (~> 3.10) rspec-support (~> 3.10) - rspec-support (3.10.2) - rubocop (0.93.1) + rspec-support (3.10.3) + rubocop (1.24.0) parallel (~> 1.10) - parser (>= 2.7.1.5) + parser (>= 3.0.0.0) rainbow (>= 2.2.2, < 4.0) - regexp_parser (>= 1.8) + regexp_parser (>= 1.8, < 3.0) rexml - rubocop-ast (>= 0.6.0) + rubocop-ast (>= 1.15.0, < 2.0) ruby-progressbar (~> 1.7) - unicode-display_width (>= 1.4.0, < 2.0) - rubocop-ast (1.3.0) - parser (>= 2.7.1.5) + unicode-display_width (>= 1.4.0, < 3.0) + rubocop-ast (1.15.0) + parser (>= 3.0.1.1) rubocop-packaging (0.5.1) rubocop (>= 0.89, < 2.0) - rubocop-rails (2.9.1) + rubocop-rails (2.13.0) activesupport (>= 4.2.0) rack (>= 1.1) - rubocop (>= 0.90.0, < 2.0) - rubocop-rspec (1.44.1) - rubocop (~> 0.87) - rubocop-ast (>= 0.7.1) - ruby-progressbar (1.10.1) + rubocop (>= 1.7.0, < 2.0) + rubocop-rspec (2.7.0) + rubocop (~> 1.19) + ruby-progressbar (1.11.0) ruby2_keywords (0.0.5) sassc (2.4.0) ffi (~> 1.9) @@ -431,7 +459,7 @@ GEM simplecov-html (~> 0.11) simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) - simplecov_json_formatter (0.1.2) + simplecov_json_formatter (0.1.3) spoon (0.0.6) ffi sprockets (4.0.2) @@ -448,10 +476,10 @@ GEM unicode-display_width (>= 1.1.1, < 3) thor (1.2.1) tilt (2.0.10) - tomlrb (1.3.0) + tomlrb (2.0.1) tzinfo (2.0.4) concurrent-ruby (~> 1.0) - unicode-display_width (1.8.0) + unicode-display_width (2.1.0) warden (1.2.9) rack (>= 2.0.9) webrick (1.7.0) @@ -474,30 +502,32 @@ PLATFORMS DEPENDENCIES activeadmin! activerecord-jdbcsqlite3-adapter + arbre! cancancan capybara chandler cucumber - cucumber-rails + cucumber-rails! cuprite database_cleaner - db-query-matchers + db-query-matchers! devise draper i18n-spec i18n-tasks - jasmine - jasmine-core + inherited_resources! + jasmine (~> 2.99) + jasmine-core (~> 2.99) jruby-openssl kramdown launchy mdl octokit parallel_tests - pry + pry (~> 0.13.1) pry-byebug pundit - rails (~> 6.1.0) + rails (~> 7.0.0) rails-i18n rake rspec-rails @@ -513,4 +543,4 @@ DEPENDENCIES yard BUNDLED WITH - 2.2.17 + 2.3.3 diff --git a/activeadmin.gemspec b/activeadmin.gemspec index f98f6d11840f..cb667e588624 100644 --- a/activeadmin.gemspec +++ b/activeadmin.gemspec @@ -26,6 +26,6 @@ Gem::Specification.new do |s| s.add_dependency "inherited_resources", "~> 1.7" s.add_dependency "jquery-rails", "~> 4.2" s.add_dependency "kaminari", "~> 1.0", ">= 1.2.1" - s.add_dependency "railties", ">= 5.2", "< 6.2" + s.add_dependency "railties", ">= 5.2", "< 7.1" s.add_dependency "ransack", "~> 2.1", ">= 2.1.1" end diff --git a/gemfiles/rails_52/Gemfile b/gemfiles/rails_52/Gemfile index 7693fc45b57d..af8697707907 100644 --- a/gemfiles/rails_52/Gemfile +++ b/gemfiles/rails_52/Gemfile @@ -3,7 +3,7 @@ source "https://rubygems.org" group :development, :test do gem "rake" - gem "pry" # Easily debug from your console with `binding.pry` + gem "pry", "~> 0.13.1" # Easily debug from your console with `binding.pry` gem "pry-byebug", platform: :mri # Step-by-step debugging gem "cancancan" @@ -30,8 +30,8 @@ group :test do gem "cucumber-rails", require: false gem "cucumber" gem "database_cleaner" - gem "jasmine" - gem "jasmine-core" + gem "jasmine", "~> 2.99" + gem "jasmine-core", "~> 2.99" gem "launchy" gem "parallel_tests" gem "rails-i18n" # Provides default i18n for many languages diff --git a/gemfiles/rails_52/Gemfile.lock b/gemfiles/rails_52/Gemfile.lock index 51d5d3422a3a..f6e5e86e9a1b 100644 --- a/gemfiles/rails_52/Gemfile.lock +++ b/gemfiles/rails_52/Gemfile.lock @@ -8,7 +8,7 @@ PATH inherited_resources (~> 1.7) jquery-rails (~> 4.2) kaminari (~> 1.0, >= 1.2.1) - railties (>= 5.2, < 6.2) + railties (>= 5.2, < 7.1) ransack (~> 2.1, >= 2.1.1) GEM @@ -50,10 +50,10 @@ GEM activemodel (= 5.2.6) activesupport (= 5.2.6) arel (>= 9.0) - activerecord-jdbc-adapter (52.7-java) + activerecord-jdbc-adapter (52.8-java) activerecord (~> 5.2.0) - activerecord-jdbcsqlite3-adapter (52.7-java) - activerecord-jdbc-adapter (= 52.7) + activerecord-jdbcsqlite3-adapter (52.8-java) + activerecord-jdbc-adapter (= 52.8) jdbc-sqlite3 (~> 3.8, < 3.30) activestorage (5.2.6) actionpack (= 5.2.6) @@ -73,7 +73,7 @@ GEM bcrypt (3.1.16) bcrypt (3.1.16-java) builder (3.2.4) - byebug (11.1.1) + byebug (11.1.3) cancancan (3.3.0) capybara (3.35.3) addressable @@ -84,7 +84,7 @@ GEM regexp_parser (>= 1.5, < 3.0) xpath (~> 3.2) cliver (0.3.2) - coderay (1.1.2) + coderay (1.1.3) concurrent-ruby (1.1.9) crass (1.0.6) cucumber (7.1.0) @@ -104,8 +104,8 @@ GEM cucumber-gherkin (~> 22.0, >= 22.0.0) cucumber-messages (~> 17.1, >= 17.1.1) cucumber-tag-expressions (~> 4.0, >= 4.0.2) - cucumber-create-meta (6.0.1) - cucumber-messages (~> 17.0, >= 17.0.1) + cucumber-create-meta (6.0.4) + cucumber-messages (~> 17.1, >= 17.1.1) sys-uname (~> 1.2, >= 1.2.2) cucumber-cucumber-expressions (14.0.0) cucumber-gherkin (22.0.0) @@ -131,7 +131,7 @@ GEM ferrum (~> 0.11.0) database_cleaner (2.0.1) database_cleaner-active_record (~> 2.0.0) - database_cleaner-active_record (2.0.0) + database_cleaner-active_record (2.0.1) activerecord (>= 5.a) database_cleaner-core (~> 2.0.0) database_cleaner-core (2.0.1) @@ -144,8 +144,8 @@ GEM railties (>= 4.1.0) responders warden (~> 1.2.3) - diff-lcs (1.4.4) - docile (1.3.4) + diff-lcs (1.5.0) + docile (1.4.0) draper (4.0.2) actionpack (>= 5.0) activemodel (>= 5.0) @@ -164,8 +164,8 @@ GEM formtastic (4.0.0) actionpack (>= 5.2.0) formtastic_i18n (0.7.0) - globalid (0.4.2) - activesupport (>= 4.2.0) + globalid (1.0.0) + activesupport (>= 5.0) has_scope (0.8.0) actionpack (>= 5.2) activesupport (>= 5.2) @@ -187,7 +187,7 @@ GEM rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) - jruby-openssl (0.10.5-java) + jruby-openssl (0.11.0-java) kaminari (1.2.2) activesupport (>= 4.1.0) kaminari-actionview (= 1.2.2) @@ -207,17 +207,17 @@ GEM nokogiri (>= 1.5.9) mail (2.7.1) mini_mime (>= 0.1.1) - marcel (1.0.1) + marcel (1.0.2) method_source (1.0.0) - mime-types (3.3.1) + mime-types (3.4.1) mime-types-data (~> 3.2015) - mime-types-data (3.2021.0901) - mini_mime (1.1.0) + mime-types-data (3.2021.1115) + mini_mime (1.1.2) mini_portile2 (2.6.1) minitest (5.15.0) multi_test (0.1.2) - nio4r (2.5.7) - nio4r (2.5.7-java) + nio4r (2.5.8) + nio4r (2.5.8-java) nokogiri (1.12.5) mini_portile2 (~> 2.6.1) racc (~> 1.4) @@ -280,7 +280,7 @@ GEM activerecord (>= 5.2.4) activesupport (>= 5.2.4) i18n - regexp_parser (2.1.1) + regexp_parser (2.2.0) request_store (1.5.0) rack (>= 1.4) responders (3.0.1) @@ -307,8 +307,8 @@ GEM rspec-expectations (~> 3.10) rspec-mocks (~> 3.10) rspec-support (~> 3.10) - rspec-support (3.10.2) - ruby2_keywords (0.0.4) + rspec-support (3.10.3) + ruby2_keywords (0.0.5) sassc (2.4.0) ffi (~> 1.9) sassc-rails (2.1.2) @@ -322,7 +322,7 @@ GEM simplecov-html (~> 0.11) simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) - simplecov_json_formatter (0.1.2) + simplecov_json_formatter (0.1.3) spoon (0.0.6) ffi sprockets (4.0.2) @@ -344,9 +344,9 @@ GEM warden (1.2.9) rack (>= 2.0.9) webrick (1.7.0) - websocket-driver (0.7.3) + websocket-driver (0.7.5) websocket-extensions (>= 0.1.0) - websocket-driver (0.7.3-java) + websocket-driver (0.7.5-java) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) xpath (3.2.0) @@ -369,12 +369,12 @@ DEPENDENCIES db-query-matchers devise draper - jasmine - jasmine-core + jasmine (~> 2.99) + jasmine-core (~> 2.99) jruby-openssl launchy parallel_tests - pry + pry (~> 0.13.1) pry-byebug pundit rails (~> 5.2.3) @@ -388,4 +388,4 @@ DEPENDENCIES webrick BUNDLED WITH - 2.2.17 + 2.3.3 diff --git a/gemfiles/rails_60/Gemfile b/gemfiles/rails_60/Gemfile index 74935ca076c6..058653597be5 100644 --- a/gemfiles/rails_60/Gemfile +++ b/gemfiles/rails_60/Gemfile @@ -3,7 +3,7 @@ source "https://rubygems.org" group :development, :test do gem "rake" - gem "pry" # Easily debug from your console with `binding.pry` + gem "pry", "~> 0.13.1" # Easily debug from your console with `binding.pry` gem "pry-byebug", platform: :mri # Step-by-step debugging gem "cancancan" @@ -30,8 +30,8 @@ group :test do gem "cucumber-rails", require: false gem "cucumber" gem "database_cleaner" - gem "jasmine" - gem "jasmine-core" + gem "jasmine", "~> 2.99" + gem "jasmine-core", "~> 2.99" gem "launchy" gem "parallel_tests" gem "rails-i18n" # Provides default i18n for many languages diff --git a/gemfiles/rails_60/Gemfile.lock b/gemfiles/rails_60/Gemfile.lock index 22e12061f8d7..dc85a0455af9 100644 --- a/gemfiles/rails_60/Gemfile.lock +++ b/gemfiles/rails_60/Gemfile.lock @@ -8,7 +8,7 @@ PATH inherited_resources (~> 1.7) jquery-rails (~> 4.2) kaminari (~> 1.0, >= 1.2.1) - railties (>= 5.2, < 6.2) + railties (>= 5.2, < 7.1) ransack (~> 2.1, >= 2.1.1) GEM @@ -62,10 +62,10 @@ GEM activerecord (6.0.4.4) activemodel (= 6.0.4.4) activesupport (= 6.0.4.4) - activerecord-jdbc-adapter (60.3-java) + activerecord-jdbc-adapter (60.4-java) activerecord (~> 6.0.0) - activerecord-jdbcsqlite3-adapter (60.3-java) - activerecord-jdbc-adapter (= 60.3) + activerecord-jdbcsqlite3-adapter (60.4-java) + activerecord-jdbc-adapter (= 60.4) jdbc-sqlite3 (~> 3.8, < 3.30) activestorage (6.0.4.4) actionpack (= 6.0.4.4) @@ -86,7 +86,7 @@ GEM bcrypt (3.1.16) bcrypt (3.1.16-java) builder (3.2.4) - byebug (11.1.1) + byebug (11.1.3) cancancan (3.3.0) capybara (3.35.3) addressable @@ -97,7 +97,7 @@ GEM regexp_parser (>= 1.5, < 3.0) xpath (~> 3.2) cliver (0.3.2) - coderay (1.1.2) + coderay (1.1.3) concurrent-ruby (1.1.9) crass (1.0.6) cucumber (7.1.0) @@ -117,8 +117,8 @@ GEM cucumber-gherkin (~> 22.0, >= 22.0.0) cucumber-messages (~> 17.1, >= 17.1.1) cucumber-tag-expressions (~> 4.0, >= 4.0.2) - cucumber-create-meta (6.0.1) - cucumber-messages (~> 17.0, >= 17.0.1) + cucumber-create-meta (6.0.4) + cucumber-messages (~> 17.1, >= 17.1.1) sys-uname (~> 1.2, >= 1.2.2) cucumber-cucumber-expressions (14.0.0) cucumber-gherkin (22.0.0) @@ -144,7 +144,7 @@ GEM ferrum (~> 0.11.0) database_cleaner (2.0.1) database_cleaner-active_record (~> 2.0.0) - database_cleaner-active_record (2.0.0) + database_cleaner-active_record (2.0.1) activerecord (>= 5.a) database_cleaner-core (~> 2.0.0) database_cleaner-core (2.0.1) @@ -157,8 +157,8 @@ GEM railties (>= 4.1.0) responders warden (~> 1.2.3) - diff-lcs (1.4.4) - docile (1.3.4) + diff-lcs (1.5.0) + docile (1.4.0) draper (4.0.2) actionpack (>= 5.0) activemodel (>= 5.0) @@ -200,7 +200,7 @@ GEM rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) - jruby-openssl (0.10.5-java) + jruby-openssl (0.11.0-java) kaminari (1.2.2) activesupport (>= 4.1.0) kaminari-actionview (= 1.2.2) @@ -222,9 +222,9 @@ GEM mini_mime (>= 0.1.1) marcel (1.0.2) method_source (1.0.0) - mime-types (3.3.1) + mime-types (3.4.1) mime-types-data (~> 3.2015) - mime-types-data (3.2021.0901) + mime-types-data (3.2021.1115) mini_mime (1.1.2) mini_portile2 (2.6.1) minitest (5.15.0) @@ -281,7 +281,7 @@ GEM nokogiri (>= 1.6) rails-html-sanitizer (1.4.2) loofah (~> 2.3) - rails-i18n (7.0.0) + rails-i18n (7.0.1) i18n (>= 0.7, < 2) railties (>= 6.0.0, < 8) railties (6.0.4.4) @@ -295,7 +295,7 @@ GEM activerecord (>= 5.2.4) activesupport (>= 5.2.4) i18n - regexp_parser (2.1.1) + regexp_parser (2.2.0) request_store (1.5.0) rack (>= 1.4) responders (3.0.1) @@ -322,8 +322,8 @@ GEM rspec-expectations (~> 3.10) rspec-mocks (~> 3.10) rspec-support (~> 3.10) - rspec-support (3.10.2) - ruby2_keywords (0.0.2) + rspec-support (3.10.3) + ruby2_keywords (0.0.5) sassc (2.4.0) ffi (~> 1.9) sassc-rails (2.1.2) @@ -337,7 +337,7 @@ GEM simplecov-html (~> 0.11) simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) - simplecov_json_formatter (0.1.2) + simplecov_json_formatter (0.1.3) spoon (0.0.6) ffi sprockets (4.0.2) @@ -385,12 +385,12 @@ DEPENDENCIES db-query-matchers devise draper - jasmine - jasmine-core + jasmine (~> 2.99) + jasmine-core (~> 2.99) jruby-openssl launchy parallel_tests - pry + pry (~> 0.13.1) pry-byebug pundit rails (~> 6.0.0) @@ -404,4 +404,4 @@ DEPENDENCIES webrick BUNDLED WITH - 2.2.17 + 2.3.3 diff --git a/gemfiles/rails_61/Gemfile b/gemfiles/rails_61/Gemfile new file mode 100644 index 000000000000..3965e76d06cf --- /dev/null +++ b/gemfiles/rails_61/Gemfile @@ -0,0 +1,42 @@ +# frozen_string_literal: true +source "https://rubygems.org" + +group :development, :test do + gem "rake" + gem "pry", "~> 0.13.1" # Easily debug from your console with `binding.pry` + gem "pry-byebug", platform: :mri # Step-by-step debugging + + gem "cancancan" + gem "pundit" + gem "jruby-openssl", platform: :jruby + + gem "draper" + gem "devise" + + gem "rails", "~> 6.1.0" + gem "activerecord-jdbcsqlite3-adapter", platform: :jruby + + gem "sprockets-rails" + gem "sassc-rails" +end + +group :test do + gem "cuprite" + gem "capybara" + gem "webrick" + gem "db-query-matchers" + + gem "simplecov", require: false # Test coverage generator. Go to /coverage/ after running tests + gem "cucumber-rails", require: false + gem "cucumber" + gem "database_cleaner" + gem "jasmine", "~> 2.99" + gem "jasmine-core", "~> 2.99" + gem "launchy" + gem "parallel_tests" + gem "rails-i18n" # Provides default i18n for many languages + gem "rspec-rails" + gem "sqlite3", platform: :mri +end + +gemspec path: "../.." diff --git a/gemfiles/rails_61/Gemfile.lock b/gemfiles/rails_61/Gemfile.lock new file mode 100644 index 000000000000..25b28a509a93 --- /dev/null +++ b/gemfiles/rails_61/Gemfile.lock @@ -0,0 +1,384 @@ +PATH + remote: ../.. + specs: + activeadmin (2.9.0) + arbre (~> 1.2, >= 1.2.1) + formtastic (>= 3.1, < 5.0) + formtastic_i18n (~> 0.4) + inherited_resources (~> 1.7) + jquery-rails (~> 4.2) + kaminari (~> 1.0, >= 1.2.1) + railties (>= 5.2, < 7.1) + ransack (~> 2.1, >= 2.1.1) + +GEM + remote: https://rubygems.org/ + specs: + actioncable (6.1.4.4) + actionpack (= 6.1.4.4) + activesupport (= 6.1.4.4) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) + actionmailbox (6.1.4.4) + actionpack (= 6.1.4.4) + activejob (= 6.1.4.4) + activerecord (= 6.1.4.4) + activestorage (= 6.1.4.4) + activesupport (= 6.1.4.4) + mail (>= 2.7.1) + actionmailer (6.1.4.4) + actionpack (= 6.1.4.4) + actionview (= 6.1.4.4) + activejob (= 6.1.4.4) + activesupport (= 6.1.4.4) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (6.1.4.4) + actionview (= 6.1.4.4) + activesupport (= 6.1.4.4) + 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.4.4) + actionpack (= 6.1.4.4) + activerecord (= 6.1.4.4) + activestorage (= 6.1.4.4) + activesupport (= 6.1.4.4) + nokogiri (>= 1.8.5) + actionview (6.1.4.4) + activesupport (= 6.1.4.4) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.1, >= 1.2.0) + activejob (6.1.4.4) + activesupport (= 6.1.4.4) + globalid (>= 0.3.6) + activemodel (6.1.4.4) + activesupport (= 6.1.4.4) + activemodel-serializers-xml (1.0.2) + activemodel (> 5.x) + activesupport (> 5.x) + builder (~> 3.1) + activerecord (6.1.4.4) + activemodel (= 6.1.4.4) + activesupport (= 6.1.4.4) + activestorage (6.1.4.4) + actionpack (= 6.1.4.4) + activejob (= 6.1.4.4) + activerecord (= 6.1.4.4) + activesupport (= 6.1.4.4) + marcel (~> 1.0.0) + mini_mime (>= 1.1.0) + activesupport (6.1.4.4) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 1.6, < 2) + minitest (>= 5.1) + tzinfo (~> 2.0) + zeitwerk (~> 2.3) + addressable (2.8.0) + public_suffix (>= 2.0.2, < 5.0) + arbre (1.4.0) + activesupport (>= 3.0.0, < 6.2) + ruby2_keywords (>= 0.0.2, < 1.0) + bcrypt (3.1.16) + builder (3.2.4) + byebug (11.1.3) + cancancan (3.3.0) + capybara (3.35.3) + addressable + mini_mime (>= 0.1.3) + nokogiri (~> 1.8) + rack (>= 1.6.0) + rack-test (>= 0.6.3) + regexp_parser (>= 1.5, < 3.0) + xpath (~> 3.2) + cliver (0.3.2) + coderay (1.1.3) + concurrent-ruby (1.1.9) + crass (1.0.6) + cucumber (7.1.0) + builder (~> 3.2, >= 3.2.4) + cucumber-core (~> 10.1, >= 10.1.0) + cucumber-create-meta (~> 6.0, >= 6.0.1) + cucumber-cucumber-expressions (~> 14.0, >= 14.0.0) + cucumber-gherkin (~> 22.0, >= 22.0.0) + cucumber-html-formatter (~> 17.0, >= 17.0.0) + cucumber-messages (~> 17.1, >= 17.1.1) + cucumber-wire (~> 6.2, >= 6.2.0) + diff-lcs (~> 1.4, >= 1.4.4) + mime-types (~> 3.3, >= 3.3.1) + multi_test (~> 0.1, >= 0.1.2) + sys-uname (~> 1.2, >= 1.2.2) + cucumber-core (10.1.0) + cucumber-gherkin (~> 22.0, >= 22.0.0) + cucumber-messages (~> 17.1, >= 17.1.1) + cucumber-tag-expressions (~> 4.0, >= 4.0.2) + cucumber-create-meta (6.0.4) + cucumber-messages (~> 17.1, >= 17.1.1) + sys-uname (~> 1.2, >= 1.2.2) + cucumber-cucumber-expressions (14.0.0) + cucumber-gherkin (22.0.0) + cucumber-messages (~> 17.1, >= 17.1.1) + cucumber-html-formatter (17.0.0) + cucumber-messages (~> 17.1, >= 17.1.0) + cucumber-messages (17.1.1) + cucumber-rails (2.4.0) + capybara (>= 2.18, < 4) + cucumber (>= 3.2, < 8) + mime-types (~> 3.3) + nokogiri (~> 1.10) + railties (>= 5.0, < 7) + rexml (~> 3.0) + webrick (~> 1.7) + cucumber-tag-expressions (4.1.0) + cucumber-wire (6.2.0) + cucumber-core (~> 10.1, >= 10.1.0) + cucumber-cucumber-expressions (~> 14.0, >= 14.0.0) + cucumber-messages (~> 17.1, >= 17.1.1) + cuprite (0.13) + capybara (>= 2.1, < 4) + ferrum (~> 0.11.0) + database_cleaner (2.0.1) + database_cleaner-active_record (~> 2.0.0) + database_cleaner-active_record (2.0.1) + activerecord (>= 5.a) + database_cleaner-core (~> 2.0.0) + database_cleaner-core (2.0.1) + db-query-matchers (0.10.0) + activesupport (>= 4.0, < 7) + rspec (~> 3.0) + devise (4.8.1) + bcrypt (~> 3.0) + orm_adapter (~> 0.1) + railties (>= 4.1.0) + responders + warden (~> 1.2.3) + diff-lcs (1.5.0) + docile (1.4.0) + draper (4.0.2) + actionpack (>= 5.0) + activemodel (>= 5.0) + activemodel-serializers-xml (>= 1.0) + activesupport (>= 5.0) + request_store (>= 1.0) + ruby2_keywords + erubi (1.10.0) + ferrum (0.11) + addressable (~> 2.5) + cliver (~> 0.3) + concurrent-ruby (~> 1.1) + websocket-driver (>= 0.6, < 0.8) + ffi (1.15.4) + formtastic (4.0.0) + actionpack (>= 5.2.0) + formtastic_i18n (0.7.0) + globalid (1.0.0) + activesupport (>= 5.0) + has_scope (0.8.0) + actionpack (>= 5.2) + activesupport (>= 5.2) + i18n (1.8.11) + concurrent-ruby (~> 1.0) + inherited_resources (1.13.0) + actionpack (>= 5.2, < 6.2) + has_scope (~> 0.6) + railties (>= 5.2, < 6.2) + responders (>= 2, < 4) + jasmine (2.99.0) + jasmine-core (>= 2.99.0, < 3.0.0) + phantomjs + rack (>= 1.2.1) + rake + jasmine-core (2.99.2) + jquery-rails (4.4.0) + rails-dom-testing (>= 1, < 3) + railties (>= 4.2.0) + thor (>= 0.14, < 2.0) + kaminari (1.2.1) + activesupport (>= 4.1.0) + kaminari-actionview (= 1.2.1) + kaminari-activerecord (= 1.2.1) + kaminari-core (= 1.2.1) + kaminari-actionview (1.2.1) + actionview + kaminari-core (= 1.2.1) + kaminari-activerecord (1.2.1) + activerecord + kaminari-core (= 1.2.1) + kaminari-core (1.2.1) + launchy (2.5.0) + addressable (~> 2.7) + loofah (2.13.0) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + mail (2.7.1) + mini_mime (>= 0.1.1) + marcel (1.0.2) + method_source (1.0.0) + mime-types (3.4.1) + mime-types-data (~> 3.2015) + mime-types-data (3.2021.1115) + mini_mime (1.1.2) + mini_portile2 (2.6.1) + minitest (5.15.0) + multi_test (0.1.2) + nio4r (2.5.8) + nokogiri (1.12.5) + mini_portile2 (~> 2.6.1) + racc (~> 1.4) + orm_adapter (0.5.0) + parallel (1.21.0) + parallel_tests (3.7.3) + parallel + phantomjs (2.1.1.0) + pry (0.13.1) + coderay (~> 1.1) + method_source (~> 1.0) + pry-byebug (3.9.0) + byebug (~> 11.0) + pry (~> 0.13.0) + public_suffix (4.0.6) + pundit (2.1.1) + activesupport (>= 3.0.0) + racc (1.6.0) + rack (2.2.3) + rack-test (1.1.0) + rack (>= 1.0, < 3) + rails (6.1.4.4) + actioncable (= 6.1.4.4) + actionmailbox (= 6.1.4.4) + actionmailer (= 6.1.4.4) + actionpack (= 6.1.4.4) + actiontext (= 6.1.4.4) + actionview (= 6.1.4.4) + activejob (= 6.1.4.4) + activemodel (= 6.1.4.4) + activerecord (= 6.1.4.4) + activestorage (= 6.1.4.4) + activesupport (= 6.1.4.4) + bundler (>= 1.15.0) + railties (= 6.1.4.4) + sprockets-rails (>= 2.0.0) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) + rails-html-sanitizer (1.4.2) + loofah (~> 2.3) + rails-i18n (7.0.1) + i18n (>= 0.7, < 2) + railties (>= 6.0.0, < 8) + railties (6.1.4.4) + actionpack (= 6.1.4.4) + activesupport (= 6.1.4.4) + method_source + rake (>= 0.13) + thor (~> 1.0) + rake (13.0.6) + ransack (2.4.1) + activerecord (>= 5.2.4) + activesupport (>= 5.2.4) + i18n + regexp_parser (2.2.0) + request_store (1.5.0) + rack (>= 1.4) + responders (3.0.1) + actionpack (>= 5.0) + railties (>= 5.0) + rexml (3.2.5) + rspec (3.10.0) + rspec-core (~> 3.10.0) + rspec-expectations (~> 3.10.0) + rspec-mocks (~> 3.10.0) + rspec-core (3.10.1) + rspec-support (~> 3.10.0) + rspec-expectations (3.10.1) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.10.0) + rspec-mocks (3.10.2) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.10.0) + rspec-rails (5.0.2) + actionpack (>= 5.2) + activesupport (>= 5.2) + railties (>= 5.2) + rspec-core (~> 3.10) + rspec-expectations (~> 3.10) + rspec-mocks (~> 3.10) + rspec-support (~> 3.10) + rspec-support (3.10.3) + ruby2_keywords (0.0.5) + sassc (2.4.0) + ffi (~> 1.9) + sassc-rails (2.1.2) + railties (>= 4.0.0) + sassc (>= 2.0) + sprockets (> 3.0) + sprockets-rails + tilt + simplecov (0.21.2) + docile (~> 1.1) + simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) + simplecov-html (0.12.3) + simplecov_json_formatter (0.1.3) + sprockets (4.0.2) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-rails (3.4.2) + actionpack (>= 5.2) + activesupport (>= 5.2) + sprockets (>= 3.0.0) + sqlite3 (1.4.2) + sys-uname (1.2.2) + ffi (~> 1.1) + thor (1.1.0) + tilt (2.0.10) + tzinfo (2.0.4) + concurrent-ruby (~> 1.0) + warden (1.2.9) + rack (>= 2.0.9) + webrick (1.7.0) + websocket-driver (0.7.5) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.5) + xpath (3.2.0) + nokogiri (~> 1.8) + zeitwerk (2.5.1) + +PLATFORMS + ruby + +DEPENDENCIES + activeadmin! + activerecord-jdbcsqlite3-adapter + cancancan + capybara + cucumber + cucumber-rails + cuprite + database_cleaner + db-query-matchers + devise + draper + jasmine (~> 2.99) + jasmine-core (~> 2.99) + jruby-openssl + launchy + parallel_tests + pry (~> 0.13.1) + pry-byebug + pundit + rails (~> 6.1.0) + rails-i18n + rake + rspec-rails + sassc-rails + simplecov + sprockets-rails + sqlite3 + webrick + +BUNDLED WITH + 2.3.3 diff --git a/gemfiles/rails_61_turbolinks/Gemfile b/gemfiles/rails_61_turbolinks/Gemfile index e784a49c99eb..60cabf2f631b 100644 --- a/gemfiles/rails_61_turbolinks/Gemfile +++ b/gemfiles/rails_61_turbolinks/Gemfile @@ -3,7 +3,7 @@ source "https://rubygems.org" group :development, :test do gem "rake" - gem "pry" # Easily debug from your console with `binding.pry` + gem "pry", "~> 0.13.1" # Easily debug from your console with `binding.pry` gem "pry-byebug", platform: :mri # Step-by-step debugging gem "cancancan" @@ -32,8 +32,8 @@ group :test do gem "cucumber-rails", require: false gem "cucumber" gem "database_cleaner" - gem "jasmine" - gem "jasmine-core" + gem "jasmine", "~> 2.99" + gem "jasmine-core", "~> 2.99" gem "launchy" gem "parallel_tests" gem "rails-i18n" # Provides default i18n for many languages diff --git a/gemfiles/rails_61_turbolinks/Gemfile.lock b/gemfiles/rails_61_turbolinks/Gemfile.lock index d965d987d431..725a0d487b7b 100644 --- a/gemfiles/rails_61_turbolinks/Gemfile.lock +++ b/gemfiles/rails_61_turbolinks/Gemfile.lock @@ -8,7 +8,7 @@ PATH inherited_resources (~> 1.7) jquery-rails (~> 4.2) kaminari (~> 1.0, >= 1.2.1) - railties (>= 5.2, < 6.2) + railties (>= 5.2, < 7.1) ransack (~> 2.1, >= 2.1.1) GEM @@ -64,10 +64,10 @@ GEM activerecord (6.1.4.4) activemodel (= 6.1.4.4) activesupport (= 6.1.4.4) - activerecord-jdbc-adapter (61.0-java) + activerecord-jdbc-adapter (61.1-java) activerecord (~> 6.1.0) - activerecord-jdbcsqlite3-adapter (61.0-java) - activerecord-jdbc-adapter (= 61.0) + activerecord-jdbcsqlite3-adapter (61.1-java) + activerecord-jdbc-adapter (= 61.1) jdbc-sqlite3 (~> 3.8, < 3.30) activestorage (6.1.4.4) actionpack (= 6.1.4.4) @@ -90,7 +90,7 @@ GEM bcrypt (3.1.16) bcrypt (3.1.16-java) builder (3.2.4) - byebug (11.1.1) + byebug (11.1.3) cancancan (3.3.0) capybara (3.35.3) addressable @@ -101,7 +101,7 @@ GEM regexp_parser (>= 1.5, < 3.0) xpath (~> 3.2) cliver (0.3.2) - coderay (1.1.2) + coderay (1.1.3) concurrent-ruby (1.1.9) crass (1.0.6) cucumber (7.1.0) @@ -121,8 +121,8 @@ GEM cucumber-gherkin (~> 22.0, >= 22.0.0) cucumber-messages (~> 17.1, >= 17.1.1) cucumber-tag-expressions (~> 4.0, >= 4.0.2) - cucumber-create-meta (6.0.1) - cucumber-messages (~> 17.0, >= 17.0.1) + cucumber-create-meta (6.0.4) + cucumber-messages (~> 17.1, >= 17.1.1) sys-uname (~> 1.2, >= 1.2.2) cucumber-cucumber-expressions (14.0.0) cucumber-gherkin (22.0.0) @@ -148,7 +148,7 @@ GEM ferrum (~> 0.11.0) database_cleaner (2.0.1) database_cleaner-active_record (~> 2.0.0) - database_cleaner-active_record (2.0.0) + database_cleaner-active_record (2.0.1) activerecord (>= 5.a) database_cleaner-core (~> 2.0.0) database_cleaner-core (2.0.1) @@ -161,8 +161,8 @@ GEM railties (>= 4.1.0) responders warden (~> 1.2.3) - diff-lcs (1.4.4) - docile (1.3.4) + diff-lcs (1.5.0) + docile (1.4.0) draper (4.0.2) actionpack (>= 5.0) activemodel (>= 5.0) @@ -204,7 +204,7 @@ GEM rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) - jruby-openssl (0.10.5-java) + jruby-openssl (0.11.0-java) kaminari (1.2.2) activesupport (>= 4.1.0) kaminari-actionview (= 1.2.2) @@ -226,9 +226,9 @@ GEM mini_mime (>= 0.1.1) marcel (1.0.2) method_source (1.0.0) - mime-types (3.3.1) + mime-types (3.4.1) mime-types-data (~> 3.2015) - mime-types-data (3.2021.0901) + mime-types-data (3.2021.1115) mini_mime (1.1.2) mini_portile2 (2.6.1) minitest (5.15.0) @@ -299,7 +299,7 @@ GEM activerecord (>= 5.2.4) activesupport (>= 5.2.4) i18n - regexp_parser (2.1.1) + regexp_parser (2.2.0) request_store (1.5.0) rack (>= 1.4) responders (3.0.1) @@ -326,8 +326,8 @@ GEM rspec-expectations (~> 3.10) rspec-mocks (~> 3.10) rspec-support (~> 3.10) - rspec-support (3.10.2) - ruby2_keywords (0.0.2) + rspec-support (3.10.3) + ruby2_keywords (0.0.5) sassc (2.4.0) ffi (~> 1.9) sassc-rails (2.1.2) @@ -341,7 +341,7 @@ GEM simplecov-html (~> 0.11) simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) - simplecov_json_formatter (0.1.2) + simplecov_json_formatter (0.1.3) spoon (0.0.6) ffi sprockets (4.0.2) @@ -390,12 +390,12 @@ DEPENDENCIES db-query-matchers devise draper - jasmine - jasmine-core + jasmine (~> 2.99) + jasmine-core (~> 2.99) jruby-openssl launchy parallel_tests - pry + pry (~> 0.13.1) pry-byebug pundit rails (~> 6.1.0) @@ -410,4 +410,4 @@ DEPENDENCIES webrick BUNDLED WITH - 2.2.17 + 2.3.3 diff --git a/gemfiles/rails_61_webpacker/Gemfile b/gemfiles/rails_61_webpacker/Gemfile index f217f6a8757c..994e2c573f73 100644 --- a/gemfiles/rails_61_webpacker/Gemfile +++ b/gemfiles/rails_61_webpacker/Gemfile @@ -3,7 +3,7 @@ source "https://rubygems.org" group :development, :test do gem "rake" - gem "pry" # Easily debug from your console with `binding.pry` + gem "pry", "~> 0.13.1" # Easily debug from your console with `binding.pry` gem "pry-byebug", platform: :mri # Step-by-step debugging gem "cancancan" @@ -29,8 +29,8 @@ group :test do gem "cucumber-rails", require: false gem "cucumber" gem "database_cleaner" - gem "jasmine" - gem "jasmine-core" + gem "jasmine", "~> 2.99" + gem "jasmine-core", "~> 2.99" gem "launchy" gem "parallel_tests" gem "rails-i18n" # Provides default i18n for many languages diff --git a/gemfiles/rails_61_webpacker/Gemfile.lock b/gemfiles/rails_61_webpacker/Gemfile.lock index e798cb6b82f8..6b539d179496 100644 --- a/gemfiles/rails_61_webpacker/Gemfile.lock +++ b/gemfiles/rails_61_webpacker/Gemfile.lock @@ -8,7 +8,7 @@ PATH inherited_resources (~> 1.7) jquery-rails (~> 4.2) kaminari (~> 1.0, >= 1.2.1) - railties (>= 5.2, < 6.2) + railties (>= 5.2, < 7.1) ransack (~> 2.1, >= 2.1.1) GEM @@ -64,10 +64,10 @@ GEM activerecord (6.1.4.4) activemodel (= 6.1.4.4) activesupport (= 6.1.4.4) - activerecord-jdbc-adapter (61.0-java) + activerecord-jdbc-adapter (61.1-java) activerecord (~> 6.1.0) - activerecord-jdbcsqlite3-adapter (61.0-java) - activerecord-jdbc-adapter (= 61.0) + activerecord-jdbcsqlite3-adapter (61.1-java) + activerecord-jdbc-adapter (= 61.1) jdbc-sqlite3 (~> 3.8, < 3.30) activestorage (6.1.4.4) actionpack (= 6.1.4.4) @@ -90,7 +90,7 @@ GEM bcrypt (3.1.16) bcrypt (3.1.16-java) builder (3.2.4) - byebug (11.1.1) + byebug (11.1.3) cancancan (3.3.0) capybara (3.35.3) addressable @@ -121,8 +121,8 @@ GEM cucumber-gherkin (~> 22.0, >= 22.0.0) cucumber-messages (~> 17.1, >= 17.1.1) cucumber-tag-expressions (~> 4.0, >= 4.0.2) - cucumber-create-meta (6.0.1) - cucumber-messages (~> 17.0, >= 17.0.1) + cucumber-create-meta (6.0.4) + cucumber-messages (~> 17.1, >= 17.1.1) sys-uname (~> 1.2, >= 1.2.2) cucumber-cucumber-expressions (14.0.0) cucumber-gherkin (22.0.0) @@ -148,7 +148,7 @@ GEM ferrum (~> 0.11.0) database_cleaner (2.0.1) database_cleaner-active_record (~> 2.0.0) - database_cleaner-active_record (2.0.0) + database_cleaner-active_record (2.0.1) activerecord (>= 5.a) database_cleaner-core (~> 2.0.0) database_cleaner-core (2.0.1) @@ -161,8 +161,8 @@ GEM railties (>= 4.1.0) responders warden (~> 1.2.3) - diff-lcs (1.4.4) - docile (1.3.4) + diff-lcs (1.5.0) + docile (1.4.0) draper (4.0.2) actionpack (>= 5.0) activemodel (>= 5.0) @@ -204,7 +204,7 @@ GEM rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) - jruby-openssl (0.10.5-java) + jruby-openssl (0.11.0-java) kaminari (1.2.2) activesupport (>= 4.1.0) kaminari-actionview (= 1.2.2) @@ -226,9 +226,9 @@ GEM mini_mime (>= 0.1.1) marcel (1.0.2) method_source (1.0.0) - mime-types (3.3.1) + mime-types (3.4.1) mime-types-data (~> 3.2015) - mime-types-data (3.2021.0901) + mime-types-data (3.2021.1115) mini_mime (1.1.2) mini_portile2 (2.6.1) minitest (5.15.0) @@ -301,7 +301,7 @@ GEM activerecord (>= 5.2.4) activesupport (>= 5.2.4) i18n - regexp_parser (2.1.1) + regexp_parser (2.2.0) request_store (1.5.0) rack (>= 1.4) responders (3.0.1) @@ -328,15 +328,15 @@ GEM rspec-expectations (~> 3.10) rspec-mocks (~> 3.10) rspec-support (~> 3.10) - rspec-support (3.10.2) - ruby2_keywords (0.0.2) + rspec-support (3.10.3) + ruby2_keywords (0.0.5) semantic_range (3.0.0) simplecov (0.21.2) docile (~> 1.1) simplecov-html (~> 0.11) simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) - simplecov_json_formatter (0.1.2) + simplecov_json_formatter (0.1.3) spoon (0.0.6) ffi sprockets (4.0.2) @@ -386,12 +386,12 @@ DEPENDENCIES db-query-matchers devise draper - jasmine - jasmine-core + jasmine (~> 2.99) + jasmine-core (~> 2.99) jruby-openssl launchy parallel_tests - pry + pry (~> 0.13.1) pry-byebug pundit rails (~> 6.1.0) @@ -404,4 +404,4 @@ DEPENDENCIES webrick BUNDLED WITH - 2.2.17 + 2.3.3 diff --git a/tasks/test_application.rb b/tasks/test_application.rb index e21a6454f344..31f5ec83b3eb 100644 --- a/tasks/test_application.rb +++ b/tasks/test_application.rb @@ -64,7 +64,7 @@ def base_dir end def app_name - return "rails_61" if main_app? + return "rails_70" if main_app? File.basename(File.dirname(gemfile)) end @@ -78,7 +78,7 @@ def turbolinks_app? end def webpacker_app? - expanded_gemfile == File.expand_path("gemfiles/rails_60_webpacker/Gemfile") + expanded_gemfile == File.expand_path("gemfiles/rails_61_webpacker/Gemfile") end def gemfile