solidus_core 2.5.2 → 2.6.0.rc1

data/spec/models/spree/promotion_code_batch_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "rails_helper"
 
 RSpec.describe Spree::PromotionCodeBatch, type: :model do

data/spec/models/spree/promotion_code_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_helper'
 
 RSpec.describe Spree::PromotionCode do

data/spec/models/spree/promotion_handler/cart_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_helper'
 
 module Spree

data/spec/models/spree/promotion_handler/coupon_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_helper'
 
 module Spree
@@ -7,12 +9,12 @@ module Spree
 
       subject { Coupon.new(order) }
 
-      def expect_order_connection(order:, promotion:, promotion_code:nil)
+      def expect_order_connection(order:, promotion:, promotion_code: nil)
         expect(order.promotions.to_a).to include(promotion)
         expect(order.order_promotions.flat_map(&:promotion_code)).to include(promotion_code)
       end
 
-      def expect_adjustment_creation(adjustable:, promotion:, promotion_code:nil)
+      def expect_adjustment_creation(adjustable:, promotion:, promotion_code: nil)
         expect(adjustable.adjustments.map(&:source).map(&:promotion)).to include(promotion)
         expect(adjustable.adjustments.map(&:promotion_code)).to include(promotion_code)
       end

data/spec/models/spree/promotion_handler/page_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_helper'
 
 module Spree

data/spec/models/spree/promotion_handler/shipping_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_helper'
 
 module Spree

data/spec/models/spree/promotion_rule_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_helper'
 
 module Spree

data/spec/models/spree/promotion_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_helper'
 
 RSpec.describe Spree::Promotion, type: :model do
@@ -104,7 +106,7 @@ RSpec.describe Spree::Promotion, type: :model do
       promotion.created_at = 2.days.ago
 
       @user = create(:user)
-      @order = create(:order, user: @user, created_at: DateTime.current)
+      @order = create(:order, user: @user, created_at: Time.current)
       @payload = { order: @order, user: @user }
     end
 
@@ -131,7 +133,7 @@ RSpec.describe Spree::Promotion, type: :model do
 
     it "does activate if newer then order" do
       expect(@action1).to receive(:perform).with(hash_including(@payload))
-      promotion.created_at = DateTime.current + 2
+      promotion.created_at = Time.current + 2
       expect(promotion.activate(@payload)).to be true
     end
 

data/spec/models/spree/refund_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_helper'
 
 RSpec.describe Spree::Refund, type: :model do

data/spec/models/spree/reimbursement/credit_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_helper'
 
 module Spree

data/spec/models/spree/reimbursement/reimbursement_type_engine_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_helper'
 
 module Spree

data/spec/models/spree/reimbursement/reimbursement_type_validator_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_helper'
 
 module Spree

data/spec/models/spree/reimbursement_performer_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_helper'
 
 RSpec.describe Spree::ReimbursementPerformer, type: :model do

data/spec/models/spree/reimbursement_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_helper'
 
 RSpec.describe Spree::Reimbursement, type: :model do

data/spec/models/spree/reimbursement_tax_calculator_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_helper'
 
 RSpec.describe Spree::ReimbursementTaxCalculator, type: :model do

data/spec/models/spree/reimbursement_type/credit_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_helper'
 
 module Spree

data/spec/models/spree/reimbursement_type/exchange_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_helper'
 
 module Spree

data/spec/models/spree/reimbursement_type/original_payment_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_helper'
 
 module Spree

data/spec/models/spree/reimbursement_type/store_credit_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_helper'
 
 module Spree

data/spec/models/spree/return_authorization_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_helper'
 
 RSpec.describe Spree::ReturnAuthorization, type: :model do

data/spec/models/spree/return_item/eligibility_validator/default_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_helper'
 
 RSpec.describe Spree::ReturnItem::EligibilityValidator::Default, type: :model do

data/spec/models/spree/return_item/eligibility_validator/inventory_shipped_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_helper'
 
 RSpec.describe Spree::ReturnItem::EligibilityValidator::InventoryShipped do

