solidus_core 2.10.0.beta1 → 2.10.0

data/spec/lib/spree/core/validators/email_spec.rb

@@ -12,27 +12,27 @@ RSpec.describe Spree::EmailValidator do
 
   let(:valid_emails) {
     [
-    'valid@email.com',
-    'valid@email.com.uk',
-    'e@email.com',
-    'valid+email@email.com',
-    'valid-email@email.com',
-    'valid_email@email.com',
-    'valid.email@email.com'
-  ]
+      'valid@email.com',
+      'valid@email.com.uk',
+      'e@email.com',
+      'valid+email@email.com',
+      'valid-email@email.com',
+      'valid_email@email.com',
+      'valid.email@email.com'
+    ]
   }
   let(:invalid_emails) {
     [
-    'invalid email@email.com',
-    '.invalid.email@email.com',
-    'invalid.email.@email.com',
-    '@email.com',
-    '.@email.com',
-    'invalidemailemail.com',
-    '@invalid.email@email.com',
-    'invalid@email@email.com',
-    'invalid.email@@email.com'
-  ]
+      'invalid email@email.com',
+      '.invalid.email@email.com',
+      'invalid.email.@email.com',
+      '@email.com',
+      '.@email.com',
+      'invalidemailemail.com',
+      '@invalid.email@email.com',
+      'invalid@email@email.com',
+      'invalid.email@@email.com'
+    ]
   }
 
   it 'validates valid email addresses' do

data/spec/models/spree/address_spec.rb

@@ -152,6 +152,29 @@ RSpec.describe Spree::Address, type: :model do
         it "sets up a new record with Spree::Config[:default_country_iso]" do
           expect(Spree::Address.build_default.country).to eq default_country
         end
+
+        it 'accepts other attributes' do
+          address = Spree::Address.build_default(first_name: 'Ryan')
+
+          expect(address.country).to eq default_country
+          expect(address.first_name).to eq 'Ryan'
+        end
+
+        it 'accepts a block' do
+          address = Spree::Address.build_default do |record|
+            record.first_name = 'Ryan'
+          end
+
+          expect(address.country).to eq default_country
+          expect(address.first_name).to eq 'Ryan'
+        end
+
+        it 'can override the country' do
+          another_country = build :country
+          address = Spree::Address.build_default(country: another_country)
+
+          expect(address.country).to eq another_country
+        end
       end
 
       # Regression test for https://github.com/spree/spree/issues/1142

data/spec/models/spree/calculator/shipping/flat_percent_item_total_spec.rb

@@ -25,7 +25,7 @@ module Spree
         )
       end
 
-      subject { FlatPercentItemTotal.new(preferred_flat_percent: 10) }
+      subject { described_class.new(preferred_flat_percent: 10) }
 
       it "should round result correctly" do
         expect(subject.compute(package)).to eq(4.04)

data/spec/models/spree/calculator/shipping/flat_rate_spec.rb

@@ -6,7 +6,7 @@ require 'shared_examples/calculator_shared_examples'
 module Spree
   module Calculator::Shipping
     RSpec.describe FlatRate, type: :model do
-      subject { Calculator::Shipping::FlatRate.new(preferred_amount: 4.00) }
+      subject { described_class.new(preferred_amount: 4.00) }
 
       it_behaves_like 'a calculator with a description'
 

data/spec/models/spree/calculator/shipping/flexi_rate_spec.rb

@@ -15,7 +15,7 @@ module Spree
         build(:stock_package, variants_contents: { variant1 => 4, variant2 => 6 })
       end
 
-      let(:subject) { FlexiRate.new }
+      let(:subject) { described_class.new }
 
       context "compute" do
         it "should compute amount correctly when all fees are 0" do
@@ -46,7 +46,7 @@ module Spree
         end
 
         it "should allow creation of new object with all the attributes" do
-          FlexiRate.new(preferred_first_item: 1,
+          described_class.new(preferred_first_item: 1,
                         preferred_additional_item: 1,
                         preferred_max_items: 1)
         end

data/spec/models/spree/calculator/shipping/per_item_spec.rb

@@ -15,7 +15,7 @@ module Spree
         build(:stock_package, variants_contents: { variant1 => 5, variant2 => 3 })
       end
 
-      subject { PerItem.new(preferred_amount: 10) }
+      subject { described_class.new(preferred_amount: 10) }
 
       it "correctly calculates per item shipping" do
         expect(subject.compute(package).to_f).to eq(80) # 5 x 10 + 3 x 10

data/spec/models/spree/calculator/shipping/price_sack_spec.rb

@@ -5,7 +5,7 @@ require 'shared_examples/calculator_shared_examples'
 
 RSpec.describe Spree::Calculator::Shipping::PriceSack, type: :model do
   let(:calculator) do
-    calculator = Spree::Calculator::PriceSack.new
+    calculator = described_class.new
     calculator.preferred_minimal_amount = 5
     calculator.preferred_normal_amount = 10
     calculator.preferred_discount_amount = 1
@@ -14,22 +14,31 @@ RSpec.describe Spree::Calculator::Shipping::PriceSack, type: :model do
 
   it_behaves_like 'a calculator with a description'
 
-  let(:order) { stub_model(Spree::Order) }
-  let(:shipment) { stub_model(Spree::Shipment, amount: 10) }
+  describe '#compute' do
+    subject { calculator.compute(package) }
+    let(:package) { build(:stock_package, variants_contents: { build(:variant) => 1 }) }
 
-  # Regression test for https://github.com/spree/spree/issues/714 and https://github.com/spree/spree/issues/739
-  it "computes with an order object" do
-    calculator.compute(order)
-  end
+    before do
+      # This hack is due to our factories not being so smart to understand
+      # that they should create line items with the price of the associated
+      # variant by default.
+      allow_any_instance_of(Spree::Stock::ContentItem).to receive(:price) { amount }
+    end
 
-  # Regression test for https://github.com/spree/spree/issues/1156
-  it "computes with a shipment object" do
-    calculator.compute(shipment)
-  end
+    context 'when price < minimal amount' do
+      let(:amount) { 2 }
+
+      it "returns the discounted amount" do
+        expect(subject).to eq(10)
+      end
+    end
+
+    context 'when price > minimal amount' do
+      let(:amount) { 6 }
 
-  # Regression test for https://github.com/spree/spree/issues/2055
-  it "computes the correct amount" do
-    expect(calculator.compute(2)).to eq(calculator.preferred_normal_amount)
-    expect(calculator.compute(6)).to eq(calculator.preferred_discount_amount)
+      it "returns the discounted amount" do
+        expect(subject).to eq(1)
+      end
+    end
   end
 end

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