solidus_core 1.1.4 → 1.2.0.beta1

data/spec/lib/spree/money_spec.rb

@@ -97,7 +97,7 @@ describe Spree::Money do
       end
     end
 
-    # Regression test for #2634
+    # Regression test for https://github.com/spree/spree/issues/2634
     it "formats as plain by default" do
       money = Spree::Money.new(10, symbol_position: :after)
       expect(money.to_s).to eq("10.00 €")

data/spec/mailers/carton_mailer_spec.rb

@@ -8,7 +8,7 @@ describe Spree::CartonMailer do
   let(:carton) { create(:carton) }
   let(:order) { carton.orders.first }
 
-  # Regression test for #2196
+  # Regression test for https://github.com/spree/spree/issues/2196
   it "doesn't include out of stock in the email body" do
     shipment_email = Spree::CartonMailer.shipped_email(order: order, carton: carton)
     expect(shipment_email.body).not_to include(%Q{Out of Stock})

data/spec/mailers/order_mailer_spec.rb

@@ -74,7 +74,7 @@ describe Spree::OrderMailer, :type => :mailer do
   end
 
   context "displays unit costs from line item" do
-    # Regression test for #2772
+    # Regression test for https://github.com/spree/spree/issues/2772
 
     # Tests mailer view spree/order_mailer/confirm_email.text.erb
     specify do

data/spec/mailers/reimbursement_mailer_spec.rb

@@ -10,9 +10,7 @@ describe Spree::ReimbursementMailer, :type => :mailer do
   it "accepts a reimbursement id as an alternative to a Reimbursement object" do
     expect(Spree::Reimbursement).to receive(:find).with(reimbursement.id).and_return(reimbursement)
 
-    expect {
-      Spree::ReimbursementMailer.reimbursement_email(reimbursement.id).body
-    }.not_to raise_error
+    Spree::ReimbursementMailer.reimbursement_email(reimbursement.id).body
   end
 
   context "emails must be translatable" do

data/spec/mailers/test_mailer_spec.rb

@@ -8,8 +8,6 @@ describe Spree::TestMailer, :type => :mailer do
   let(:user) { create(:user) }
 
   it "confirm_email accepts a user id as an alternative to a User object" do
-    expect {
-      test_email = Spree::TestMailer.test_email('test@example.com')
-    }.not_to raise_error
+    Spree::TestMailer.test_email('test@example.com')
   end
 end

data/spec/models/spree/address_spec.rb

@@ -175,7 +175,7 @@ describe Spree::Address, :type => :model do
         end
       end
 
-      # Regression test for #1142
+      # Regression test for https://github.com/spree/spree/issues/1142
       it "uses the first available country if :default_country_id is set to an invalid value" do
         Spree::Config[:default_country_id] = "0"
         expect(Spree::Address.build_default.country).to eq default_country
@@ -277,14 +277,14 @@ describe Spree::Address, :type => :model do
       let(:base_attributes) do
         {
           'id' => 1,
-          'created_at' => Time.now,
-          'updated_at' => Time.now,
+          'created_at' => Time.current,
+          'updated_at' => Time.current,
           'address1' => '1234 way',
         }
       end
       let(:merge_attributes) do
         {
-          'updated_at' => Time.now,
+          'updated_at' => Time.current,
           'address2' => 'apt 2',
         }
       end

data/spec/models/spree/adjustment_reason_spec.rb

@@ -4,9 +4,7 @@ describe Spree::AdjustmentReason do
 
   describe 'creation' do
     it 'is successful' do
-      expect {
-        create(:adjustment_reason)
-      }.to_not raise_error
+      create(:adjustment_reason)
     end
   end
 

data/spec/models/spree/app_configuration_spec.rb

@@ -21,4 +21,8 @@ describe Spree::AppConfiguration, :type => :model do
     expect(prefs.variant_search_class).to eq Spree::Core::Search::Variant
   end
 
+  describe '#stock' do
+    subject { prefs.stock }
+    it { is_expected.to eq Spree::StockConfiguration }
+  end
 end

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

