solidus_core 1.2.3 → 1.3.0.beta1

data/spec/models/spree/gateway/bogus_simple.rb

@@ -1,7 +1,6 @@
 require 'spec_helper'
 
-describe Spree::Gateway::BogusSimple, :type => :model do
-
+describe Spree::Gateway::BogusSimple, type: :model do
   subject { Spree::Gateway::BogusSimple.new }
 
   # regression test for https://github.com/spree/spree/issues/3824
@@ -16,5 +15,4 @@ describe Spree::Gateway::BogusSimple, :type => :model do
       expect(response.message).to include("failure")
     end
   end
-
-end
+end

data/spec/models/spree/gateway/bogus_spec.rb

@@ -1,12 +1,14 @@
 require 'spec_helper'
 
 module Spree
-  describe Gateway::Bogus, :type => :model do
+  describe Gateway::Bogus, type: :model do
     let(:bogus) { create(:credit_card_payment_method) }
     let!(:cc) { create(:credit_card, payment_method: bogus, gateway_customer_profile_id: "BGS-RERTERT") }
 
     it "disable recurring contract by destroying payment source" do
-      bogus.disable_customer_profile(cc)
+      ActiveSupport::Deprecation.silence do
+        bogus.disable_customer_profile(cc)
+      end
       expect(cc.gateway_customer_profile_id).to be_nil
     end
   end

data/spec/models/spree/gateway_spec.rb

@@ -1,14 +1,18 @@
 require 'spec_helper'
 
-describe Spree::Gateway, :type => :model do
+describe Spree::Gateway, type: :model do
   class Provider
     def initialize(options)
     end
 
     def authorize; 'authorize'; end
+
     def purchase; 'purchase'; end
+
     def capture; 'capture'; end
+
     def void; 'void'; end
+
     def credit; 'credit'; end
   end
 
@@ -43,8 +47,9 @@ describe Spree::Gateway, :type => :model do
   end
 
   context "fetching payment sources" do
+    let(:store) { create :store }
     let(:user) { create :user }
-    let(:order) { Spree::Order.create(user: user, completed_at: completed_at) }
+    let(:order) { Spree::Order.create(user: user, completed_at: completed_at, store: store) }
 
     let(:payment_method) { create(:credit_card_payment_method) }
 
@@ -98,7 +103,7 @@ describe Spree::Gateway, :type => :model do
     let(:payment_method){ create(:credit_card_payment_method, preference_source: 'test_preference_source') }
 
     it "reads static preferences" do
-      expect(payment_method.options).to eq({:server=>"bar"})
+      expect(payment_method.options).to eq({ server: "bar" })
     end
   end
 end

data/spec/models/spree/inventory_unit_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Spree::InventoryUnit, :type => :model do
+describe Spree::InventoryUnit, type: :model do
   let(:stock_location) { create(:stock_location_with_items) }
   let(:stock_item) { stock_location.stock_items.order(:id).first }
   let(:line_item) { create(:line_item, variant: stock_item.variant) }
@@ -106,9 +106,7 @@ describe Spree::InventoryUnit, :type => :model do
       it "does not find inventory units belonging to incomplete orders" do
         expect(Spree::InventoryUnit.backordered_for_stock_item(stock_item)).not_to include(other_unit)
       end
-
     end
-
   end
 
   context "variants deleted" do
@@ -129,10 +127,12 @@ describe Spree::InventoryUnit, :type => :model do
   context "#finalize_units!" do
     let!(:stock_location) { create(:stock_location) }
     let(:variant) { create(:variant) }
-    let(:inventory_units) { [
+    let(:inventory_units) {
+      [
       create(:inventory_unit, variant: variant),
       create(:inventory_unit, variant: variant)
-    ] }
+    ]
+    }
 
     it "should create a stock movement" do
       Spree::InventoryUnit.finalize_units!(inventory_units)
@@ -173,11 +173,11 @@ describe Spree::InventoryUnit, :type => :model do
 
   describe '#additional_tax_total' do
     let(:quantity) { 2 }
