solidus_core 2.7.4 → 2.8.0

data/spec/models/spree/stock/location_sorter/default_first_spec.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+module Spree
+  module Stock
+    module LocationSorter
+      RSpec.describe DefaultFirst, type: :model do
+        subject { described_class.new(stock_locations) }
+
+        let(:stock_locations) { OpenStruct.new(order_default: sorted_stock_locations) }
+        let(:sorted_stock_locations) { instance_double('Spree::StockLocation::ActiveRecord_Relation') }
+
+        it 'returns the default stock location first' do
+          expect(subject.sort).to eq(sorted_stock_locations)
+        end
+      end
+    end
+  end
+end

data/spec/models/spree/stock/location_sorter/unsorted_spec.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+module Spree
+  module Stock
+    module LocationSorter
+      RSpec.describe Unsorted, type: :model do
+        subject { described_class.new(stock_locations) }
+
+        let(:stock_locations) { instance_double('Spree::StockLocation::ActiveRecord_Relation') }
+
+        it 'returns the original stock locations unsorted' do
+          expect(subject.sort).to eq(stock_locations)
+        end
+      end
+    end
+  end
+end

data/spec/models/spree/stock/simple_coordinator_spec.rb

@@ -15,6 +15,16 @@ module Spree
           subject.shipments
         end
 
+        it 'uses the configured stock location sorter' do
+          expect(Spree::Config.stock).to receive(:location_sorter_class).and_call_original
+          subject.shipments
+        end
+
+        it 'uses the pluggable allocator class' do
+          expect(Spree::Config.stock).to receive(:allocator_class).and_call_original
+          subject.shipments
+        end
+
         it 'builds shipments' do
           expect(subject.shipments.size).to eq(1)
         end
@@ -41,6 +51,13 @@ module Spree
         end
       end
 
+      describe "#allocate_inventory" do
+        it 'is deprecated' do
+          expect(Spree::Deprecation).to receive(:warn)
+          subject.send :allocate_inventory, subject.instance_variable_get(:@availability).on_hand_by_stock_location_id
+        end
+      end
+
       # regression spec
       context "when there is one unit that has stock in a stock location that a non-tracked unit has no stock item in" do
         let!(:stock_location_1) { create(:stock_location, propagate_all_variants: false, active: true) }

data/spec/models/spree/store_credit_event_spec.rb

@@ -34,11 +34,11 @@ RSpec.describe Spree::StoreCreditEvent do
     end
   end
 
-  describe "update reason validation" do
+  describe "update store credit reason validation" do
     subject { event.valid? }
 
     context "adjustment event" do
-      context "has an update reason" do
+      context "has a store credit reason" do
         let(:event) { build(:store_credit_adjustment_event) }
 
         it "returns true" do
@@ -46,22 +46,22 @@ RSpec.describe Spree::StoreCreditEvent do
         end
       end
 
-      context "doesn't have an update reason" do
-        let(:event) { build(:store_credit_adjustment_event, update_reason: nil) }
+      context "doesn't have a store credit reason" do
+        let(:event) { build(:store_credit_adjustment_event, store_credit_reason: nil) }
 
         it "returns false" do
           expect(subject).to eq false
         end
 
-        it "adds an error message indicating the update reason is missing" do
+        it "adds an error message indicating the store credit reason is missing" do
           subject
-          expect(event.errors.full_messages).to match ["Update reason can't be blank"]
+          expect(event.errors.full_messages).to match ["Store credit reason can't be blank"]
         end
       end
     end
 
     context "invalidate event" do
-      context "has an update reason" do
+      context "has a store credit reason" do
         let(:event) { build(:store_credit_invalidate_event) }
 
         it "returns true" do
@@ -69,21 +69,21 @@ RSpec.describe Spree::StoreCreditEvent do
         end
       end
 
-      context "doesn't have an update reason" do
-        let(:event) { build(:store_credit_invalidate_event, update_reason: nil) }
+      context "doesn't have a store credit reason" do
+        let(:event) { build(:store_credit_invalidate_event, store_credit_reason: nil) }
 
         it "returns false" do
           expect(subject).to eq false
         end
 
-        it "adds an error message indicating the update reason is missing" do
+        it "adds an error message indicating the store credit reason is missing" do
           subject
-          expect(event.errors.full_messages).to match ["Update reason can't be blank"]
+          expect(event.errors.full_messages).to match ["Store credit reason can't be blank"]
         end
       end
     end
 
-    context "event doesn't require an update reason" do
+    context "event doesn't require a store credit reason" do
       let(:event) { build(:store_credit_auth_event) }
 
       it "returns true" do

data/spec/models/spree/store_credit_spec.rb