data/spec/models/spree/return_item/eligibility_validator/no_reimbursements_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_helper'
 
 RSpec.describe Spree::ReturnItem::EligibilityValidator::NoReimbursements do

data/spec/models/spree/return_item/eligibility_validator/order_completed_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_helper'
 
 RSpec.describe Spree::ReturnItem::EligibilityValidator::OrderCompleted do

data/spec/models/spree/return_item/eligibility_validator/rma_required_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_helper'
 
 RSpec.describe Spree::ReturnItem::EligibilityValidator::RMARequired, type: :model do

data/spec/models/spree/return_item/eligibility_validator/time_since_purchase_spec.rb

@@ -1,30 +1,37 @@
+# frozen_string_literal: true
+
 require 'rails_helper'
 
 RSpec.describe Spree::ReturnItem::EligibilityValidator::TimeSincePurchase, type: :model do
-  let(:inventory_unit) { create(:inventory_unit, shipment: create(:shipped_order).shipments.first) }
-  let(:return_item)    { create(:return_item, inventory_unit: inventory_unit) }
-  let(:validator)      { Spree::ReturnItem::EligibilityValidator::TimeSincePurchase.new(return_item) }
+  include ActiveSupport::Testing::TimeHelpers
+
+  let(:return_item) { instance_double(Spree::ReturnItem) }
+  let(:validator) { described_class.new(return_item) }
 
   describe "#eligible_for_return?" do
     subject { validator.eligible_for_return? }
 
+    let(:interval) { Spree::Config[:return_eligibility_number_of_days] }
+
+    before do
+      allow(return_item).
+        to receive_message_chain('inventory_unit.order.completed_at').
+        and_return(completed_at)
+    end
+
+    around(:each) do |e|
+      travel_to(Time.current) { e.run }
+    end
+
     context "it is within the return timeframe" do
-      it "returns true" do
-        completed_at = return_item.inventory_unit.order.completed_at - (Spree::Config[:return_eligibility_number_of_days].days / 2)
-        return_item.inventory_unit.order.update_attributes(completed_at: completed_at)
-        expect(subject).to be true
-      end
+      let(:completed_at) { 1.day.ago }
+      it { is_expected.to be_truthy }
     end
 
     context "it is past the return timeframe" do
-      before do
-        completed_at = return_item.inventory_unit.order.completed_at - Spree::Config[:return_eligibility_number_of_days].days - 1.day
-        return_item.inventory_unit.order.update_attributes(completed_at: completed_at)
-      end
+      let(:completed_at) { interval.day.ago }
 
-      it "returns false" do
-        expect(subject).to be false
-      end
+      it { is_expected.to be_falsy }
 
       it "sets an error" do
         subject

data/spec/models/spree/return_item/exchange_variant_eligibility/same_option_value_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_helper'
 
 module Spree

data/spec/models/spree/return_item/exchange_variant_eligibility/same_product_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_helper'
 
 module Spree

data/spec/models/spree/return_item_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_helper'
 
 RSpec.shared_examples "an invalid state transition" do |status, expected_status|

data/spec/models/spree/returns_calculator_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_helper'
 
 module Spree

data/spec/models/spree/shipment_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_helper'
 require 'benchmark'
 
@@ -78,7 +80,7 @@ RSpec.describe Spree::Shipment, type: :model do
     end
 
     it 'returns pending if backordered' do
-      allow(shipment).to receive_messages inventory_units: [mock_model(Spree::InventoryUnit, allow_ship?: false, canceled?: false)]
+      allow(shipment).to receive_messages inventory_units: [mock_model(Spree::InventoryUnit, allow_ship?: false, canceled?: false, shipped?: false)]
       expect(shipment.determine_state(order)).to eq 'pending'
     end
 
@@ -298,7 +300,7 @@ RSpec.describe Spree::Shipment, type: :model do
         # Set as ready so we can test for change
         shipment.update_attributes!(state: 'ready')
 
