solidus_core 1.1.4 → 1.2.0.beta1

data/spec/models/spree/permission_sets/restricted_stock_transfer_management_spec.rb

@@ -58,22 +58,70 @@ describe Spree::PermissionSets::RestrictedStockTransferManagement do
       it { is_expected.to be_able_to(:transfer_from, source_location) }
       it { is_expected.to be_able_to(:transfer_to, source_location) }
 
-      it { is_expected.not_to be_able_to(:transfer_from, destination_location) }
-      it { is_expected.not_to be_able_to(:transfer_to, destination_location) }
+      it { is_expected.to_not be_able_to(:transfer_from, destination_location) }
+      it { is_expected.to_not be_able_to(:transfer_to, destination_location) }
 
       it { is_expected.to be_able_to(:display, transfer_with_source) }
       it { is_expected.to be_able_to(:display, transfer_with_source_and_destination) }
-      it { is_expected.not_to be_able_to(:display, transfer_with_destination) }
+      it { is_expected.to_not be_able_to(:display, transfer_with_destination) }
 
       it { is_expected.to be_able_to(:manage, transfer_with_source) }
-      it { is_expected.not_to be_able_to(:manage, transfer_with_destination) }
-      it { is_expected.not_to be_able_to(:manage, transfer_with_source_and_destination) }
+      it { is_expected.to be_able_to(:manage, transfer_with_source_and_destination) }
+      it { is_expected.to_not be_able_to(:manage, transfer_with_destination) }
 
       it { is_expected.to be_able_to(:manage, source_transfer_item) }
-      it { is_expected.not_to be_able_to(:manage, destination_transfer_item) }
-      it { is_expected.not_to be_able_to(:manage, source_and_destination_transfer_item) }
+      it { is_expected.to be_able_to(:manage, source_and_destination_transfer_item) }
+      it { is_expected.to_not be_able_to(:manage, destination_transfer_item) }
+
+      context "stock transfer has been shipped" do
+        before do
+          transfer_with_source_and_destination.update_attributes!(shipped_at: Time.current)
+          described_class.new(ability).activate!
+        end
+
+        it { is_expected.to_not be_able_to(:manage, transfer_with_source_and_destination) }
+        it { is_expected.to_not be_able_to(:manage, source_and_destination_transfer_item) }
+      end
     end
 
+    context "when the user is only associated with the destination location" do
+      let(:stock_locations) {[destination_location]}
+
+      it { is_expected.to be_able_to(:display, destination_location) }
+      it { is_expected.to_not be_able_to(:display, source_location) }
+
+      it { is_expected.to be_able_to(:display, Spree::StockTransfer) }
+      it { is_expected.to be_able_to(:admin, Spree::StockTransfer) }
+      it { is_expected.to be_able_to(:create, Spree::StockTransfer) }
+
+      it { is_expected.to_not be_able_to(:transfer_from, source_location) }
+      it { is_expected.to_not be_able_to(:transfer_to, source_location) }
+
+      it { is_expected.to be_able_to(:transfer_from, destination_location) }
+      it { is_expected.to be_able_to(:transfer_to, destination_location) }
+
+      it { is_expected.to be_able_to(:display, transfer_with_destination) }
+      it { is_expected.to_not be_able_to(:display, transfer_with_source) }
+      it { is_expected.to_not be_able_to(:display, transfer_with_source_and_destination) }
+
+      it { is_expected.to be_able_to(:manage, transfer_with_destination) }
+      it { is_expected.to_not be_able_to(:manage, transfer_with_source) }
+      it { is_expected.to_not be_able_to(:manage, transfer_with_source_and_destination) }
+
+      it { is_expected.to be_able_to(:manage, destination_transfer_item) }
+      it { is_expected.to_not be_able_to(:manage, source_transfer_item) }
+      it { is_expected.to_not be_able_to(:manage, source_and_destination_transfer_item) }
+
+      context "stock transfer has been shipped" do
+        before do
+          transfer_with_source_and_destination.update_attributes!(shipped_at: Time.current)
+          described_class.new(ability).activate!
+        end
+
+        it { is_expected.to be_able_to(:manage, transfer_with_source_and_destination) }
+        it { is_expected.to be_able_to(:manage, source_and_destination_transfer_item) }
+      end
+    end
 
     context "when the user is associated with both locations" do
       let(:stock_locations) {[source_location, destination_location]}
