solidus_core 2.10.0.beta1 → 2.10.5

data/spec/models/spree/carton_spec.rb

@@ -5,6 +5,14 @@ require 'rails_helper'
 RSpec.describe Spree::Carton do
   let(:carton) { create(:carton) }
 
+  describe 'shipping method' do
+    it 'returns soft deleted shipping method' do
+      carton = create(:carton)
+      carton.shipping_method.discard
+      expect(carton.reload.shipping_method).to be_present
+    end
+  end
+
   describe "#create" do
     subject { carton }
 

data/spec/models/spree/classification_spec.rb

@@ -34,9 +34,21 @@ module Spree
 
     context "removing product from taxon" do
       before :each do
-        p = taxon_with_5_products.products[1]
-        expect(p.classifications.first.position).to eq(2)
-        taxon_with_5_products.products.destroy(p)
+        element = taxon_with_5_products.products[1]
+        expect(element.classifications.first.position).to eq(2)
+        taxon_with_5_products.products.destroy(element)
+      end
+
+      it "resets positions" do
+        expect positions_to_be_valid(taxon_with_5_products)
+      end
+    end
+
+    context "Discard'ing a product" do
+      before :each do
+        element = taxon_with_5_products.products[1]
+        expect(element.classifications.first.position).to eq(2)
+        element.discard
       end
 
       it "resets positions" do
@@ -59,9 +71,9 @@ module Spree
 
     context "removing taxon from product" do
       before :each do
-        p = taxon_with_5_products.products[1]
-        p.taxons.destroy(taxon_with_5_products)
-        p.save!
+        element = taxon_with_5_products.products[1]
+        element.taxons.destroy(taxon_with_5_products)
+        element.save!
       end
 
       it "resets positions" do
@@ -71,9 +83,9 @@ module Spree
 
     context "replacing product's taxons" do
       before :each do
-        p = taxon_with_5_products.products[1]
-        p.taxons = []
-        p.save!
+        element = taxon_with_5_products.products[1]
+        element.taxons = []
+        element.save!
       end
 
       it "resets positions" do

data/spec/models/spree/concerns/user_address_book_spec.rb

@@ -77,7 +77,7 @@ module Spree
           end
 
           context "and changing another address field at the same time" do
-            let(:updated_address_attributes) { address.attributes.tap { |a| a[:first_name] = "Newbie" } }
+            let(:updated_address_attributes) { address.attributes.tap { |value| value[:first_name] = "Newbie" } }
 
             subject { user.save_in_address_book(updated_address_attributes, true) }
 
@@ -104,7 +104,7 @@ module Spree
         let(:address1) { create(:address) }
         let(:address2) { create(:address, firstname: "Different") }
         let(:updated_attrs) do
-          address2.attributes.tap { |a| a[:firstname] = "Johnny" }
+          address2.attributes.tap { |value| value[:firstname] = "Johnny" }
         end
 
         before do
@@ -191,8 +191,8 @@ module Spree
 
           it "archives address2" do
             subject
-            user_address2 = user.user_addresses.all_historical.find_by(address_id: address2.id)
-            expect(user_address2.archived).to be true
+            user_address_two = user.user_addresses.all_historical.find_by(address_id: address2.id)
+            expect(user_address_two.archived).to be true
           end
 
           context "via a new address that matches an archived one" do

data/spec/models/spree/concerns/user_methods_spec.rb

@@ -62,7 +62,7 @@ RSpec.describe Spree::UserMethods do
 
   describe '#available_store_credit_total' do
     subject do
-      test_user.available_store_credit_total(currency: 'USD')
+      test_user.reload.available_store_credit_total(currency: 'USD')
     end
 
     context 'when the user does not have any credit' do
@@ -95,6 +95,7 @@ RSpec.describe Spree::UserMethods do
 
       context 'with credits of multiple currencies' do
         let!(:credit_3) { create(:store_credit, user: test_user, amount: 400, currency: 'GBP') }
+        before { test_user.reload }
 
         it 'separates the currencies' do
           expect(test_user.available_store_credit_total(currency: 'USD')).to eq(100 + 200)

data/spec/models/spree/order_merger_spec.rb

@@ -77,13 +77,13 @@ module Spree
 
       context "2 equal line items" do
         before do
