Merge branch 'main' into hyrax-update

app/services/hyrax/thumbnail_path_service_decorator.rb

@@ -10,10 +10,14 @@ def call(object)
       collection_thumbnail = CollectionBrandingInfo.where(collection_id: object.id.to_s, role: "thumbnail").first
       return collection_thumbnail.local_path.gsub(Hyrax.config.branding_path.to_s, '/branding') if collection_thumbnail
 
-      return default_image if object.try(:thumbnail_id).blank?
+      if object.try(:thumbnail_id).blank?
+        return default_collection_image if object.try(:collection?)
+        return default_image
+      end
 
       thumb = fetch_thumbnail(object)
       return default_collection_image unless thumb
+
       return call(thumb) unless thumb.file_set?
       if audio?(thumb)
         audio_image

spec/services/hyrax/thumbnail_path_service_spec.rb

@@ -18,4 +18,26 @@
       end
     end
   end
+
+  describe '.default_collection_image' do
+    context 'when the site has a default collection image' do
+      let(:collection_image) { '/assets/site_default_collection_image.png' }
+      let(:site_instance_double) { instance_double(Site, default_collection_image: double('DefaultCollectionImage', url: collection_image)) }
+
+      before do
+        # Stub Site.instance to return our site_instance_double with the expected url
+        allow(Site).to receive(:instance).and_return(site_instance_double)
+      end
+
+      it 'returns the default collection image from the site' do
+        expect(described_class.default_collection_image).to eq(collection_image)
+      end
+    end
+
+    context 'when the site does not have a default collection image' do
+      it 'returns the Hyrax default collection image' do
+        expect(described_class.default_collection_image).to eq(ActionController::Base.helpers.image_path('default.png'))
+      end
+    end
+  end
 end