@@ -809,7 +809,7 @@ RSpec.describe Spree::StoreCredit do
 
   describe "#update_amount" do
     let(:invalidation_user) { create(:user) }
-    let(:invalidation_reason) { create(:store_credit_update_reason) }
+    let(:invalidation_reason) { create(:store_credit_reason) }
 
     subject { store_credit.update_amount(amount, invalidation_reason, invalidation_user) }
 
@@ -852,7 +852,7 @@ RSpec.describe Spree::StoreCredit do
 
   describe "#invalidate" do
     let(:invalidation_user) { create(:user) }
-    let(:invalidation_reason) { create(:store_credit_update_reason) }
+    let(:invalidation_reason) { create(:store_credit_reason) }
 
     before do
       store_credit.save!

data/spec/models/spree/unit_cancel_spec.rb

@@ -3,7 +3,7 @@
 require 'rails_helper'
 
 RSpec.describe Spree::UnitCancel do
-  let(:unit_cancel) { Spree::UnitCancel.create!(inventory_unit: inventory_unit, reason: Spree::UnitCancel::SHORT_SHIP) }
+  let(:unit_cancel) { described_class.create!(inventory_unit: inventory_unit, reason: described_class::SHORT_SHIP) }
   let(:inventory_unit) { create(:inventory_unit) }
 
   describe '#adjust!' do
@@ -57,5 +57,24 @@ RSpec.describe Spree::UnitCancel do
         expect { subject }.to raise_error RuntimeError, "Adjustable does not match line item"
       end
     end
+
+    context "multiple inventory units" do
+      let(:quantity) { 4 }
+      let(:order) { create(:order_with_line_items, line_items_attributes: [{ quantity: quantity }]) }
+      let(:line_item) { order.line_items.first }
+      let(:inventory_units) { line_item.inventory_units }
+
+      it "has the right amount of inventory units" do
+        expect(inventory_units.size).to eq quantity
+      end
+
+      it "properly creates adjustments for line_item" do
+        inventory_units.each do |inventory_unit|
+          described_class.create!(inventory_unit: inventory_unit, reason: described_class::SHORT_SHIP).adjust!
+          inventory_unit.cancel!
+        end
+        expect(line_item.reload.total.to_d).to eq(0)
+      end
+    end
   end
 end

data/spec/models/spree/variant_spec.rb

@@ -3,6 +3,8 @@
 require 'rails_helper'
 
 RSpec.describe Spree::Variant, type: :model do
+  it { is_expected.to be_invalid }
+
   let!(:variant) { create(:variant) }
 
   it_behaves_like 'default_price'
@@ -22,6 +24,8 @@ RSpec.describe Spree::Variant, type: :model do
       expect(variant).to be_valid
       variant.product = nil
       expect(variant).to be_invalid
+      variant.price = nil
+      expect(variant).to be_invalid
     end
   end
 
@@ -788,30 +792,6 @@ RSpec.describe Spree::Variant, type: :model do
     end
   end
 
-  describe "#display_image" do
-    subject { variant.display_image }
-
-    context "variant has associated images" do
-      let(:attachment) { File.open(File.expand_path('../../fixtures/thinking-cat.jpg', __dir__)) }
-      let(:image_params) { { viewable_id: variant.id, viewable_type: 'Spree::Variant', attachment: attachment, alt: "position 1", position: 1 } }
-      let!(:first_image) { Spree::Image.create(image_params) }
-      let!(:second_image) { image_params.merge(alt: "position 2", position: 2) }
-
-      it "returns the first image" do
-        expect(subject).to eq first_image
-      end
-    end
-
-    context "variant does not have any associated images" do
-      it "returns an image" do
-        expect(subject).to be_a(Spree::Image)
-      end
-      it "returns unpersisted record" do
-        expect(subject).to be_new_record
-      end
-    end
-  end
-
   describe "#variant_properties" do
     let(:option_value_1) { create(:option_value) }
     let(:option_value_2) { create(:option_value) }
@@ -834,4 +814,46 @@ RSpec.describe Spree::Variant, type: :model do
       end
     end
   end
+
+  describe "#gallery" do
+    let(:variant) { build_stubbed(:variant) }
+    subject { variant.gallery }
+
+    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

data/spec/spec_helper.rb

@@ -7,6 +7,7 @@ end
 
 require 'rspec/core'
 
+require 'spree/testing_support/partial_double_verification'
 require 'spree/testing_support/preferences'
 require 'spree/config'
 require 'with_model'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_core
 version: !ruby/object:Gem::Version