-    let(:line_item_additional_tax_total)  { 10.00 }
+    let(:line_item_additional_tax_total) { 10.00 }
     let(:line_item) do
       build(:line_item, {
         quantity: quantity,
-        additional_tax_total: line_item_additional_tax_total,
+        additional_tax_total: line_item_additional_tax_total
       })
     end
 
@@ -192,11 +192,11 @@ describe Spree::InventoryUnit, :type => :model do
 
   describe '#included_tax_total' do
     let(:quantity) { 2 }
-    let(:line_item_included_tax_total)  { 10.00 }
+    let(:line_item_included_tax_total) { 10.00 }
     let(:line_item) do
       build(:line_item, {
         quantity: quantity,
-        included_tax_total: line_item_included_tax_total,
+        included_tax_total: line_item_included_tax_total
       })
     end
 
@@ -211,11 +211,11 @@ describe Spree::InventoryUnit, :type => :model do
 
   describe '#additional_tax_total' do
     let(:quantity) { 2 }
-    let(:line_item_additional_tax_total)  { 10.00 }
+    let(:line_item_additional_tax_total) { 10.00 }
     let(:line_item) do
       build(:line_item, {
         quantity: quantity,
-        additional_tax_total: line_item_additional_tax_total,
+        additional_tax_total: line_item_additional_tax_total
       })
     end
 
@@ -230,11 +230,11 @@ describe Spree::InventoryUnit, :type => :model do
 
   describe '#included_tax_total' do
     let(:quantity) { 2 }
-    let(:line_item_included_tax_total)  { 10.00 }
+    let(:line_item_included_tax_total) { 10.00 }
     let(:line_item) do
       build(:line_item, {
         quantity: quantity,
-        included_tax_total: line_item_included_tax_total,
+        included_tax_total: line_item_included_tax_total
       })
     end
 
@@ -248,7 +248,6 @@ describe Spree::InventoryUnit, :type => :model do
   end
 
   describe "#exchange_requested?" do
-
     subject { inventory_unit.exchange_requested? }
 
     context "return item contains inventory unit and was for an exchange" do

data/spec/models/spree/item_adjustments_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 module Spree
-  describe ItemAdjustments, :type => :model do
+  describe ItemAdjustments, type: :model do
     let(:order) { create :order_with_line_items, line_items_count: 1 }
     let(:line_item) { order.line_items.first }
 
@@ -9,8 +9,8 @@ module Spree
 
     context '#update' do
       it "updates a linked adjustment" do
-        tax_rate = create(:tax_rate, :amount => 0.05)
-        adjustment = create(:adjustment, order: order, source: tax_rate, adjustable: line_item)
+        tax_rate = create(:tax_rate, amount: 0.05)
+        create(:adjustment, order: order, source: tax_rate, adjustable: line_item)
         line_item.price = 10
         line_item.tax_category = tax_rate.tax_category
 
@@ -22,15 +22,15 @@ module Spree
 
     context "taxes and promotions" do
       let!(:tax_rate) do
-        create(:tax_rate, :amount => 0.05)
+        create(:tax_rate, amount: 0.05)
       end
 
       let!(:promotion) do
-        Spree::Promotion.create(:name => "$10 off")
+        Spree::Promotion.create(name: "$10 off")
       end
 
       let!(:promotion_action) do
-        calculator = Calculator::FlatRate.new(:preferred_amount => 10)
+        calculator = Calculator::FlatRate.new(preferred_amount: 10)
         Promotion::Actions::CreateItemAdjustments.create calculator: calculator, promotion: promotion
       end
 
@@ -44,10 +44,10 @@ module Spree
       context "tax included in price" do
         before do
           create(:adjustment,
-            :source => tax_rate,
-            :adjustable => line_item,
-            :order => order,
-            :included => true
+            source: tax_rate,
+            adjustable: line_item,
+            order: order,
+            included: true
           )
         end
 
@@ -71,10 +71,10 @@ module Spree
       context "tax excluded from price" do
         before do
           create(:adjustment,
-            :source => tax_rate,
-            :adjustable => line_item,
-            :order => order,
-            :included => false
+            source: tax_rate,
+            adjustable: line_item,
+            order: order,
+            included: false
           )
         end
 