@@ -12,17 +12,17 @@ describe Spree::Calculator::PriceSack, :type => :model do
   let(:order) { stub_model(Spree::Order) }
   let(:shipment) { stub_model(Spree::Shipment, :amount => 10) }
 
-  # Regression test for #714 and #739
+  # 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
 
-  # Regression test for #1156
+  # Regression test for https://github.com/spree/spree/issues/1156
   it "computes with a shipment object" do
     calculator.compute(shipment)
   end
 
-  # Regression test for #2055
+  # 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)

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

@@ -12,17 +12,17 @@ describe Spree::Calculator::PriceSack, :type => :model do
   let(:order) { stub_model(Spree::Order) }
   let(:shipment) { stub_model(Spree::Shipment, :amount => 10) }
 
-  # Regression test for #714 and #739
+  # 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
 
-  # Regression test for #1156
+  # Regression test for https://github.com/spree/spree/issues/1156
   it "computes with a shipment object" do
     calculator.compute(shipment)
   end
 
-  # Regression test for #2055
+  # 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)

data/spec/models/spree/calculator/tiered_percent_spec.rb

@@ -26,22 +26,98 @@ describe Spree::Calculator::TieredPercent, :type => :model do
   end
 
   describe "#compute" do
-    let(:line_item) { mock_model Spree::LineItem, amount: amount }
+    let(:order) { create(:order_with_line_items, line_items_count: line_item_count, line_items_price: price) }
+    let(:price) { 10 }
+
     before do
       calculator.preferred_base_percent = 10
       calculator.preferred_tiers = {
-        100 => 15,
-        200 => 20
+        20 => 15,
+        30 => 20
       }
     end
-    subject { calculator.compute(line_item) }
-    context "when amount falls within the first tier" do
-      let(:amount) { 50 }
-      it { is_expected.to eq 5 }
+
+    context "with a line item" do
+      let(:line_item) { order.line_items.first }
+      subject { calculator.compute(line_item) }
+
+      context "for multiple line items" do
+        context "when amount falls within the first tier" do
+          let(:line_item_count) { 1 }
+          it { is_expected.to eq 1.0 }
+        end
+
+        context "when amount falls within the second tier" do
+          let(:line_item_count) { 2 }
+          it { is_expected.to eq 1.5 }
+        end
+
+        context "when amount falls within the third tier" do
+          let(:line_item_count) { 3 }
+          it { is_expected.to eq 2.0 }
+        end
+      end
+
+      context "for a single line item" do
+        let(:line_item_count) { 1 }
+
+        context "when amount falls within the first tier" do
+          let(:price) { 10 }
+          it { is_expected.to eq 1.0 }
+        end
+
+        context "when amount falls within the second tier" do
+          let(:price) { 20 }
+          it { is_expected.to eq 3.0 }
+        end
+
+        context "when amount falls within the third tier" do
+          let(:price) { 30 }
+          it { is_expected.to eq 6.0 }
+        end
+      end
     end
-    context "when amount falls within the second tier" do
-      let(:amount) { 150 }
-      it { is_expected.to eq 22 }
+
+    context "with an order" do
+      subject { calculator.compute(order) }
+
+      let(:line_item_count) { 1 }
+
+      context "for multiple line items" do
+        context "when amount falls within the first tier" do
+          let(:line_item_count) { 1 }
+          it { is_expected.to eq 1.0 }
+        end
+
+        context "when amount falls within the second tier" do
+          let(:line_item_count) { 2 }
+          it { is_expected.to eq 3.0 }
+        end
+
+        context "when amount falls within the third tier" do
+          let(:line_item_count) { 3 }
+          it { is_expected.to eq 6.0 }
+        end
+      end
+
+      context "for a single line item" do
+        let(:line_item_count) { 1 }
+
+        context "when amount falls within the first tier" do
+          let(:price) { 10 }
+          it { is_expected.to eq 1.0 }
+        end
+
+        context "when amount falls within the second tier" do
+          let(:price) { 20 }
+          it { is_expected.to eq 3.0 }
+        end
+
+        context "when amount falls within the third tier" do
+          let(:price) { 30 }
+          it { is_expected.to eq 6.0 }
+        end
+      end
     end
   end
 end