-          @line_item_1 = order_1.contents.add(variant, 1, foos: {})
-          @line_item_2 = order_2.contents.add(variant, 1, foos: {})
+          @line_item_one = order_1.contents.add(variant, 1, foos: {})
+          @line_item_two = order_2.contents.add(variant, 1, foos: {})
         end
 
         specify do
           without_partial_double_verification do
-            expect(order_1).to receive(:foos_match).with(@line_item_1, kind_of(Hash)).and_return(true)
+            expect(order_1).to receive(:foos_match).with(@line_item_one, kind_of(Hash)).and_return(true)
           end
           subject.merge!(order_2)
           expect(order_1.line_items.count).to eq(1)

data/spec/models/spree/order_spec.rb

@@ -366,26 +366,19 @@ RSpec.describe Spree::Order, type: :model do
     end
   end
 
-  context "add_update_hook", partial_double_verification: false do
-    before do
-      Spree::Order.class_eval do
-        register_update_hook :add_awesome_sauce
-      end
-    end
+  context ".register_update_hook", partial_double_verification: false do
+    let(:order) { create(:order) }
 
-    after do
-      Spree::Order.update_hooks = Set.new
-    end
+    before { Spree::Order.register_update_hook :foo }
+    after { Spree::Order.update_hooks.clear }
 
-    it "calls hook during update" do
-      order = create(:order)
-      expect(order).to receive(:add_awesome_sauce)
+    it "calls hooks during #recalculate" do
+      expect(order).to receive :foo
       order.recalculate
     end
 
-    it "calls hook during finalize" do
-      order = create(:order)
-      expect(order).to receive(:add_awesome_sauce)
+    it "calls hook during #finalize!" do
+      expect(order).to receive :foo
       order.finalize!
     end
   end

data/spec/models/spree/order_updater_spec.rb

@@ -158,7 +158,8 @@ module Spree
                                 amount: -500,
                                 finalized: true,
                                 label: 'Some other credit')
-            line_item.adjustments.each { |a| a.update_column(:eligible, true) }
+
+            line_item.adjustments.each { |item| item.update_column(:eligible, true) }
 
             order.recalculate
 
@@ -172,7 +173,7 @@ module Spree
               create_adjustment('Promotion A', -200)
               create_adjustment('Promotion B', -200)
             end
-            line_item.adjustments.each { |a| a.update_column(:eligible, true) }
+            line_item.adjustments.each { |item| item.update_column(:eligible, true) }
 
             order.recalculate
 
@@ -186,7 +187,7 @@ module Spree
               create_adjustment('Promotion A', -200)
               create_adjustment('Promotion B', -200)
             end
-            line_item.adjustments.each { |a| a.update_column(:eligible, true) }
+            line_item.adjustments.each { |item| item.update_column(:eligible, true) }
 
             order.recalculate
 

data/spec/models/spree/payment_create_spec.rb

@@ -156,20 +156,10 @@ module Spree
       context "unpermitted" do
         let(:attributes) { ActionController::Parameters.new(valid_attributes) }
 
-        if Rails.gem_version < Gem::Version.new('5.1')
-          it "ignores all attributes" do
-            expect(new_payment).to have_attributes(
-              amount: 0,
-              payment_method: nil,
-              source: nil
-            )
-          end
-        else
-          it "raises an exception" do
-            expect {
-              new_payment
-            }.to raise_exception(ActionController::UnfilteredParameters)
-          end
+        it "raises an exception" do
+          expect {
+            new_payment
+          }.to raise_exception(ActionController::UnfilteredParameters)
         end
       end
 

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

@@ -25,11 +25,13 @@ RSpec.describe Spree::PermissionSets::UserManagement do
     context 'when the user does not have a role' do
       let(:user) { create(:user) }
       it { is_expected.to be_able_to(:update_email, user) }
+      it { is_expected.to be_able_to(:update_password, user) }
     end
 
     context 'when the user has a role' do
       let(:user) { create(:user, spree_roles: [create(:role)]) }
       it { is_expected.not_to be_able_to(:update_email, user) }
+      it { is_expected.not_to be_able_to(:update_password, user) }
     end
 
     it { is_expected.not_to be_able_to(:delete, Spree.user_class) }