@@ -100,7 +100,7 @@ module Spree
     context "promotion chooser customization" do
       before do
         class Spree::TestPromotionChooser
-          def initialize(adjustments)
+          def initialize(_adjustments)
             raise "Custom promotion chooser"
           end
         end
@@ -108,46 +108,42 @@ module Spree
         Spree::Config.promotion_chooser_class = Spree::TestPromotionChooser
       end
 
-      after do
-        Spree::Config.promotion_chooser_class = Spree::PromotionChooser
-      end
-
       it "uses the defined promotion chooser" do
         expect { subject.update }.to raise_error("Custom promotion chooser")
       end
     end
 
     context "default promotion chooser (best promotion is always applied)" do
-      let(:calculator) { Calculator::FlatRate.new(:preferred_amount => 10) }
+      let(:calculator) { Calculator::FlatRate.new(preferred_amount: 10) }
 
       let(:source) do
         Promotion::Actions::CreateItemAdjustments.create!(
           calculator: calculator,
-          promotion: promotion,
+          promotion: promotion
         )
       end
       let(:promotion) { create(:promotion) }
 
       def create_adjustment(label, amount)
-        create(:adjustment, :order      => order,
-                            :adjustable => line_item,
-                            :source     => source,
-                            :amount     => amount,
-                            :finalized  => true,
-                            :label      => label)
+        create(:adjustment, order: order,
+                            adjustable: line_item,
+                            source: source,
+                            amount: amount,
+                            finalized: true,
+                            label: label)
       end
 
       it "should make all but the most valuable promotion adjustment ineligible, leaving non promotion adjustments alone" do
         create_adjustment("Promotion A", -100)
         create_adjustment("Promotion B", -200)
         create_adjustment("Promotion C", -300)
-        create(:adjustment, :order => order,
-                            :adjustable => line_item,
-                            :source => nil,
-                            :amount => -500,
-                            :finalized => true,
-                            :label => "Some other credit")
-        line_item.adjustments.each {|a| a.update_column(:eligible, true)}
+        create(:adjustment, order: order,
+                            adjustable: line_item,
+                            source: nil,
+                            amount: -500,
+                            finalized: true,
+                            label: "Some other credit")
+        line_item.adjustments.each { |a| a.update_column(:eligible, true) }
 
         subject.update
 
@@ -161,7 +157,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 { |a| a.update_column(:eligible, true) }
 
         subject.update
 
@@ -175,7 +171,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 { |a| a.update_column(:eligible, true) }
 
         subject.update
 
@@ -186,16 +182,16 @@ module Spree
       context "when previously ineligible promotions become available" do
         let(:order_promo1) { create(:promotion, :with_order_adjustment, :with_item_total_rule, weighted_order_adjustment_amount: 5, item_total_threshold_amount: 10) }
         let(:order_promo2) { create(:promotion, :with_order_adjustment, :with_item_total_rule, weighted_order_adjustment_amount: 10, item_total_threshold_amount: 20) }
-        let(:order_promos) { [ order_promo1, order_promo2 ] }
+        let(:order_promos) { [order_promo1, order_promo2] }
         let(:line_item_promo1) { create(:promotion, :with_line_item_adjustment, :with_item_total_rule, adjustment_rate: 2.5, item_total_threshold_amount: 10, apply_automatically: true) }
         let(:line_item_promo2) { create(:promotion, :with_line_item_adjustment, :with_item_total_rule, adjustment_rate: 5, item_total_threshold_amount: 20, apply_automatically: true) }
-        let(:line_item_promos) { [ line_item_promo1, line_item_promo2 ] }
+        let(:line_item_promos) { [line_item_promo1, line_item_promo2] }
         let(:order) { create(:order_with_line_items, line_items_count: 1) }
 
         # Apply promotions in different sequences. Results should be the same.
         promo_sequences = [
-          [ 0, 1 ],
-          [ 1, 0 ]
+          [0, 1],
+          [1, 0]
         ]
 
         promo_sequences.each do |promo_sequence|