-  version: 2.7.4
+  version: 2.8.0
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-23 00:00:00.000000000 Z
+date: 2019-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
@@ -370,11 +370,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".yardopts"
 - LICENSE
 - README.md
 - Rakefile
 - app/assets/config/solidus_core_manifest.js
+- app/assets/images/logo/solidus.svg
 - app/assets/images/logo/solidus_logo.png
 - app/assets/images/noimage/large.png
 - app/assets/images/noimage/mini.png
@@ -439,6 +439,8 @@ files:
 - app/models/spree/distributed_amounts_handler.rb
 - app/models/spree/exchange.rb
 - app/models/spree/fulfilment_changer.rb
+- app/models/spree/gallery/product_gallery.rb
+- app/models/spree/gallery/variant_gallery.rb
 - app/models/spree/gateway.rb
 - app/models/spree/gateway/bogus.rb
 - app/models/spree/gateway/bogus_simple.rb
@@ -560,13 +562,19 @@ files:
 - app/models/spree/shipping_rate_tax.rb
 - app/models/spree/state.rb
 - app/models/spree/state_change.rb
+- app/models/spree/stock/allocator/base.rb
+- app/models/spree/stock/allocator/on_hand_first.rb
 - app/models/spree/stock/availability.rb
 - app/models/spree/stock/availability_validator.rb
 - app/models/spree/stock/content_item.rb
 - app/models/spree/stock/differentiator.rb
 - app/models/spree/stock/estimator.rb
 - app/models/spree/stock/inventory_unit_builder.rb
+- app/models/spree/stock/inventory_units_finalizer.rb
 - app/models/spree/stock/inventory_validator.rb
+- app/models/spree/stock/location_sorter/base.rb
+- app/models/spree/stock/location_sorter/default_first.rb
+- app/models/spree/stock/location_sorter/unsorted.rb
 - app/models/spree/stock/package.rb
 - app/models/spree/stock/quantifier.rb
 - app/models/spree/stock/shipping_rate_selector.rb
@@ -585,8 +593,8 @@ files:
 - app/models/spree/store_credit.rb
 - app/models/spree/store_credit_category.rb
 - app/models/spree/store_credit_event.rb
+- app/models/spree/store_credit_reason.rb
 - app/models/spree/store_credit_type.rb
-- app/models/spree/store_credit_update_reason.rb
 - app/models/spree/store_payment_method.rb
 - app/models/spree/store_selector/by_server_name.rb
 - app/models/spree/store_selector/legacy.rb
@@ -643,6 +651,7 @@ files:
 - app/views/spree/test_mailer/test_email.text.erb
 - config/initializers/assets.rb
 - config/initializers/friendly_id.rb
+- config/initializers/money.rb
 - config/locales/en.yml
 - db/default/spree/countries.rb
 - db/default/spree/refund_reasons.rb
@@ -676,6 +685,8 @@ files:
 - db/migrate/20180313220213_add_available_locales_to_stores.rb
 - db/migrate/20180322142651_add_amount_remaining_to_store_credit_events.rb
 - db/migrate/20180328172631_add_join_characters_to_promotion_code_batch.rb
+- db/migrate/20180710170104_create_spree_store_credit_reasons_table.rb
+- db/migrate/20190106184413_remove_code_from_spree_promotions.rb
 - db/seeds.rb
 - lib/generators/spree/custom_user/custom_user_generator.rb
 - lib/generators/spree/custom_user/templates/authentication_helpers.rb.tt
@@ -693,6 +704,7 @@ files:
 - lib/generators/spree/install/templates/vendor/assets/javascripts/spree/frontend/all.js
 - lib/generators/spree/install/templates/vendor/assets/stylesheets/spree/backend/all.css
 - lib/generators/spree/install/templates/vendor/assets/stylesheets/spree/frontend/all.css
+- lib/solidus/migrations/promotions_with_code_handlers.rb
 - lib/solidus/migrations/rename_gateways.rb
 - lib/solidus_core.rb
 - lib/spree/app_configuration.rb
@@ -747,7 +759,6 @@ files:
 - lib/spree/permission_sets/product_management.rb
 - lib/spree/permission_sets/promotion_display.rb
 - lib/spree/permission_sets/promotion_management.rb
-- lib/spree/permission_sets/report_display.rb
 - lib/spree/permission_sets/restricted_stock_display.rb
 - lib/spree/permission_sets/restricted_stock_management.rb
 - lib/spree/permission_sets/stock_display.rb
@@ -828,8 +839,8 @@ files:
 - lib/spree/testing_support/factories/store_credit_category_factory.rb
 - lib/spree/testing_support/factories/store_credit_event_factory.rb
 - lib/spree/testing_support/factories/store_credit_factory.rb