-        allow(shipment).to receive_messages(inventory_units: [mock_model(Spree::InventoryUnit, allow_ship?: false, canceled?: false)])
+        allow(shipment).to receive_messages(inventory_units: [mock_model(Spree::InventoryUnit, allow_ship?: false, canceled?: false, shipped?: false)])
         expect(shipment).to receive(:update_columns).with(state: 'pending', updated_at: kind_of(Time))
         shipment.update_state
       end
@@ -677,8 +679,8 @@ RSpec.describe Spree::Shipment, type: :model do
 
       shipment.destroy
 
-      expect{shipping_rate.reload}.to raise_error(ActiveRecord::RecordNotFound)
-      expect{shipping_rate_tax.reload}.to raise_error(ActiveRecord::RecordNotFound)
+      expect{ shipping_rate.reload }.to raise_error(ActiveRecord::RecordNotFound)
+      expect{ shipping_rate_tax.reload }.to raise_error(ActiveRecord::RecordNotFound)
     end
   end
 
@@ -863,4 +865,43 @@ RSpec.describe Spree::Shipment, type: :model do
       end
     end
   end
+
+  describe '#can_transition_from_pending_to_ready?' do
+    let(:shipment) { create(:shipment, order: order) }
+
+    subject { shipment.can_transition_from_pending_to_ready? }
+
+    context "with backordered inventory" do
+      before { shipment.inventory_units.update_all(state: "backordered") }
+
+      it "returns false" do
+        expect(subject).to be false
+      end
+    end
+
+    context "with on_hand inventory" do
+      before { shipment.inventory_units.update_all(state: "on_hand") }
+
+      it "returns true" do
+        expect(subject).to be true
+      end
+    end
+
+    context "with shipped inventory" do
+      before { shipment.inventory_units.update_all(state: "shipped") }
+
+      it "returns true" do
+        expect(subject).to be true
+      end
+    end
+  end
+
+  describe '#cartons' do
+    let(:carton)   { create(:carton) }
+    let(:shipment) { carton.shipments.first }
+
+    subject { shipment.cartons }
+
+    it { is_expected.to include carton }
+  end
 end

data/spec/models/spree/shipping_calculator_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_helper'
 
 module Spree

data/spec/models/spree/shipping_manifest_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_helper'
 
 module Spree

data/spec/models/spree/shipping_method_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_helper'
 
 class DummyShippingCalculator < Spree::ShippingCalculator

data/spec/models/spree/shipping_rate_spec.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 require 'rails_helper'
 

data/spec/models/spree/shipping_rate_tax_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_helper'
 
 module Spree

data/spec/models/spree/state_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_helper'
 
 RSpec.describe Spree::State, type: :model do

data/spec/models/spree/stock/availability_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_helper'
 
 module Spree::Stock

data/spec/models/spree/stock/availability_validator_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_helper'
 
 module Spree

data/spec/models/spree/stock/differentiator_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_helper'
 
 module Spree

data/spec/models/spree/stock/estimator_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_helper'
 
 module Spree
@@ -139,8 +141,36 @@ module Spree
           end
         end
 
+        context "excludes shipping methods from other stores" do
+          before{ Spree::ShippingMethod.all.each(&:really_destroy!) }
+
+          let!(:other_method) do
+            create(
+              :shipping_method,
+              cost: 0.00,
+              stores: [build(:store, name: "Other")]
+            )
+          end
+
+          let!(:main_method) do
+            create(
+              :shipping_method,
+              cost: 5.00,
+              stores: [order.store]
+            )
+          end
+
+          it "does not return the other rate at all" do
+            expect(subject.shipping_rates(package).map(&:shipping_method_id)).to eq([main_method.id])
+          end
+
+          it "doesn't select the other rate even if it's more affordable" do
+            expect(subject.shipping_rates(package).map(&:selected)).to eq [true]
+          end
+        end
+
         context "includes tax adjustments if applicable" do
-          let(:zone) { create(:zone, countries: [order.tax_address.country])}
+          let(:zone) { create(:zone, countries: [order.tax_address.country]) }
 
           let!(:tax_rate) { create(:tax_rate, zone: zone) }