data/spec/models/spree/line_item_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Spree::LineItem, :type => :model do
+describe Spree::LineItem, type: :model do
   let(:order) { create :order_with_line_items, line_items_count: 1 }
   let(:line_item) { order.line_items.first }
 
@@ -58,7 +58,7 @@ describe Spree::LineItem, :type => :model do
     let(:variant) { create(:variant) }
 
     before do
-      create(:tax_rate, :zone => order.tax_zone, :tax_category => variant.tax_category)
+      create(:tax_rate, zone: order.tax_zone, tax_category: variant.tax_category)
     end
 
     context "when order has a tax zone" do
@@ -89,26 +89,62 @@ describe Spree::LineItem, :type => :model do
     end
   end
 
-  # Test for https://github.com/spree/spree/issues/3391
-  context '#copy_price' do
-    it "copies over a variant's prices" do
-      line_item.price = nil
-      line_item.cost_price = nil
-      line_item.currency = nil
-      line_item.copy_price
-      variant = line_item.variant
-      expect(line_item.price).to eq(variant.price)
-      expect(line_item.cost_price).to eq(variant.cost_price)
-      expect(line_item.currency).to eq(variant.currency)
+  describe 'line item creation' do
+    let(:variant) { create :variant }
+
+    subject(:line_item) { Spree::LineItem.new(variant: variant, order: order) }
+
+    # Tests for https://github.com/spree/spree/issues/3391
+    context 'before validation' do
+      before { line_item.valid? }
+
+      it 'copies the variants price' do
+        expect(line_item.price).to eq(variant.price)
+      end
+
+      it 'copies the variants cost_price' do
+        expect(line_item.cost_price).to eq(variant.cost_price)
+      end
+
+      it "copies the order's currency" do
+        expect(line_item.currency).to eq(order.currency)
+      end
+
+      # Test for https://github.com/spree/spree/issues/3481
+      it 'copies the variants tax category' do
+        expect(line_item.tax_category).to eq(line_item.variant.tax_category)
+      end
     end
-  end
 
-  # Test for https://github.com/spree/spree/issues/3481
-  context '#copy_tax_category' do
-    it "copies over a variant's tax category" do
-      line_item.tax_category = nil
-      line_item.copy_tax_category
-      expect(line_item.tax_category).to eq(line_item.variant.tax_category)
+    # Specs for https://github.com/solidusio/solidus/pull/522#issuecomment-170668125
+    context "with `#copy_price` defined" do
+      before(:context) do
+        Spree::LineItem.class_eval do
+          def copy_price
+            self.currency = "USD"
+            self.cost_price = 10
+            self.price = 20
+          end
+        end
+      end
+
+      after(:context) do
+        Spree::LineItem.class_eval do
+          remove_method :copy_price
+        end
+      end
+
+      it 'should display a deprecation warning' do
+        expect(ActiveSupport::Deprecation).to receive(:warn)
+        Spree::LineItem.new(variant: variant, order: order)
+      end
+
+      it 'should run the user-defined copy_price method' do
+        expect_any_instance_of(Spree::LineItem).to receive(:copy_price).and_call_original
+        ActiveSupport::Deprecation.silence do
+          Spree::LineItem.new(variant: variant, order: order)
+        end
+      end
     end
   end
 
@@ -123,16 +159,11 @@ describe Spree::LineItem, :type => :model do
 
   describe "#discounted_money" do
     it "should return a money object with the discounted amount" do
+      expect(line_item.discounted_amount).to eq(10.00)
       expect(line_item.discounted_money.to_s).to eq "$10.00"
     end
   end
 
-  describe '.currency' do
-    it 'returns the globally configured currency' do
-      line_item.currency == 'USD'
-    end
-  end
-
   describe ".money" do
     before do
       line_item.price = 3.50
@@ -151,49 +182,62 @@ describe Spree::LineItem, :type => :model do
     end
   end
 