@@ -102,6 +150,16 @@ describe Spree::PermissionSets::RestrictedStockTransferManagement do
       it { is_expected.to be_able_to(:manage, source_transfer_item) }
       it { is_expected.to be_able_to(:manage, destination_transfer_item) }
       it { is_expected.to be_able_to(:manage, source_and_destination_transfer_item) }
+
+      context "stock transfer has been shipped" do
+        before do
+          transfer_with_source_and_destination.update_attributes!(shipped_at: Time.current)
+          described_class.new(ability).activate!
+        end
+
+        it { is_expected.to be_able_to(:manage, transfer_with_source_and_destination) }
+        it { is_expected.to be_able_to(:manage, source_and_destination_transfer_item) }
+      end
     end
 
     context "when the user is associated with neither location" do
@@ -110,51 +168,51 @@ describe Spree::PermissionSets::RestrictedStockTransferManagement do
       it { is_expected.to_not be_able_to(:display, source_location) }
       it { is_expected.to_not be_able_to(:display, destination_location) }
 
-      it { is_expected.not_to be_able_to(:display, Spree::StockTransfer) }
-      it { is_expected.not_to be_able_to(:admin, Spree::StockTransfer) }
-      it { is_expected.not_to be_able_to(:create, Spree::StockTransfer) }
+      it { is_expected.to_not be_able_to(:display, Spree::StockTransfer) }
+      it { is_expected.to_not be_able_to(:admin, Spree::StockTransfer) }
+      it { is_expected.to_not be_able_to(:create, Spree::StockTransfer) }
 
-      it { is_expected.not_to be_able_to(:transfer_from, source_location) }
-      it { is_expected.not_to be_able_to(:transfer_to, source_location) }
+      it { is_expected.to_not be_able_to(:transfer_from, source_location) }
+      it { is_expected.to_not be_able_to(:transfer_to, source_location) }
 
-      it { is_expected.not_to be_able_to(:transfer_from, destination_location) }
-      it { is_expected.not_to be_able_to(:transfer_to, destination_location) }
+      it { is_expected.to_not be_able_to(:transfer_from, destination_location) }
+      it { is_expected.to_not be_able_to(:transfer_to, destination_location) }
 
-      it { is_expected.not_to be_able_to(:manage, transfer_with_source) }
-      it { is_expected.not_to be_able_to(:manage, transfer_with_destination) }
-      it { is_expected.not_to be_able_to(:manage, transfer_with_source_and_destination) }
+      it { is_expected.to_not be_able_to(:manage, transfer_with_source) }
+      it { is_expected.to_not be_able_to(:manage, transfer_with_destination) }
+      it { is_expected.to_not be_able_to(:manage, transfer_with_source_and_destination) }
 
-      it { is_expected.not_to be_able_to(:manage, source_transfer_item) }
-      it { is_expected.not_to be_able_to(:manage, destination_transfer_item) }
-      it { is_expected.not_to be_able_to(:manage, source_and_destination_transfer_item) }
+      it { is_expected.to_not be_able_to(:manage, source_transfer_item) }
+      it { is_expected.to_not be_able_to(:manage, destination_transfer_item) }
+      it { is_expected.to_not be_able_to(:manage, source_and_destination_transfer_item) }
     end
   end
 
   context "when not activated" do
     let(:user) { create :user }
 