data/spec/models/spree/preference_spec.rb

@@ -12,10 +12,10 @@ RSpec.describe Spree::Preference, type: :model do
 
   describe "type coversion for values" do
     def round_trip_preference(key, value)
-      p = Spree::Preference.new
-      p.value = value
-      p.key = key
-      p.save
+      element = Spree::Preference.new
+      element.value = value
+      element.key = key
+      element.save
 
       Spree::Preference.find_by(key: key)
     end

data/spec/models/spree/preferences/preferable_spec.rb

@@ -272,9 +272,9 @@ RSpec.describe Spree::Preferences::Preferable, type: :model do
     before(:all) do
       class CreatePrefTest < ActiveRecord::Migration[4.2]
         def self.up
-          create_table :pref_tests do |t|
-            t.string :col
-            t.text :preferences
+          create_table :pref_tests do |item|
+            item.string :col
+            item.text :preferences
           end
         end
 

data/spec/models/spree/preferences/statically_configurable_spec.rb

@@ -30,8 +30,8 @@ module Spree
     end
 
     subject do
-      klass.new.tap do |o|
-        o.preference_source = preference_source
+      klass.new.tap do |item|
+        item.preference_source = preference_source
       end
     end
 

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

@@ -101,6 +101,7 @@ RSpec.describe Spree::Promotion::Rules::Taxon, type: :model do
         before do
           taxon.children << taxon2
           taxon.save!
+          taxon.reload
           product.taxons = [taxon2, taxon3]
           rule.taxons = [taxon, taxon3]
         end

data/spec/models/spree/promotion_rule_spec.rb

@@ -17,13 +17,13 @@ module Spree
     end
 
     it "validates unique rules for a promotion" do
-      p1 = TestRule.new
-      p1.promotion_id = 1
-      p1.save
+      promotion_one = TestRule.new
+      promotion_one.promotion_id = 1
+      promotion_one.save
 
-      p2 = TestRule.new
-      p2.promotion_id = 1
-      expect(p2).not_to be_valid
+      promotion_two = TestRule.new
+      promotion_two.promotion_id = 1
+      expect(promotion_two).not_to be_valid
     end
 
     it "generates its own partial path" do

data/spec/models/spree/promotion_spec.rb

@@ -434,12 +434,12 @@ RSpec.describe Spree::Promotion, type: :model do
     end
 
     context 'when expires_at date is not already reached' do
-      let(:expires_at) { Time.current + 1.days }
+      let(:expires_at) { Time.current + 1.day }
       it { is_expected.to be_falsey }
     end
 
     context 'when expires_at date is in the past' do
-      let(:expires_at) { Time.current - 1.days }
+      let(:expires_at) { Time.current - 1.day }
       it { is_expected.to be_truthy }
     end
   end
@@ -454,12 +454,12 @@ RSpec.describe Spree::Promotion, type: :model do
     end
 
     context 'when expires_at date is not already reached' do
-      let(:expires_at) { Time.current + 1.days }
+      let(:expires_at) { Time.current + 1.day }
       it { is_expected.to be_truthy }
     end
 
     context 'when expires_at date is in the past' do
-      let(:expires_at) { Time.current - 1.days }
+      let(:expires_at) { Time.current - 1.day }
       it { is_expected.to be_falsey }
     end
   end
@@ -569,76 +569,69 @@ RSpec.describe Spree::Promotion, type: :model do
 
   context "#eligible?" do
     subject do
-      promotion.eligible?(promotable)
+      promotion.eligible?(promotable, promotion_code: promotion.codes.first)
     end
 
-    let(:promotable) { create :order }
+    shared_examples "a promotable" do
+      context "when empty" do
+        it { is_expected.to be true }
+      end
 
-    it { is_expected.to be true }
+      context "when promotion is expired" do
+        before { promotion.expires_at = Time.current - 10.days }
 
-    context "when promotion is expired" do
-      before { promotion.expires_at = Time.current - 10.days }
-      it { is_expected.to be false }
-    end
+        it { is_expected.to be false }
+      end
 
