Merge pull request #3824 from mamhoff/move-file-fixtures-to-gem

Move "thinking cat" fixture to lib folder

api/lib/spree/api/testing_support/helpers.rb

@@ -34,7 +34,16 @@ def current_api_user
         end
 
         def image(filename)
-          File.open(Spree::Api::Engine.root + "spec/fixtures" + filename)
+          File.open(
+            File.join(
+              Spree::Core::Engine.root,
+              "lib",
+              "spree",
+              "testing_support",
+              "fixtures",
+              filename
+            )
+          )
         end
 
         def upload_image(filename)

api/spec/requests/spree/api/images_controller_spec.rb

@@ -22,7 +22,7 @@ module Spree
         expect do
           post spree.api_product_images_path(product.id), params: {
             image: {
-              attachment: upload_image('thinking-cat.jpg'),
+              attachment: upload_image('blank.jpg'),
               viewable_type: 'Spree::Variant',
               viewable_id: product.master.to_param
             },
@@ -33,7 +33,7 @@ module Spree
       end
 
       context "working with an existing product image" do
-        let!(:product_image) { product.master.images.create!(attachment: image('thinking-cat.jpg')) }
+        let!(:product_image) { product.master.images.create!(attachment: image('blank.jpg')) }
 
         it "can get a single product image" do
           get spree.api_product_image_path(product.id, product_image)
@@ -77,7 +77,7 @@ module Spree
       end
 
       context 'when image belongs to another product' do
-        let!(:product_image) { another_product.master.images.create!(attachment: image('thinking-cat.jpg')) }
+        let!(:product_image) { another_product.master.images.create!(attachment: image("blank.jpg")) }
         let(:another_product) { create(:product) }
 
         it "cannot get an image of another product" do
@@ -102,7 +102,7 @@ module Spree
     end
 
     context "as a non-admin" do
-      let(:product_image) { product.master.images.create!(attachment: image('thinking-cat.jpg')) }
+      let(:product_image) { product.master.images.create!(attachment: image("blank.jpg")) }
 
       it "cannot create an image" do
         post spree.api_product_images_path(product.id)

api/spec/requests/spree/api/orders_controller_spec.rb

@@ -646,7 +646,7 @@ module Spree
         end
 
         it "can list its line items with images" do
-          order.line_items.first.variant.images.create!(attachment: image("thinking-cat.jpg"))
+          order.line_items.first.variant.images.create!(attachment: image("blank.jpg"))
 
           get spree.api_order_path(order)
 

api/spec/requests/spree/api/products_controller_spec.rb

@@ -125,9 +125,9 @@ module Spree
       end
 
       it "gets a single product" do
-        product.master.images.create!(attachment: image("thinking-cat.jpg"))
+        product.master.images.create!(attachment: image("blank.jpg"))
         product.variants.create!
-        product.variants.first.images.create!(attachment: image("thinking-cat.jpg"))
+        product.variants.first.images.create!(attachment: image("blank.jpg"))
         product.set_property("spree", "rocks")
         product.taxons << create(:taxon)
 

api/spec/requests/spree/api/variants_controller_spec.rb

@@ -55,7 +55,7 @@ module Spree
       end
 
       it "variants returned contain images data" do
-        variant.images.create!(attachment: image("thinking-cat.jpg"))
+        variant.images.create!(attachment: image("blank.jpg"))
 
         get spree.api_variants_path
 
@@ -210,7 +210,7 @@ module Spree
       end
 
       it "can see a single variant with images" do
-        variant.images.create!(attachment: image("thinking-cat.jpg"))
+        variant.images.create!(attachment: image("blank.jpg"))
 
         subject
 

core/lib/spree/testing_support/factories/image_factory.rb

@@ -2,6 +2,6 @@
 
 FactoryBot.define do
   factory :image, class: 'Spree::Image' do
-    attachment { Spree::Core::Engine.root.join('spec', 'fixtures', 'thinking-cat.jpg').open }
+    attachment { Spree::Core::Engine.root.join('lib', 'spree', 'testing_support', 'fixtures', 'blank.jpg').open }
   end
 end

core/lib/spree/testing_support/factories/taxon_factory.rb

@@ -9,7 +9,7 @@
     parent_id { nil }
 
     trait :with_icon do
-      icon { Spree::Core::Engine.root.join('spec', 'fixtures', 'thinking-cat.jpg').open }
+      icon { Spree::Core::Engine.root.join('lib', 'spree', 'testing_support', 'fixtures', 'blank.jpg').open }
     end
   end
 end

core/spec/models/spree/image_spec.rb

@@ -10,27 +10,27 @@
   end
 
   describe 'attachment details' do
-    let(:image_file) { File.open(File.join('spec', 'fixtures', 'thinking-cat.jpg')) }
+    let(:image_file) { File.open(File.join('lib', 'spree', 'testing_support', 'fixtures', 'blank.jpg')) }
     subject { create(:image, attachment: image_file) }
 
     it 'returns if attachment is present' do
       expect(subject.attachment_present?).to be_truthy
     end
 
     it 'returns attachment filename' do
-      expect(subject.filename).to end_with('thinking-cat.jpg')
+      expect(subject.filename).to end_with('blank.jpg')
     end
 
     it 'returns attachment url' do
-      expect(subject.url(:product)).to include('thinking-cat.jpg')
+      expect(subject.url(:product)).to include('blank.jpg')
     end
 
     it 'computes attachment width' do
-      expect(subject.attachment_width).to eq(489)
+      expect(subject.attachment_width).to eq(1)
     end
 
     it 'computes attachment height' do
-      expect(subject.attachment_height).to eq(490)
+      expect(subject.attachment_height).to eq(1)
     end
   end
 end

core/spec/models/spree/product_duplicator_spec.rb

@@ -7,7 +7,7 @@ module Spree
     let(:product) { create(:product, properties: [create(:property, name: "MyProperty")]) }
     let!(:duplicator) { Spree::ProductDuplicator.new(product) }
 
-    let(:image) { File.open(File.expand_path('../../fixtures/thinking-cat.jpg', __dir__)) }
+    let(:image) { File.open(Spree::Core::Engine.root.join('lib', 'spree', 'testing_support', 'fixtures', 'blank.jpg')) }
     let(:params) { { viewable_id: product.master.id, viewable_type: 'Spree::Variant', attachment: image, alt: "position 1", position: 1 } }
 
     before do

core/spec/models/spree/product_spec.rb

@@ -537,7 +537,7 @@ class Extension < Spree::Base
 
   context "#images" do
     let(:product) { create(:product) }
-    let(:image) { File.open(File.expand_path('../../fixtures/thinking-cat.jpg', __dir__)) }
+    let(:image) { File.open(Spree::Core::Engine.root.join('lib', 'spree', 'testing_support', 'fixtures', 'blank.jpg')) }
     let(:params) { { viewable_id: product.master.id, viewable_type: 'Spree::Variant', attachment: image, alt: "position 2", position: 2 } }
 
     before do

core/spec/support/shared_examples/attachment.rb

@@ -5,7 +5,7 @@
     before do
       subject.send(
         :"#{attachment_name}=",
-        File.open(File.join('spec', 'fixtures', 'thinking-cat.jpg'))
+        File.open(File.join('lib', 'spree', 'testing_support', 'fixtures', 'blank.jpg'))
       )
     end
 

frontend/spec/features/products_spec.rb

@@ -154,7 +154,9 @@
 
     before do
       # Need to have two images to trigger the error
-      image = File.open(File.expand_path('../fixtures/thinking-cat.jpg', __dir__))
+      image = File.open(
+        File.join(Spree::Core::Engine.root, "lib", "spree", "testing_support", "fixtures", "blank.jpg")
+      )
       product.images.create!(attachment: image)
       product.images.create!(attachment: image)
 
@@ -184,7 +186,9 @@
     let(:product) { Spree::Product.find_by(name: "Ruby on Rails Baseball Jersey") }
 
     before do
-      image = File.open(File.expand_path('../fixtures/thinking-cat.jpg', __dir__))
+      image = File.open(
+        File.join(Spree::Core::Engine.root, "lib", "spree", "testing_support", "fixtures", "blank.jpg")
+      )
       v1 = product.variants.create!(price: 9.99)
       v2 = product.variants.create!(price: 10.99)
       v1.images.create!(attachment: image)
@@ -193,7 +197,7 @@
 
     it "should not display no image available" do
       visit spree.root_path
-      expect(page).to have_xpath("//img[contains(@src,'thinking-cat')]")
+      expect(page).to have_xpath("//img[contains(@src,'blank')]")
     end
   end