data/spec/models/spree/carton_spec.rb

@@ -6,7 +6,9 @@ describe Spree::Carton do
   describe "#create" do
     subject { carton }
 
-    it { expect { subject }.to_not raise_error }
+    it "raises no errors" do
+      subject
+    end
   end
 
   describe "#tracking_url" do

data/spec/models/spree/classification_spec.rb

@@ -2,12 +2,12 @@ require 'spec_helper'
 
 module Spree
   describe Classification, :type => :model do
-    # Regression test for #3494
+    # Regression test for https://github.com/spree/spree/issues/3494
     it "cannot link the same taxon to the same product more than once" do
       product = create(:product)
       taxon = create(:taxon)
       add_taxon = lambda { product.taxons << taxon }
-      expect(add_taxon).not_to raise_error
+      add_taxon.call
       expect(add_taxon).to raise_error(ActiveRecord::RecordInvalid)
     end
 
@@ -90,4 +90,4 @@ module Spree
       end
     end
   end
-end
+end

data/spec/models/spree/credit_card_spec.rb

@@ -5,7 +5,7 @@ describe Spree::CreditCard, type: :model do
     {
       number: '4111111111111111',
       verification_value: '123',
-      expiry: "12 / #{(Time.now.year + 1).to_s.last(2)}",
+      expiry: "12 / #{(Time.current.year + 1).to_s.last(2)}",
       name: 'Spree Commerce'
     }
   end
@@ -38,12 +38,12 @@ describe Spree::CreditCard, type: :model do
 
   context "#can_capture?" do
     it "should be true if payment is pending" do
-      payment = mock_model(Spree::Payment, pending?: true, created_at: Time.now)
+      payment = mock_model(Spree::Payment, pending?: true, created_at: Time.current)
       expect(credit_card.can_capture?(payment)).to be true
     end
 
     it "should be true if payment is checkout" do
-      payment = mock_model(Spree::Payment, pending?: false, checkout?: true, created_at: Time.now)
+      payment = mock_model(Spree::Payment, pending?: false, checkout?: true, created_at: Time.current)
       expect(credit_card.can_capture?(payment)).to be true
     end
   end
@@ -154,7 +154,7 @@ describe Spree::CreditCard, type: :model do
     end
   end
 
-  # Regression test for #3847 & #3896
+  # Regression test for https://github.com/spree/spree/issues/3847 and https://github.com/spree/spree/issues/3896
   context "#expiry=" do
     it "can set with a 2-digit month and year" do
       credit_card.expiry = '04 / 15'
@@ -193,12 +193,12 @@ describe Spree::CreditCard, type: :model do
     end
 
     it "does not blow up when passed an empty string" do
-      expect { credit_card.expiry = '' }.not_to raise_error
+      credit_card.expiry = ''
     end
 
-    # Regression test for #4725
+    # Regression test for https://github.com/spree/spree/issues/4725
     it "does not blow up when passed one number" do
-      expect { credit_card.expiry = '12' }.not_to raise_error
+      credit_card.expiry = '12'
     end
 
   end
@@ -254,7 +254,7 @@ describe Spree::CreditCard, type: :model do
 
   context "#associations" do
     it "should be able to access its payments" do
-      expect { credit_card.payments.to_a }.not_to raise_error
+      credit_card.payments.to_a
     end
   end
 
@@ -281,8 +281,8 @@ describe Spree::CreditCard, type: :model do
   context "#to_active_merchant" do
     before do
       credit_card.number = "4111111111111111"
-      credit_card.year = Time.now.year
-      credit_card.month = Time.now.month
+      credit_card.year = Time.current.year
+      credit_card.month = Time.current.month
       credit_card.name = "Ludwig van Beethoven"
       credit_card.verification_value = 123
     end
@@ -290,8 +290,8 @@ describe Spree::CreditCard, type: :model do
     it "converts to an ActiveMerchant::Billing::CreditCard object" do
       am_card = credit_card.to_active_merchant
       expect(am_card.number).to eq("4111111111111111")
