From 87d7e9f548f9be766c6cdaaf8802c8a3d9dc3953 Mon Sep 17 00:00:00 2001 From: Judah Meek Date: Thu, 20 Jul 2023 16:04:37 -0500 Subject: [PATCH 1/2] rename appraisal gemfiles --- .github/workflows/ruby.yml | 4 +- Appraisals | 4 +- .../{no_sprockets.gemfile => base.gemfile} | 0 ...rockets.gemfile.lock => base.gemfile.lock} | 97 ++++++++++--------- ...hakapacker.gemfile => shakapacker.gemfile} | 0 ....gemfile.lock => shakapacker.gemfile.lock} | 0 test/support/sprockets_helpers.rb | 2 +- 7 files changed, 56 insertions(+), 51 deletions(-) rename gemfiles/{no_sprockets.gemfile => base.gemfile} (100%) rename gemfiles/{no_sprockets.gemfile.lock => base.gemfile.lock} (81%) rename gemfiles/{no_sprockets_shakapacker.gemfile => shakapacker.gemfile} (100%) rename gemfiles/{no_sprockets_shakapacker.gemfile.lock => shakapacker.gemfile.lock} (100%) diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml index 3c6a5c8b3..c16dc0b18 100644 --- a/.github/workflows/ruby.yml +++ b/.github/workflows/ruby.yml @@ -53,8 +53,8 @@ jobs: ruby: [2.7] gemfile: # These have shakapacker: - - no_sprockets - - no_sprockets_shakapacker + - base + - shakapacker # These don't have shakapacker: - sprockets_3 - sprockets_4 diff --git a/Appraisals b/Appraisals index a29fcaeae..69bd984a3 100644 --- a/Appraisals +++ b/Appraisals @@ -14,12 +14,12 @@ appraise 'sprockets_3' do gem 'mini_racer', :platforms => :mri end -appraise 'no_sprockets_shakapacker' do +appraise 'shakapacker' do gem 'rails', '~> 7.0.x' gem 'shakapacker', '6.6.0' end -appraise 'no_sprockets' do +appraise 'base' do # Appraisal adds `turbolinks` to this gemfile because it is # present in `./Gemfile`. # But it causes this gemfile to break, so it must be removed diff --git a/gemfiles/no_sprockets.gemfile b/gemfiles/base.gemfile similarity index 100% rename from gemfiles/no_sprockets.gemfile rename to gemfiles/base.gemfile diff --git a/gemfiles/no_sprockets.gemfile.lock b/gemfiles/base.gemfile.lock similarity index 81% rename from gemfiles/no_sprockets.gemfile.lock rename to gemfiles/base.gemfile.lock index b4d2dfb64..16ebe5613 100644 --- a/gemfiles/no_sprockets.gemfile.lock +++ b/gemfiles/base.gemfile.lock @@ -76,9 +76,9 @@ GEM i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) - addressable (2.7.0) - public_suffix (>= 2.0.2, < 5.0) - appraisal (2.2.0) + addressable (2.8.1) + public_suffix (>= 2.0.2, < 6.0) + appraisal (2.4.1) bundler rake thor (>= 0.14.0) @@ -87,19 +87,19 @@ GEM babel-source (>= 4.0, < 6) execjs (~> 2.0) builder (3.2.4) - byebug (11.0.1) - capybara (3.30.0) + byebug (11.1.3) + capybara (3.38.0) addressable + matrix mini_mime (>= 0.1.3) nokogiri (~> 1.8) rack (>= 1.6.0) rack-test (>= 0.6.3) - regexp_parser (~> 1.5) + regexp_parser (>= 1.5, < 3.0) xpath (~> 3.2) - childprocess (3.0.0) codeclimate-test-reporter (1.0.9) simplecov (<= 0.13) - coderay (1.1.2) + coderay (1.1.3) coffee-rails (5.0.0) coffee-script (>= 2.2.0) railties (>= 5.2.0) @@ -107,55 +107,57 @@ GEM coffee-script-source execjs coffee-script-source (1.12.2) - concurrent-ruby (1.1.10) - connection_pool (2.2.2) + concurrent-ruby (1.2.2) + connection_pool (2.4.0) crass (1.0.6) date (3.3.3) docile (1.1.5) - erubi (1.11.0) + erubi (1.12.0) es5-shim-rails (4.0.1) actionpack (>= 3.1) railties (>= 3.1) - execjs (2.7.0) - ffi (1.11.3) - formatador (0.2.5) + execjs (2.8.1) + ffi (1.15.5) + formatador (1.1.0) gem-release (2.2.2) globalid (1.1.0) activesupport (>= 5.0) - guard (2.16.1) + guard (2.18.0) formatador (>= 0.2.4) listen (>= 2.7, < 4.0) lumberjack (>= 1.0.12, < 2.0) nenv (~> 0.1) notiffany (~> 0.0) - pry (>= 0.9.12) + pry (>= 0.13.0) shellany (~> 0.0) thor (>= 0.18.1) guard-compat (1.2.1) guard-minitest (2.4.6) guard-compat (~> 1.2) minitest (>= 3.0) - i18n (1.12.0) + i18n (1.13.0) concurrent-ruby (~> 1.0) - jbuilder (2.9.1) - activesupport (>= 4.2.0) - json (2.3.0) + jbuilder (2.11.5) + actionview (>= 5.0.0) + activesupport (>= 5.0.0) + json (2.6.3) listen (3.0.8) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) - loofah (2.18.0) + loofah (2.21.1) crass (~> 1.0.2) nokogiri (>= 1.5.9) - lumberjack (1.0.13) + lumberjack (1.2.8) mail (2.8.1) mini_mime (>= 0.1.1) net-imap net-pop net-smtp marcel (1.0.2) - method_source (0.9.2) + matrix (0.4.2) + method_source (1.0.0) mini_mime (1.1.2) - minitest (5.16.3) + minitest (5.18.0) nenv (0.3.0) net-imap (0.3.4) date @@ -167,24 +169,24 @@ GEM net-smtp (0.3.3) net-protocol nio4r (2.5.9) - nokogiri (1.13.8-x86_64-darwin) + nokogiri (1.14.3-x86_64-darwin) racc (~> 1.4) nokogiri (1.13.8-x86_64-linux) racc (~> 1.4) notiffany (0.1.3) nenv (~> 0.1) shellany (~> 0.0) - pry (0.12.2) - coderay (~> 1.1.0) - method_source (~> 0.9.0) - pry-byebug (3.7.0) + pry (0.14.2) + coderay (~> 1.1) + method_source (~> 1.0) + pry-byebug (3.10.1) byebug (~> 11.0) - pry (~> 0.10) - public_suffix (4.0.2) - racc (1.6.0) - rack (2.2.4) - rack-test (1.1.0) - rack (>= 1.0, < 3) + pry (>= 0.13, < 0.15) + public_suffix (5.0.1) + racc (1.6.2) + rack (2.2.7) + rack-test (2.1.0) + rack (>= 1.3) rails (7.0.4.3) actioncable (= 7.0.4.3) actionmailbox (= 7.0.4.3) @@ -202,8 +204,8 @@ GEM rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.4.3) - loofah (~> 2.3) + rails-html-sanitizer (1.5.0) + loofah (~> 2.19, >= 2.19.1) railties (7.0.4.3) actionpack (= 7.0.4.3) activesupport (= 7.0.4.3) @@ -212,14 +214,16 @@ GEM thor (~> 1.0) zeitwerk (~> 2.5) rake (13.0.6) - rb-fsevent (0.10.3) + rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) - regexp_parser (1.6.0) - rubyzip (2.0.0) - selenium-webdriver (3.142.7) - childprocess (>= 0.5, < 4.0) - rubyzip (>= 1.2.2) + regexp_parser (2.7.0) + rexml (3.2.5) + rubyzip (2.3.2) + selenium-webdriver (4.8.3) + rexml (~> 3.2, >= 3.2.5) + rubyzip (>= 1.2.2, < 3.0) + websocket (~> 1.0) shellany (0.0.1) simplecov (0.13.0) docile (~> 1.1.0) @@ -228,14 +232,15 @@ GEM simplecov-html (0.10.2) test-unit (2.5.5) thor (1.2.1) - tilt (2.0.10) + tilt (2.1.0) timeout (0.3.2) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - webdrivers (4.2.0) + webdrivers (5.2.0) nokogiri (~> 1.6) rubyzip (>= 1.3.0) - selenium-webdriver (>= 3.0, < 4.0) + selenium-webdriver (~> 4.0) + websocket (1.2.9) websocket-driver (0.7.5) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) diff --git a/gemfiles/no_sprockets_shakapacker.gemfile b/gemfiles/shakapacker.gemfile similarity index 100% rename from gemfiles/no_sprockets_shakapacker.gemfile rename to gemfiles/shakapacker.gemfile diff --git a/gemfiles/no_sprockets_shakapacker.gemfile.lock b/gemfiles/shakapacker.gemfile.lock similarity index 100% rename from gemfiles/no_sprockets_shakapacker.gemfile.lock rename to gemfiles/shakapacker.gemfile.lock diff --git a/test/support/sprockets_helpers.rb b/test/support/sprockets_helpers.rb index e7c5dc22e..10846c472 100644 --- a/test/support/sprockets_helpers.rb +++ b/test/support/sprockets_helpers.rb @@ -9,7 +9,7 @@ def available? # We also can't scan for defined?(Sprockets) because this is used to # require Sprockets in the config/application.rb # !!Bundler.locked_gems.specs.find {|gem_spec| gem_spec.name == 'sprockets'} - !ENV.fetch("BUNDLE_GEMFILE", nil).include?("no_sprockets") + ENV.fetch("BUNDLE_GEMFILE", nil).include?("sprockets") end # The block depends on sprockets, don't run it if sprockets is missing From 711791225dbc89a108ee160c6cfc43e498cdb743 Mon Sep 17 00:00:00 2001 From: Judah Meek Date: Thu, 20 Jul 2023 16:07:22 -0500 Subject: [PATCH 2/2] remove action_mailer references --- test/dummy/config/application.rb | 1 - test/dummy/config/environments/development.rb | 3 --- test/dummy/config/environments/test.rb | 5 ----- 3 files changed, 9 deletions(-) diff --git a/test/dummy/config/application.rb b/test/dummy/config/application.rb index 187b6c119..d517d901a 100644 --- a/test/dummy/config/application.rb +++ b/test/dummy/config/application.rb @@ -5,7 +5,6 @@ # Pick the frameworks you want: # require "active_record/railtie" require "action_controller/railtie" -require "action_mailer/railtie" # Test no-sprockets environment by testing the gemfile name require "sprockets/railtie" if SprocketsHelpers.available? diff --git a/test/dummy/config/environments/development.rb b/test/dummy/config/environments/development.rb index fb1aadb46..64c57665c 100644 --- a/test/dummy/config/environments/development.rb +++ b/test/dummy/config/environments/development.rb @@ -15,9 +15,6 @@ config.consider_all_requests_local = true config.action_controller.perform_caching = false - # Don't care if the mailer can't send. - config.action_mailer.raise_delivery_errors = false - # Print deprecation notices to the Rails logger. config.active_support.deprecation = :log end diff --git a/test/dummy/config/environments/test.rb b/test/dummy/config/environments/test.rb index 6ff1487ce..727eadb20 100644 --- a/test/dummy/config/environments/test.rb +++ b/test/dummy/config/environments/test.rb @@ -33,11 +33,6 @@ # Disable request forgery protection in test environment. config.action_controller.allow_forgery_protection = false - # Tell Action Mailer not to deliver emails to the real world. - # The :test delivery method accumulates sent emails in the - # ActionMailer::Base.deliveries array. - config.action_mailer.delivery_method = :test - # Print deprecation notices to the stderr. config.active_support.deprecation = :stderr