Merge pull request #3740 from marcrohloff/fix-rails-61-deprecations

Fix rails 61 deprecations
solidusio · Aug 24, 2020 · 430c621 · 430c621
2 parents 7c1f2e6 + 91dbbc6
commit 430c621
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/core/app/models/spree/taxon.rb b/core/app/models/spree/taxon.rb
@@ -134,7 +134,7 @@ def permalink_part=(value)
 
     def touch_ancestors_and_taxonomy
       # Touches all ancestors at once to avoid recursive taxonomy touch, and reduce queries.
-      self.class.where(id: ancestors.pluck(:id)).update_all(updated_at: Time.current)
+      self.class.default_scoped.where(id: ancestors.pluck(:id)).update_all(updated_at: Time.current)
       # Have taxonomy touch happen in #touch_ancestors_and_taxonomy rather than association option in order for imports to override.
       taxonomy.try!(:touch)
     end

diff --git a/core/lib/spree/testing_support/dummy_app.rb b/core/lib/spree/testing_support/dummy_app.rb
@@ -60,9 +60,8 @@ class Application < ::Rails::Application
     config.active_support.deprecation = :stderr
     config.secret_key_base = 'SECRET_TOKEN'
 
-    unless RAILS_6_OR_ABOVE
-      config.active_record.sqlite3.represent_boolean_as_integer = true
-    end
+    config.action_mailer.delivery_job = "ActionMailer::MailDeliveryJob" if RAILS_6_OR_ABOVE
+    config.active_record.sqlite3.represent_boolean_as_integer = true unless RAILS_6_OR_ABOVE
 
     config.storage_path = Rails.root.join('tmp', 'storage')