tests green locally for rails 6.0

stacytalbot · Dec 25, 2019 · c04fa6f · c04fa6f
2 parents c12e200 + e13ce5d
commit c04fa6f
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/app/models/comfy/cms/file.rb b/app/models/comfy/cms/file.rb
@@ -23,7 +23,12 @@ class Comfy::Cms::File < ActiveRecord::Base
   # -- Callbacks ---------------------------------------------------------------
   before_validation :assign_label, on: :create
   before_create :assign_position
-  after_save :process_attachment
+  # active_storage attachment behavior changed in rails 6 - see PR#892 for details
+  if Rails::VERSION::MAJOR >= 6
+    before_save :process_attachment
+  else
+    after_save :process_attachment
+  end
 
   # -- Validations -------------------------------------------------------------
   validates :label, presence: true

diff --git a/app/models/comfy/cms/fragment.rb b/app/models/comfy/cms/fragment.rb
@@ -11,8 +11,12 @@ class Comfy::Cms::Fragment < ActiveRecord::Base
   attr_reader :files
 
   # -- Callbacks ---------------------------------------------------------------
-  after_save  :remove_attachments,
-              :add_attachments
+  # active_storage attachment behavior changed in rails 6 - see PR#892 for details
+  if Rails::VERSION::MAJOR >= 6
+    before_save :remove_attachments, :add_attachments
+  else
+    after_save :remove_attachments, :add_attachments
+  end
 
   # -- Relationships -----------------------------------------------------------
   belongs_to :record, polymorphic: true, touch: true

diff --git a/test/gemfiles/5.2.gemfile b/test/gemfiles/5.2.gemfile
@@ -13,7 +13,7 @@ group :development, :test do
   gem "puma",               "~> 3.11.2"
   gem "rubocop",            "~> 0.55.0", require: false
   gem "selenium-webdriver", "~> 3.9.0"
-  gem "sqlite3",            "~> 1.3.13"
+  gem "sqlite3",            "~> 1.4"
 end
 
 group :test do