-    it { is_expected.not_to be_able_to(:display, Spree::StockTransfer) }
-    it { is_expected.not_to be_able_to(:admin, Spree::StockTransfer) }
-    it { is_expected.not_to be_able_to(:create, Spree::StockTransfer) }
+    it { is_expected.to_not be_able_to(:display, Spree::StockTransfer) }
+    it { is_expected.to_not be_able_to(:admin, Spree::StockTransfer) }
+    it { is_expected.to_not be_able_to(:create, Spree::StockTransfer) }
 
     it { is_expected.to_not be_able_to(:display, source_location) }
     it { is_expected.to_not be_able_to(:display, destination_location) }
 
-    it { is_expected.not_to be_able_to(:transfer_from, source_location) }
-    it { is_expected.not_to be_able_to(:transfer_to, source_location) }
+    it { is_expected.to_not be_able_to(:transfer_from, source_location) }
+    it { is_expected.to_not be_able_to(:transfer_to, source_location) }
 
-    it { is_expected.not_to be_able_to(:transfer_from, destination_location) }
-    it { is_expected.not_to be_able_to(:transfer_to, destination_location) }
+    it { is_expected.to_not be_able_to(:transfer_from, destination_location) }
+    it { is_expected.to_not be_able_to(:transfer_to, destination_location) }
 
     it { is_expected.to_not be_able_to(:display, source_location) }
     it { is_expected.to_not be_able_to(:display, destination_location) }
 
-    it { is_expected.not_to be_able_to(:manage, transfer_with_source) }
-    it { is_expected.not_to be_able_to(:manage, transfer_with_destination) }
-    it { is_expected.not_to be_able_to(:manage, transfer_with_source_and_destination) }
+    it { is_expected.to_not be_able_to(:manage, transfer_with_source) }
+    it { is_expected.to_not be_able_to(:manage, transfer_with_destination) }
+    it { is_expected.to_not be_able_to(:manage, transfer_with_source_and_destination) }
 
-    it { is_expected.not_to be_able_to(:manage, source_transfer_item) }
-    it { is_expected.not_to be_able_to(:manage, destination_transfer_item) }
-    it { is_expected.not_to be_able_to(:manage, source_and_destination_transfer_item) }
+    it { is_expected.to_not be_able_to(:manage, source_transfer_item) }
+    it { is_expected.to_not be_able_to(:manage, destination_transfer_item) }
+    it { is_expected.to_not be_able_to(:manage, source_and_destination_transfer_item) }
   end
 end

data/spec/models/spree/product_filter_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 require 'spree/core/product_filters'
 
 describe 'product filters', :type => :model do
-  # Regression test for #1709
+  # Regression test for https://github.com/spree/spree/issues/1709
   context 'finds products filtered by brand' do
     let(:product) { create(:product) }
     before do
@@ -11,7 +11,7 @@ describe 'product filters', :type => :model do
     end
 
     it "does not attempt to call value method on Arel::Table" do
-      expect { Spree::Core::ProductFilters.brand_filter }.not_to raise_error
+      Spree::Core::ProductFilters.brand_filter
     end
 
     it "can find products in the 'Nike' brand" do
@@ -20,7 +20,7 @@ describe 'product filters', :type => :model do
     it "sorts products without brand specified" do
       product.set_property("brand", "Nike")
       create(:product).set_property("brand", nil)
-      expect { Spree::Core::ProductFilters.brand_filter[:labels] }.not_to raise_error
+      Spree::Core::ProductFilters.brand_filter[:labels]
     end
   end
 end

data/spec/models/spree/product_spec.rb

@@ -38,16 +38,58 @@ describe Spree::Product, :type => :model do
       end
     end
 