-  context "currency same as order.currency" do
-    it "is a valid line item" do
-      line_item = order.line_items.first
-      line_item.currency = order.currency
-      line_item.valid?
+  context 'setting the currency' do
+    let(:line_item) { order.line_items.first }
+
+    context "currency same as order.currency" do
+      it "is a valid line item" do
+        line_item.currency = order.currency
+        line_item.valid?
 
-      expect(line_item.error_on(:currency).size).to eq(0)
+        expect(line_item.error_on(:currency).size).to eq(0)
+      end
     end
-  end
 
-  context "currency different than order.currency" do
-    it "is not a valid line item" do
-      line_item = order.line_items.first
-      line_item.currency = "no currency"
-      line_item.valid?
+    context "currency different than order.currency" do
+      it "is not a valid line item" do
+        expect(Spree::Deprecation).to receive(:warn).at_least(:once)
+        line_item.currency = "RUB"
+        line_item.valid?
 
-      expect(line_item.error_on(:currency).size).to eq(1)
+        expect(line_item.error_on(:currency).size).to eq(1)
+      end
     end
   end
 
   describe "#options=" do
     it "can handle updating a blank line item with no order" do
+      expect(Spree::Deprecation).not_to receive(:warn)
       line_item.options = { price: 123 }
     end
 
     it "updates the data provided in the options" do
+      expect(Spree::Deprecation).not_to receive(:warn)
       line_item.options = { price: 123 }
       expect(line_item.price).to eq 123
     end
+  end
 
-    it "updates the price based on the options provided" do
-      expect(line_item).to receive(:gift_wrap=).with(true)
-      expect(line_item.variant).to receive(:gift_wrap_price_modifier_amount_in).with("USD", true).and_return 1.99
-      line_item.options = { gift_wrap: true }
-      expect(line_item.price).to eq 21.98
+  describe 'money_price=' do
+    let(:line_item) { Spree::LineItem.new }
+    let(:new_price) { Spree::Money.new(99.00, currency: "RUB") }
+
+    it 'assigns a new price and currency' do
+      line_item.money_price = new_price
+      expect(line_item.price).to eq(new_price.cents / 100.0)
+      expect(line_item.currency).to eq(new_price.currency.iso_code)
     end
   end
 
-  describe "precision of pre_tax_amount" do
-    let!(:line_item) { create :line_item, pre_tax_amount: 4.2051 }
+  describe "#pricing_options" do
+    let(:line_item) { Spree::LineItem.new(currency: "RUB") }
+
+    subject { line_item.pricing_options }
+
+    it { is_expected.to be_a(Spree::Config.pricing_options_class) }
 
-    it "keeps four digits of precision even when reloading" do
-      expect(line_item.reload.pre_tax_amount).to eq(4.2051)
+    it "holds the line items's currency" do
+      expect(subject.currency).to eq("RUB")
     end
   end
 end

data/spec/models/spree/option_type_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Spree::OptionType, :type => :model do
+describe Spree::OptionType, type: :model do
   context "touching" do
     it "should touch a product" do
       product_option_type = create(:product_option_type)

data/spec/models/spree/option_value_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Spree::OptionValue, :type => :model do
+describe Spree::OptionValue, type: :model do
   context "touching" do
     let!(:variant) do
       Timecop.freeze(1.day.ago) do

data/spec/models/spree/order/address_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Spree::Order, :type => :model do
+describe Spree::Order, type: :model do
   let(:order) { Spree::Order.new }
 
   context 'validation' do

data/spec/models/spree/order/callbacks_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Spree::Order, :type => :model do
+describe Spree::Order, type: :model do
   let(:order) { stub_model(Spree::Order) }
   before do
     Spree::Order.define_state_machine!
@@ -19,10 +19,10 @@ describe Spree::Order, :type => :model do
 
   context "#save" do
     context "when associated with a registered user" do
-      let(:user) { double(:user, :email => "test@example.com") }
+      let(:user) { double(:user, email: "test@example.com") }
 
       before do
-        allow(order).to receive_messages :user => user
+        allow(order).to receive_messages user: user
       end
 
       it "should assign the email address of the user" do