solidus_core 2.9.6 → 2.10.3

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

@@ -122,7 +122,7 @@ module Spree
       end
 
       context 'the order has no user' do
-        before { order.update_attributes!(user_id: nil) }
+        before { order.update!(user_id: nil) }
         it 'errors' do
           expect { new_payment }.to raise_error(ActiveRecord::RecordNotFound)
         end
@@ -130,7 +130,7 @@ module Spree
 
       context 'the order and the credit card have no user' do
         before do
-          order.update_attributes!(user_id: nil)
+          order.update!(user_id: nil)
           credit_card.update!(user_id: nil)
         end
         it 'errors' do
@@ -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/payment_spec.rb

@@ -134,7 +134,7 @@ RSpec.describe Spree::Payment, type: :model do
     describe "#process!" do
       context 'with autocapture' do
         before do
-          payment.payment_method.update_attributes!(auto_capture: true)
+          payment.payment_method.update!(auto_capture: true)
         end
 
         it "should purchase" do
@@ -145,11 +145,11 @@ RSpec.describe Spree::Payment, type: :model do
 
       context 'without autocapture' do
         before do
-          payment.payment_method.update_attributes!(auto_capture: false)
+          payment.payment_method.update!(auto_capture: false)
         end
 
         context 'when in the checkout state' do
-          before { payment.update_attributes!(state: 'checkout') }
+          before { payment.update!(state: 'checkout') }
 
           it "authorizes" do
             payment.process!
@@ -158,7 +158,7 @@ RSpec.describe Spree::Payment, type: :model do
         end
 
         context 'when in the processing state' do
-          before { payment.update_attributes!(state: 'processing') }
+          before { payment.update!(state: 'processing') }
 
           it "does not authorize" do
             payment.process!
@@ -167,7 +167,7 @@ RSpec.describe Spree::Payment, type: :model do
         end
 
         context 'when in the pending state' do
-          before { payment.update_attributes!(state: 'pending') }
+          before { payment.update!(state: 'pending') }
 
           it "does not re-authorize" do
             expect(payment).to_not receive(:authorize!)
@@ -177,7 +177,7 @@ RSpec.describe Spree::Payment, type: :model do
         end
 
         context 'when in a failed state' do
-          before { payment.update_attributes!(state: 'failed') }
+          before { payment.update!(state: 'failed') }
 
           it "raises an exception" do
             expect {
@@ -187,7 +187,7 @@ RSpec.describe Spree::Payment, type: :model do
         end
 
         context 'when in the completed state' do
-          before { payment.update_attributes!(state: 'completed') }
+          before { payment.update!(state: 'completed') }
 
           it "authorizes" do
             payment.process!
@@ -253,7 +253,7 @@ RSpec.describe Spree::Payment, type: :model do
 
         context 'when the source is a credit card without an address' do
           let(:card) { create(:credit_card, address: nil) }
-          before { order.update_attributes!(bill_address: address) }
+          before { order.update!(bill_address: address) }
           let(:address) { create(:address) }
 
           it 'send the order bill address' do
@@ -278,7 +278,7 @@ RSpec.describe Spree::Payment, type: :model do
 
           let(:store_credit_payment) { create(:store_credit_payment) }
           let(:store_credit_payment_method) { create(:store_credit_payment_method) }
-          before { order.update_attributes!(bill_address: address) }
+          before { order.update!(bill_address: address) }
           let(:address) { create(:address) }
 
           it 'send the order bill address' do
@@ -932,7 +932,7 @@ RSpec.describe Spree::Payment, type: :model do
         end
 
         context 'the order has no user' do
-          before { order.update_attributes!(user_id: nil) }
+          before { order.update!(user_id: nil) }
           it 'errors' do
             expect { subject }.to raise_error(ActiveRecord::RecordNotFound)
           end
@@ -940,7 +940,7 @@ RSpec.describe Spree::Payment, type: :model do
 
         context 'the order and the credit card have no user' do
           before do
-            order.update_attributes!(user_id: nil)
+            order.update!(user_id: nil)
             credit_card.update!(user_id: nil)
           end
           it 'errors' do
@@ -976,7 +976,7 @@ RSpec.describe Spree::Payment, type: :model do
       # Sets the payment's order to a different Ruby object entirely
       payment.order = Spree::Order.find(payment.order_id)
       email = 'foo@example.com'
-      order.update_attributes(email: email)
+      order.update(email: email)
       expect(payment.gateway_options[:email]).to eq(email)
     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/first_repeat_purchase_since_spec.rb

@@ -42,10 +42,10 @@ RSpec.describe Spree::Promotion::Rules::FirstRepeatPurchaseSince do
         let(:order_completion_date_2) { 1.day.ago }
         before do
           old_order_1 = create :completed_order_with_totals, user: user
-          old_order_1.update_attributes(completed_at: order_completion_date_1)
+          old_order_1.update(completed_at: order_completion_date_1)
 
           old_order_2 = create :completed_order_with_totals, user: user
-          old_order_2.update_attributes(completed_at: order_completion_date_2)
+          old_order_2.update(completed_at: order_completion_date_2)
         end
 
         context "the last completed order was greater than the preferred days ago" do

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

@@ -40,7 +40,7 @@ RSpec.describe Spree::Promotion::Rules::NthOrder do
       context "when the user has completed orders" do
         before do
           old_order = create :completed_order_with_totals, user: user
-          old_order.update_attributes(completed_at: 1.day.ago)
+          old_order.update(completed_at: 1.day.ago)
         end
 
         context "when this order will be the 'nth' order" do
@@ -49,7 +49,7 @@ RSpec.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.current)
+            order.update(completed_at: Time.current)
           end
 
           it { is_expected.to be true }

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,80 +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(:order) { FactoryBot.create(:completed_order_with_promotion, promotion: promotion) }
-      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(:order) { FactoryBot.create(:completed_order_with_promotion, promotion: promotion) }
-      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
+      let(:promotion) { create(:promotion, :with_order_adjustment) }
       let(:promotable) { create :order }
 
-      context "and it is empty" do
-        it { is_expected.to be true }
-      end
+      it_behaves_like "a promotable"
 
-      context "and it contains items" do
+      context "when it contains items" do
         let!(:line_item) { create(:line_item, order: promotable) }
         let!(:line_item2) { create(:line_item, order: promotable) }
 
@@ -650,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
 
@@ -658,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
 
@@ -666,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