-    context "master variant" do
+    describe "#save" do
+      before { product.update_columns(updated_at: 1.day.ago) }
+      subject { product.save! }
+
+      shared_examples "a change occurred" do
+        it "should change updated_at" do
+          expect { subject }.to change{ product.updated_at }
+        end
+
+        it "should touch taxons" do
+          taxon = create(:taxon, products: [product])
+          taxon.update_columns(updated_at: 1.day.ago)
+          product.taxons.reload
+          expect { subject }.to change{ taxon.reload.updated_at }
+        end
+      end
+
+      shared_examples "no change occurred" do
+        it "should not change updated_at" do
+          expect { subject }.not_to change{ product.updated_at }
+        end
+
+        it "should not touch taxons" do
+          taxon = create(:taxon, products: [product])
+          taxon.update_columns(updated_at: 1.day.ago)
+          product.taxons.reload
+          expect { subject }.not_to change{ taxon.reload.updated_at }
+        end
+      end
+
+      context "when nothing has changed" do
+        it_behaves_like "no change occurred"
+      end
+
+      context "when the product itself was changed" do
+        before do
+          product.name = "Perri-air"
+        end
+
+        it_behaves_like "a change occurred"
+      end
 
       context "when master variant changed" do
         before do
           product.master.sku = "Something changed"
         end
 
+        it_behaves_like "a change occurred"
+
         it "saves the master" do
-          expect(product.master).to receive(:save!)
-          product.save
+          product.save!
+          expect(product.reload.master.sku).to eq "Something changed"
         end
       end
 
@@ -59,21 +101,11 @@ describe Spree::Product, :type => :model do
           product.master.default_price.price = 12
         end
 
-        it "saves the master" do
-          expect(product.master).to receive(:save!)
-          product.save
-        end
+        it_behaves_like "a change occurred"
 
-        it "saves the default price" do
-          expect(product.master.default_price).to receive(:save)
-          product.save
-        end
-      end
-
-      context "when master variant and price haven't changed" do
-        it "does not save the master" do
-          expect(product.master).not_to receive(:save!)
-          product.save
+        it "saves the default_price" do
+          product.save!
+          expect(product.reload.master.default_price.price).to eq 12
         end
       end
     end
@@ -103,7 +135,7 @@ describe Spree::Product, :type => :model do
     end
 
     context "#price" do
-      # Regression test for #1173
+      # Regression test for https://github.com/spree/spree/issues/1173
       it 'strips non-price characters' do
         product.price = "$10"
         expect(product.price).to eq(10.0)
@@ -232,11 +264,11 @@ describe Spree::Product, :type => :model do
 
       it "doesnt raise ReadOnlyRecord error" do
         Spree::StockMovement.create!(stock_item: stock_item, quantity: 1)
-        expect { product.destroy }.not_to raise_error
+        product.destroy
       end
     end
 
-    # Regression test for #3737
+    # Regression test for https://github.com/spree/spree/issues/3737
     context "has stock items" do
       let(:product) { create(:product) }
       it "can retrieve stock items" do
@@ -328,7 +360,7 @@ describe Spree::Product, :type => :model do
       }.to change { product.properties.length }.by(1)
     end
 
-    # Regression test for #2455
+    # Regression test for https://github.com/spree/spree/issues/2455
     it "should not overwrite properties' presentation names" do
       Spree::Property.where(:name => 'foo').first_or_create!(:presentation => "Foo's Presentation Name")
       product.set_property('foo', 'value1')
@@ -337,7 +369,7 @@ describe Spree::Product, :type => :model do
       expect(Spree::Property.where(:name => 'bar').first.presentation).to eq("bar")
     end
 
-    # Regression test for #4416
+    # Regression test for https://github.com/spree/spree/issues/4416
     context "#possible_promotions" do
       let!(:promotion) do
         create(:promotion, advertise: true, starts_at: 1.day.ago)
@@ -450,7 +482,7 @@ describe Spree::Product, :type => :model do
     end
   end
 
-  # Regression tests for #2352
+  # Regression tests for https://github.com/spree/spree/issues/2352
   context "classifications and taxons" do
     it "is joined through classifications" do
       reflection = Spree::Product.reflect_on_association(:taxons)
@@ -497,8 +529,30 @@ describe Spree::Product, :type => :model do
     it { is_expected.to be_invalid }
   end
 