+- lib/spree/testing_support/factories/store_credit_reason_factory.rb
 - lib/spree/testing_support/factories/store_credit_type_factory.rb
-- lib/spree/testing_support/factories/store_credit_update_reason_factory.rb
 - lib/spree/testing_support/factories/store_factory.rb
 - lib/spree/testing_support/factories/tax_category_factory.rb
 - lib/spree/testing_support/factories/tax_rate_factory.rb
@@ -843,8 +854,10 @@ files:
 - lib/spree/testing_support/factories/zone_factory.rb
 - lib/spree/testing_support/flash.rb
 - lib/spree/testing_support/order_walkthrough.rb
+- lib/spree/testing_support/partial_double_verification.rb
 - lib/spree/testing_support/preferences.rb
 - lib/spree/testing_support/sequences.rb
+- lib/spree/testing_support/shared_examples/gallery.rb
 - lib/spree/testing_support/url_helpers.rb
 - lib/spree_core.rb
 - lib/tasks/core.rake
@@ -923,8 +936,8 @@ files:
 - spec/lib/spree/core/testing_support/factories/store_credit_category_factory_spec.rb
 - spec/lib/spree/core/testing_support/factories/store_credit_event_factory_spec.rb
 - spec/lib/spree/core/testing_support/factories/store_credit_factory_spec.rb
+- spec/lib/spree/core/testing_support/factories/store_credit_reason_factory_spec.rb
 - spec/lib/spree/core/testing_support/factories/store_credit_type_factory_spec.rb
-- spec/lib/spree/core/testing_support/factories/store_credit_update_reason_factory_spec.rb
 - spec/lib/spree/core/testing_support/factories/store_factory_spec.rb
 - spec/lib/spree/core/testing_support/factories/tax_category_factory_spec.rb
 - spec/lib/spree/core/testing_support/factories/tax_rate_factory_spec.rb
@@ -951,6 +964,7 @@ files:
 - spec/mailers/promotion_code_batch_mailer_spec.rb
 - spec/mailers/reimbursement_mailer_spec.rb
 - spec/mailers/test_mailer_spec.rb
+- spec/migrate/20190106184413_remove_code_from_spree_promotions_spec.rb
 - spec/models/spree/ability_spec.rb
 - spec/models/spree/address_spec.rb
 - spec/models/spree/adjustment_reason_spec.rb
@@ -987,6 +1001,8 @@ files:
 - spec/models/spree/distributed_amounts_handler_spec.rb
 - spec/models/spree/exchange_spec.rb
 - spec/models/spree/fulfilment_changer_spec.rb
+- spec/models/spree/gallery/product_gallery_spec.rb
+- spec/models/spree/gallery/variant_gallery_spec.rb
 - spec/models/spree/gateway/bogus_simple.rb
 - spec/models/spree/gateway/bogus_spec.rb
 - spec/models/spree/gateway_spec.rb
@@ -1039,7 +1055,6 @@ files:
 - spec/models/spree/permission_sets/product_management_spec.rb
 - spec/models/spree/permission_sets/promotion_display_spec.rb
 - spec/models/spree/permission_sets/promotion_management_spec.rb
-- spec/models/spree/permission_sets/report_display_spec.rb
 - spec/models/spree/permission_sets/restricted_stock_display_spec.rb
 - spec/models/spree/permission_sets/restricted_stock_management_spec.rb
 - spec/models/spree/permission_sets/stock_display_spec.rb
@@ -1115,11 +1130,16 @@ files:
 - spec/models/spree/shipping_rate_spec.rb
 - spec/models/spree/shipping_rate_tax_spec.rb
 - spec/models/spree/state_spec.rb
+- spec/models/spree/stock/allocator/on_hand_first_spec.rb
 - spec/models/spree/stock/availability_spec.rb
 - spec/models/spree/stock/availability_validator_spec.rb
+- spec/models/spree/stock/content_item_spec.rb
 - spec/models/spree/stock/differentiator_spec.rb
 - spec/models/spree/stock/estimator_spec.rb
 - spec/models/spree/stock/inventory_unit_builder_spec.rb
+- spec/models/spree/stock/inventory_units_finalizer_spec.rb
+- spec/models/spree/stock/location_sorter/default_first_spec.rb
+- spec/models/spree/stock/location_sorter/unsorted_spec.rb
 - spec/models/spree/stock/package_spec.rb
 - spec/models/spree/stock/quantifier_spec.rb
 - spec/models/spree/stock/shipping_rate_selector_spec.rb
@@ -1194,7 +1214,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.8.23
 requirements: []
-rubygems_version: 3.0.6
+rubyforge_project: 
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Essential models, mailers, and classes for the Solidus e-commerce project.