Fix missing image in autocomplete variant

core/app/models/spree/gallery/variant_gallery.rb

@@ -11,7 +11,10 @@ def initialize(variant)
       #
       # @return [Enumerable<Spree::Image>] all images in the gallery
       def images
-        @images ||= @variant.images
+        @images ||=
+          @variant.images.presence ||
+          (!@variant.is_master? && @variant.product.master.images).presence ||
+          Spree::Image.none
       end
     end
   end

core/spec/models/spree/gallery/variant_gallery_spec.rb

@@ -5,7 +5,7 @@
 
 RSpec.describe Spree::Gallery::VariantGallery do
   let(:gallery) { described_class.new(variant) }
-  let(:variant) { Spree::Variant.new }
+  let(:variant) { build_stubbed(:variant) }
 
   shared_context 'has multiple images' do
     let(:first_image) { build(:image) }

core/spec/models/spree/variant_spec.rb

@@ -811,12 +811,45 @@
     end
   end
 
-  describe '#gallery' do
-    let(:product) { Spree::Variant.new }
-    subject { product.gallery }
+  describe "#gallery" do
+    let(:variant) { build_stubbed(:variant) }
+    subject { variant.gallery }
 
-    it 'responds to #images' do
+    it "responds to #images" do
       expect(subject).to respond_to(:images)
     end
+
+    context "when variant.images is empty" do
+      let(:product) { create(:product) }
+      let(:variant) { create(:variant, product: product) }
+
+      it "fallbacks to variant.product.master.images" do
+        product.master.images = [create(:image)]
+
+        expect(product.master).not_to eq variant
+
+        expect(variant.gallery.images).to eq product.master.images
+      end
+
+      context "and variant.product.master.images is also empty" do
+        it "returns Spree::Image.none" do
+          expect(product.master).not_to eq variant
+          expect(product.master.images.presence).to be nil
+
+          expect(variant.gallery.images).to eq Spree::Image.none
+        end
+      end
+
+      context "and is master" do
+        it "returns Spree::Image.none" do
+          variant = product.master
+
+          expect(variant.is_master?).to be true
+          expect(variant.images.presence).to be nil
+
+          expect(variant.gallery.images).to eq Spree::Image.none
+        end
+      end
+    end
   end
 end