-    context "when the promotion's usage limit is exceeded" do
-      let(:promotion) { FactoryBot.create(:promotion, :with_order_adjustment) }
+      context "when promotion's usage limit is exceeded" do
+        before do
+          promotion.usage_limit = 1
+          create(:completed_order_with_promotion, promotion: promotion)
+        end
 
-      before do
-        FactoryBot.create(
-          :completed_order_with_promotion,
-          promotion: promotion
-        )
-        promotion.usage_limit = 1
+        it { is_expected.to be false }
       end
 
-      it "returns false" do
-        expect(promotion.eligible?(promotable)).to eq(false)
+      context "when promotion code's usage limit is exceeded" do
+        before do
+          promotion.per_code_usage_limit = 1
+          create(:completed_order_with_promotion, promotion: promotion)
+          promotion.codes.first.adjustments.update_all(eligible: true)
+        end
+
+        it { is_expected.to be false }
       end
-    end
 
-    context "when the promotion code's usage limit is exceeded" do
-      let(:promotion) { create(:promotion, :with_order_adjustment, code: 'abc123', per_code_usage_limit: 1) }
-      let(:promotion_code) { promotion.codes.first }
+      context "when promotion is at last usage on the same order" do
+        let(:order) { create(:completed_order_with_promotion, promotion: promotion) }
+        let(:promotable) { order }
 
-      before do
-        FactoryBot.create(
-          :completed_order_with_promotion,
-          promotion: promotion
-        )
-        promotion_code.adjustments.update_all(eligible: true)
-      end
+        before do
+          promotion.usage_limit = 1
+        end
 
-      it "returns false" do
-        expect(promotion.eligible?(promotable, promotion_code: promotion_code)).to eq(false)
+        it { is_expected.to be true }
       end
-    end
 
-    context "when promotable is a Spree::LineItem" do
-      let(:promotable) { create :line_item }
-      let(:product) { promotable.product }
+      context "when promotion code is at last usage on the same order" do
+        let(:order) { create(:completed_order_with_promotion, promotion: promotion) }
+        let(:promotable) { order }
 
-      before do
-        product.promotionable = promotionable
-      end
+        before do
+          promotion.per_code_usage_limit = 1
+        end
 
-      context "and product is promotionable" do
-        let(:promotionable) { true }
         it { is_expected.to be true }
       end
-
-      context "and product is not promotionable" do
-        let(:promotionable) { false }
-        it { is_expected.to be false }
-      end
     end
 
     context "when promotable is a Spree::Order" do
-      context "and it is empty" do
-        it { is_expected.to be true }
-      end
+      let(:promotion) { create(:promotion, :with_order_adjustment) }
+      let(:promotable) { create :order }
 
-      context "and it contains items" do
+      it_behaves_like "a promotable"
+
+      context "when it contains items" do
         let!(:line_item) { create(:line_item, order: promotable) }
         let!(:line_item2) { create(:line_item, order: promotable) }
 
@@ -646,6 +639,7 @@ RSpec.describe Spree::Promotion, type: :model do
           before do
             line_item.product.update_column(:promotionable, false)
           end
+
           it { is_expected.to be false }
         end
 
@@ -654,6 +648,7 @@ RSpec.describe Spree::Promotion, type: :model do
             line_item.product.update_column(:promotionable, false)
             line_item2.product.update_column(:promotionable, false)
           end
+
           it { is_expected.to be false }
         end
 
@@ -662,6 +657,32 @@ RSpec.describe Spree::Promotion, type: :model do
         end
       end
     end
+
+    context "when promotable is a Spree::LineItem" do
+      let(:promotion) { create(:promotion, :with_line_item_adjustment) }
+      let(:promotable) { create(:line_item) }
+
+      it_behaves_like "a promotable"
+
+      context "and product is promotionable" do
+        before { promotable.product.promotionable = true }
+
+        it { is_expected.to be true }
+      end
+
+      context "and product is not promotionable" do
+        before { promotable.product.promotionable = false }
+
+        it { is_expected.to be false }
+      end
+    end
+
+    context "when promotable is a Spree::Shipment" do
+      let(:promotion) { create(:promotion, :with_free_shipping) }
+      let(:promotable) { create(:shipment) }
+
+      it_behaves_like "a promotable"
+    end
   end
 
   context "#eligible_rules" do