-      expect(am_card.year).to eq(Time.now.year)
-      expect(am_card.month).to eq(Time.now.month)
+      expect(am_card.year).to eq(Time.current.year)
+      expect(am_card.month).to eq(Time.current.month)
       expect(am_card.first_name).to eq("Ludwig")
       expect(am_card.last_name).to eq("van Beethoven")
       expect(am_card.verification_value).to eq(123)
@@ -325,17 +325,17 @@ describe Spree::CreditCard, type: :model do
     user = FactoryGirl.create(:user)
     first = FactoryGirl.create(:credit_card, user: user, default: true)
     second = FactoryGirl.create(:credit_card, user: user, default: false)
-    first.update_columns(year: DateTime.now.year, month: 1.month.ago.month)
+    first.update_columns(year: DateTime.current.year, month: 1.month.ago.month)
 
-    expect { second.update_attributes!(default: true) }.not_to raise_error
+    second.update_attributes!(default: true)
   end
 
   it 'allows this card to save even if the previously default card has expired' do
     user = FactoryGirl.create(:user)
     first = FactoryGirl.create(:credit_card, user: user, default: true)
     second = FactoryGirl.create(:credit_card, user: user, default: false)
-    first.update_columns(year: DateTime.now.year, month: 1.month.ago.month)
+    first.update_columns(year: DateTime.current.year, month: 1.month.ago.month)
 
-    expect { second.update_attributes!(default: true) }.not_to raise_error
+    second.update_attributes!(default: true)
   end
 end

data/spec/models/spree/customer_return_spec.rb

@@ -202,7 +202,7 @@ describe Spree::CustomerReturn, :type => :model do
 
       it "should NOT raise an error when no stock item exists in the stock location" do
         inventory_unit.find_stock_item.destroy
-        expect { create(:customer_return_without_return_items, return_items: [return_item], stock_location_id: new_stock_location.id) }.not_to raise_error
+        create(:customer_return_without_return_items, return_items: [return_item], stock_location_id: new_stock_location.id)
       end
 
       it "should not update the stock item counts in the original stock location" do

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

@@ -4,7 +4,7 @@ describe Spree::Gateway::BogusSimple, :type => :model do
 
   subject { Spree::Gateway::BogusSimple.new }
 
-  # regression test for #3824
+  # regression test for https://github.com/spree/spree/issues/3824
   describe "#capture" do
     it "returns success with the right response code" do
       response = subject.capture(123, '12345', {})

data/spec/models/spree/inventory_unit_spec.rb

@@ -8,7 +8,7 @@ describe Spree::InventoryUnit, :type => :model do
   context "#backordered_for_stock_item" do
     let(:order) do
       order = create(:order, state: 'complete', ship_address: create(:ship_address))
-      order.completed_at = Time.now
+      order.completed_at = Time.current
       create(:shipment, order: order, stock_location: stock_location)
       order.shipments.reload
       create(:line_item, order: order, variant: stock_item.variant)
@@ -37,10 +37,10 @@ describe Spree::InventoryUnit, :type => :model do
       stock_item.set_count_on_hand(-2)
     end
 
-    # Regression for #3066
+    # Regression for https://github.com/spree/spree/issues/3066
     it "returns modifiable objects" do
       units = Spree::InventoryUnit.backordered_for_stock_item(stock_item)
-      expect { units.first.save! }.to_not raise_error
+      units.first.save!
     end
 
     it "finds inventory units from its stock location when the unit's variant matches the stock item's variant" do

data/spec/models/spree/item_adjustments_spec.rb

@@ -253,7 +253,7 @@ module Spree
           promo_c.update_column(:eligible, false)
         end
 
-        # regression for #3274
+        # regression for https://github.com/spree/spree/issues/3274
         it "still makes the previous best eligible adjustment valid" do
           subject.update
           expect(line_item.adjustments.promotion.eligible.first.label).to eq('Promotion A')

data/spec/models/spree/line_item_spec.rb

@@ -89,7 +89,7 @@ describe Spree::LineItem, :type => :model do
     end
   end
 
-  # Test for #3391
+  # 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
@@ -103,7 +103,7 @@ describe Spree::LineItem, :type => :model do
     end
   end
 
-  # Test for #3481
+  # 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