-  it "initializes a master variant when building a product" do
-    product = Spree::Product.new
-    expect(product.master.is_master).to be true
+  describe '.new' do
+    let(:product) { Spree::Product.new(attributes) }
+
+    shared_examples "new product with master" do
+      it "initializes master correctly" do
+        expect(product.master.is_master).to be true
+        expect(product.master.product).to be product
+      end
+    end
+
+    context 'no attributes' do
+      let(:attributes) { {} }
+      it_behaves_like "new product with master"
+    end
+
+    context 'initializing with variant attributes' do
+      let(:attributes) { {sku: 'FOO'} }
+
+      it_behaves_like "new product with master"
+
+      it "initializes the variant with the correct attributes" do
+        expect(product.master.sku).to eq 'FOO'
+        expect(product.sku).to eq 'FOO'
+      end
+    end
   end
 end

data/spec/models/spree/promotion/actions/create_adjustment_spec.rb

@@ -14,7 +14,7 @@ describe Spree::Promotion::Actions::CreateAdjustment, :type => :model do
       allow(action).to receive_messages(:promotion => promotion)
     end
 
-    # Regression test for #3966
+    # Regression test for https://github.com/spree/spree/issues/3966
     it "does not apply an adjustment if the amount is 0" do
       action.calculator.preferred_amount = 0
       action.perform(payload)

data/spec/models/spree/promotion/actions/create_item_adjustments_spec.rb

@@ -16,7 +16,7 @@ module Spree
         end
 
         context "#perform" do
-          # Regression test for #3966
+          # Regression test for https://github.com/spree/spree/issues/3966
           context "when calculator computes 0" do
             before do
               allow(action).to receive_messages :compute_amount => 0
@@ -143,7 +143,7 @@ module Spree
           end
 
           it "nullifies adjustments for completed orders" do
