Merge branch 'feature/41-multiple-download-links' into develop

geobtaa · Feb 29, 2024 · 096c929 · 096c929
2 parents f9d34ae + afdf105
commit 096c929
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/app/models/document_access.rb b/app/models/document_access.rb
@@ -15,8 +15,9 @@ def self.import(file)
     ::CSV.foreach(file.path, headers: true) do |row|
       logger.debug("CSV Row: #{row.to_hash}")
       document_access = DocumentAccess.find_or_initialize_by(friendlier_id: row[0], institution_code: row[1])
-      document_access.update(row.to_hash)
+      document_access.update!(row.to_hash)
     end
+    true
   end
 
   def self.destroy_all(file)
@@ -25,6 +26,7 @@ def self.destroy_all(file)
       logger.debug("CSV Row: #{row.to_hash}")
       DocumentAccess.destroy_by(id: row[0], friendlier_id: row[1])
     end
+    true
   end
 
   def to_csv

diff --git a/app/models/document_download.rb b/app/models/document_download.rb
@@ -15,8 +15,9 @@ def self.import(file)
     ::CSV.foreach(file.path, headers: true) do |row|
       logger.debug("CSV Row: #{row.to_hash}")
       document_download = DocumentDownload.find_or_initialize_by(friendlier_id: row[0], label: row[1], value: row[2])
-      document_download.update(row.to_hash)
+      document_download.update!(row.to_hash)
     end
+    true
   end
 
   def self.destroy_all(file)
@@ -25,6 +26,7 @@ def self.destroy_all(file)
       logger.debug("CSV Row: #{row.to_hash}")
       DocumentDownload.destroy_by(id: row[0], friendlier_id: row[1])
     end
+    true
   end
 
   def to_csv

diff --git a/geoblacklight_admin.gemspec b/geoblacklight_admin.gemspec
@@ -56,7 +56,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "m", "~> 1.5"
   s.add_development_dependency "minitest", "~> 5.18"
   s.add_development_dependency "minitest-ci", "~> 3.4"
-  s.add_development_dependency "minitest-rails", "~> 6.1"
+  s.add_development_dependency "minitest-rails", "~> 7.0"
   s.add_development_dependency "minitest-reporters", "~> 1.6"
   s.add_development_dependency "rspec-rails", "~> 3.0"
   s.add_development_dependency "selenium-webdriver"