-            order = Order.create(completed_at: Time.now)
+            order = Order.create(completed_at: Time.current)
             adjustment = action.adjustments.create!(label: "Check", amount: 0, order: order, adjustable: order)
 
             expect {

data/spec/models/spree/promotion/rules/nth_order_spec.rb

@@ -47,7 +47,7 @@ describe Spree::Promotion::Rules::NthOrder do
 
         context "when this order is completed and is still the 'nth' order" do
           before do
-            order.update_attributes(completed_at: Time.now)
+            order.update_attributes(completed_at: Time.current)
           end
 
           it { is_expected.to be true }

data/spec/models/spree/promotion/rules/user_spec.rb

@@ -27,11 +27,11 @@ describe Spree::Promotion::Rules::User, :type => :model do
       expect(rule).not_to be_eligible(order)
     end
 
-    # Regression test for #3885
+    # Regression test for https://github.com/spree/spree/issues/3885
     it "can assign to user_ids" do
       user1 = Spree::LegacyUser.create!(:email => "test1@example.com")
       user2 = Spree::LegacyUser.create!(:email => "test2@example.com")
-      expect { rule.user_ids = "#{user1.id}, #{user2.id}" }.not_to raise_error
+      rule.user_ids = "#{user1.id}, #{user2.id}"
     end
   end
 end

data/spec/models/spree/promotion_handler/coupon_spec.rb

@@ -111,7 +111,7 @@ module Spree
               end
             end
 
-            # Regression test for #4211
+            # Regression test for https://github.com/spree/spree/issues/4211
             context "with incorrect coupon code casing" do
               before { allow(order).to receive_messages :coupon_code => "10OFF" }
               it "successfully activates promo" do
@@ -140,7 +140,7 @@ module Spree
               order.contents.add create(:variant)
             end
 
-            # regression spec for #4515
+            # regression spec for https://github.com/spree/spree/issues/4515
             it "successfully activates promo" do
               subject.apply
               expect(subject).to be_successful

data/spec/models/spree/promotion_spec.rb

@@ -104,7 +104,7 @@ describe Spree::Promotion, :type => :model do
       promotion.created_at = 2.days.ago
 
       @user = create(:user)
-      @order = create(:order, user: @user, created_at: DateTime.now)
+      @order = create(:order, user: @user, created_at: DateTime.current)
       @payload = { :order => @order, :user => @user }
     end
 
@@ -131,7 +131,7 @@ describe Spree::Promotion, :type => :model do
 
     it "does activate if newer then order" do
       expect(@action1).to receive(:perform).with(hash_including(@payload))
-      promotion.created_at = DateTime.now + 2
+      promotion.created_at = DateTime.current + 2
       expect(promotion.activate(@payload)).to be true
     end
 
@@ -301,28 +301,28 @@ describe Spree::Promotion, :type => :model do
     end
 
     it "should be expired if it hasn't started yet" do
-      promotion.starts_at = Time.now + 1.day
+      promotion.starts_at = Time.current + 1.day
       expect(promotion).to be_expired
     end
 
     it "should be expired if it has already ended" do
-      promotion.expires_at = Time.now - 1.day
+      promotion.expires_at = Time.current - 1.day
       expect(promotion).to be_expired
     end
 
     it "should not be expired if it has started already" do
-      promotion.starts_at = Time.now - 1.day
+      promotion.starts_at = Time.current - 1.day
       expect(promotion).not_to be_expired
     end
 
     it "should not be expired if it has not ended yet" do
-      promotion.expires_at = Time.now + 1.day
+      promotion.expires_at = Time.current + 1.day
       expect(promotion).not_to be_expired
     end
 
     it "should not be expired if current time is within starts_at and expires_at range" do
-      promotion.starts_at = Time.now - 1.day
-      promotion.expires_at = Time.now + 1.day
+      promotion.starts_at = Time.current - 1.day
+      promotion.expires_at = Time.current + 1.day
       expect(promotion).not_to be_expired
     end
   end
@@ -333,28 +333,28 @@ describe Spree::Promotion, :type => :model do
     end
 
     it "should not be active if it hasn't started yet" do
-      promotion.starts_at = Time.now + 1.day
+      promotion.starts_at = Time.current + 1.day
       expect(promotion.active?).to eq(false)
     end
 
     it "should not be active if it has already ended" do
-      promotion.expires_at = Time.now - 1.day
+      promotion.expires_at = Time.current - 1.day
       expect(promotion.active?).to eq(false)
     end
 
     it "should be active if it has started already" do
-      promotion.starts_at = Time.now - 1.day
+      promotion.starts_at = Time.current - 1.day
       expect(promotion.active?).to eq(true)
     end
 
     it "should be active if it has not ended yet" do
-      promotion.expires_at = Time.now + 1.day
+      promotion.expires_at = Time.current + 1.day
       expect(promotion.active?).to eq(true)
     end
 
     it "should be active if current time is within starts_at and expires_at range" do
-      promotion.starts_at = Time.now - 1.day
-      promotion.expires_at = Time.now + 1.day
+      promotion.starts_at = Time.current - 1.day
+      promotion.expires_at = Time.current + 1.day
       expect(promotion.active?).to eq(true)
     end
 
@@ -399,7 +399,7 @@ describe Spree::Promotion, :type => :model do
       expect(promotion.usage_count).to eq(0)
     end
 
-    # Regression test for #4112
+    # Regression test for https://github.com/spree/spree/issues/4112
     it "does not count ineligible adjustments" do
       adjustment.update_column(:eligible, false)
       expect(promotion.usage_count).to eq(0)
@@ -440,7 +440,7 @@ describe Spree::Promotion, :type => :model do
     it { is_expected.to be true }
 
     context "when promotion is expired" do
-      before { promotion.expires_at = Time.now - 10.days }
+      before { promotion.expires_at = Time.current - 10.days }
       it { is_expected.to be false }
     end
 
@@ -688,7 +688,7 @@ describe Spree::Promotion, :type => :model do
     end
   end
 
-  # regression for #4059
+  # regression for https://github.com/spree/spree/issues/4059
   # admin form posts the code and path as empty string
   describe "normalize blank values for path" do
     it "will save blank value as nil value instead" do
@@ -714,7 +714,7 @@ describe Spree::Promotion, :type => :model do
       before do
         promotion.activate(order: order)
         order.update!
-        order.completed_at = Time.now
+        order.completed_at = Time.current
         order.save!
       end