solidus_core 1.2.3 → 1.3.0.beta1

data/spec/models/spree/taxon_spec.rb

@@ -2,15 +2,16 @@
 
 require 'spec_helper'
 
-describe Spree::Taxon, :type => :model do
-  let(:taxon) { FactoryGirl.build(:taxon, :name => "Ruby on Rails") }
-
+describe Spree::Taxon, type: :model do
   describe '#to_param' do
+    let(:taxon) { FactoryGirl.build(:taxon, name: "Ruby on Rails") }
+
     subject { super().to_param }
     it { is_expected.to eql taxon.permalink }
   end
 
   context "set_permalink" do
+    let(:taxon) { FactoryGirl.build(:taxon, name: "Ruby on Rails") }
 
     it "should set permalink correctly when no parent present" do
       taxon.set_permalink
@@ -24,7 +25,7 @@ describe Spree::Taxon, :type => :model do
     end
 
     context "with parent taxon" do
-      let(:parent) { FactoryGirl.build(:taxon, :permalink => "brands") }
+      let(:parent) { FactoryGirl.build(:taxon, permalink: "brands") }
       before       { allow(taxon).to receive_messages parent: parent }
 
       it "should set permalink correctly when taxon has parent" do
@@ -59,7 +60,70 @@ describe Spree::Taxon, :type => :model do
           end
         end
       end
+    end
+  end
+
+  context "updating permalink" do
+    let(:taxonomy) { create(:taxonomy, name: 't') }
+    let(:root) { taxonomy.root }
+    let(:taxon1) { create(:taxon, name: 't1', taxonomy: taxonomy, parent: root) }
+    let(:taxon2) { create(:taxon, name: 't2', taxonomy: taxonomy, parent: root) }
+    let(:taxon2_child) { create(:taxon, name: 't2_child', taxonomy: taxonomy, parent: taxon2) }
+
+    context "changing parent" do
+      subject do
+        -> { taxon2.update!(parent: taxon1) }
+      end
+
+      it "changes own permalink" do
+        is_expected.to change{ taxon2.reload.permalink }.from('t/t2').to('t/t1/t2')
+      end
+
+      it "changes child's permalink" do
+        is_expected.to change{ taxon2_child.reload.permalink }.from('t/t2/t2-child').to('t/t1/t2/t2-child')
+      end
+    end
+
+    context "changing own permalink" do
+      subject do
+        -> { taxon2.update!(permalink: 'foo') }
+      end
+
+      it "changes own permalink" do
+        is_expected.to change{ taxon2.reload.permalink }.from('t/t2').to('t/foo')
+      end
 
+      it "changes child's permalink" do
+        is_expected.to change{ taxon2_child.reload.permalink }.from('t/t2/t2-child').to('t/foo/t2-child')
+      end
+    end
+
+    context "changing own permalink part" do
+      subject do
+        -> { taxon2.update!(permalink_part: 'foo') }
+      end
+
+      it "changes own permalink" do
+        is_expected.to change{ taxon2.reload.permalink }.from('t/t2').to('t/foo')
+      end
+
+      it "changes child's permalink" do
+        is_expected.to change{ taxon2_child.reload.permalink }.from('t/t2/t2-child').to('t/foo/t2-child')
+      end
+    end
+
+    context "changing parent and own permalink" do
+      subject do
+        -> { taxon2.update!(parent: taxon1, permalink: 'foo') }
+      end
+
+      it "changes own permalink" do
+        is_expected.to change{ taxon2.reload.permalink }.from('t/t2').to('t/t1/foo')
+      end
+
+      it "changes child's permalink" do
+        is_expected.to change{ taxon2_child.reload.permalink }.from('t/t2/t2-child').to('t/t1/foo/t2-child')
+      end
     end
   end
 
@@ -68,7 +132,7 @@ describe Spree::Taxon, :type => :model do
     let(:taxonomy) { create(:taxonomy) }
 
     it "does not error out" do
-      taxonomy.root.children.unscoped.where(:name => "Some name").first_or_create
+      taxonomy.root.children.unscoped.where(name: "Some name").first_or_create
     end
   end
 end

data/spec/models/spree/taxonomy_spec.rb

@@ -1,11 +1,11 @@
 require 'spec_helper'
 
-describe Spree::Taxonomy, :type => :model do
+describe Spree::Taxonomy, type: :model do
   context "#destroy" do
     before do
        @taxonomy = create(:taxonomy)
        @root_taxon = @taxonomy.root
-       @child_taxon = create(:taxon, :taxonomy_id => @taxonomy.id, :parent => @root_taxon)
+       @child_taxon = create(:taxon, taxonomy_id: @taxonomy.id, parent: @root_taxon)
     end
 
     it "should destroy all associated taxons" do
@@ -15,4 +15,3 @@ describe Spree::Taxonomy, :type => :model do
     end
   end
 end
-

data/spec/models/spree/tracker_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Spree::Tracker, :type => :model do
+describe Spree::Tracker, type: :model do
   describe "current" do
     before(:each) { @tracker = create(:tracker) }
 

data/spec/models/spree/transfer_item_spec.rb

@@ -232,7 +232,7 @@ describe Spree::TransferItem do
     context "scopes" do
       let(:partially_received) { stock_transfer.transfer_items.first }
       let(:fully_received) { stock_transfer.transfer_items.last }
-      let(:variant) { create(:variant)}
+      let(:variant) { create(:variant) }
 
       before do
         fully_received.update_attributes(expected_quantity: 1, received_quantity: 1)

data/spec/models/spree/unit_cancel_spec.rb

@@ -12,7 +12,7 @@ describe Spree::UnitCancel do
 
       adjustment = Spree::Adjustment.last
       expect(adjustment.adjustable).to eq inventory_unit.line_item
-      expect(adjustment.amount).to eq -10.0
+      expect(adjustment.amount).to eq(-10.0)
       expect(adjustment.order).to eq inventory_unit.order
       expect(adjustment.label).to eq "Cancellation - Short Ship"
       expect(adjustment).to be_eligible
@@ -36,7 +36,7 @@ describe Spree::UnitCancel do
 
     context "all inventory on the line item are not canceled" do
       it "divides the line item total by the inventory units size" do
-        expect(subject).to eq -5.0
+        expect(subject).to eq(-5.0)
       end
     end
 
@@ -44,7 +44,7 @@ describe Spree::UnitCancel do
       before { inventory_unit2.cancel! }
 
       it "divides the line item total by the uncanceled units size" do
-        expect(subject).to eq -10.0
+        expect(subject).to eq(-10.0)
       end
     end
 
@@ -68,12 +68,8 @@ describe Spree::UnitCancel do
       end
 
       before do
-        @old_expedited_exchanges_value = Spree::Config[:expedited_exchanges]
         Spree::Config[:expedited_exchanges] = true
       end
-      after do
-        Spree::Config[:expedited_exchanges] = @old_expedited_exchanges_value
-      end
 
       # This sets up an order with one shipped inventory unit, one unshipped
       # inventory unit, and one unshipped exchange inventory unit.
@@ -95,7 +91,7 @@ describe Spree::UnitCancel do
           inventory_units: [@shipped_inventory_unit],
           stock_location: @shipment.stock_location,
           address: order.ship_address,
-          shipping_method: @shipment.shipping_method,
+          shipping_method: @shipment.shipping_method
         )
 
         # Create an expedited exchange for the shipped inventory unit.
@@ -107,9 +103,9 @@ describe Spree::UnitCancel do
           return_items: [
             Spree::ReturnItem.new(
               inventory_unit: @shipped_inventory_unit,
-              exchange_variant: exchange_variant,
-            ),
-          ],
+              exchange_variant: exchange_variant
+            )
+          ]
         )
         @exchange_inventory_unit = order.inventory_units.reload[2]
       end
@@ -122,7 +118,7 @@ describe Spree::UnitCancel do
         let(:unit_cancel) do
           Spree::UnitCancel.create!(
             inventory_unit: @unshipped_inventory_unit,
-            reason: Spree::UnitCancel::SHORT_SHIP,
+            reason: Spree::UnitCancel::SHORT_SHIP
           )
         end
 
@@ -137,7 +133,7 @@ describe Spree::UnitCancel do
         let(:unit_cancel) do
           Spree::UnitCancel.create!(
             inventory_unit: @exchange_inventory_unit,
-            reason: Spree::UnitCancel::SHORT_SHIP,
+            reason: Spree::UnitCancel::SHORT_SHIP
           )
         end
 
@@ -145,5 +141,4 @@ describe Spree::UnitCancel do
       end
     end
   end
-
 end

data/spec/models/spree/user_spec.rb

@@ -1,12 +1,11 @@
 require 'spec_helper'
 
-describe Spree::LegacyUser, :type => :model do
+describe Spree::LegacyUser, type: :model do
   context "#last_incomplete_order" do
     let!(:user) { create(:user) }
 
-
     it "excludes orders that are not frontend_viewable" do
-      order = create(:order, user: user, frontend_viewable: false)
+      create(:order, user: user, frontend_viewable: false)
       expect(user.last_incomplete_spree_order).to eq nil
     end
 
@@ -18,51 +17,45 @@ describe Spree::LegacyUser, :type => :model do
     it "can scope to a store" do
       store = create(:store)
       store_1_order = create(:order, user: user, store: store)
-      store_2_order = create(:order, user: user, store: create(:store))
+      create(:order, user: user, store: create(:store))
       expect(user.last_incomplete_spree_order(store: store)).to eq store_1_order
     end
 
     it "excludes completed orders" do
-      order = create(:completed_order_with_totals, user: user, created_by: user)
+      create(:completed_order_with_totals, user: user, created_by: user)
       expect(user.last_incomplete_spree_order).to eq nil
     end
 
     it "excludes orders created prior to the user's last completed order" do
-      incomplete_order = create(:order, user: user, created_by: user, created_at: 1.second.ago)
-      completed_order = create(:completed_order_with_totals, user: user, created_by: user)
+      create(:order, user: user, created_by: user, created_at: 1.second.ago)
+      create(:completed_order_with_totals, user: user, created_by: user)
       expect(user.last_incomplete_spree_order).to eq nil
     end
 
     context "with completable_order_created_cutoff set" do
       before do
-        @original_order_cutoff_preference = Spree::Config.completable_order_created_cutoff_days
         Spree::Config.completable_order_created_cutoff_days = 1
       end
 
-      after { Spree::Config.completable_order_created_cutoff_days = @original_order_cutoff_preference }
-
       it "excludes orders updated outside of the cutoff date" do
-        incomplete_order = create(:order, user: user, created_by: user, created_at: 3.days.ago, updated_at: 2.days.ago)
+        create(:order, user: user, created_by: user, created_at: 3.days.ago, updated_at: 2.days.ago)
         expect(user.last_incomplete_spree_order).to eq nil
       end
     end
 
     context "with completable_order_created_cutoff set" do
       before do
-        @original_order_cutoff_preference = Spree::Config.completable_order_updated_cutoff_days
         Spree::Config.completable_order_updated_cutoff_days = 1
       end
 
-      after { Spree::Config.completable_order_updated_cutoff_days = @original_order_cutoff_preference }
-
       it "excludes orders updated outside of the cutoff date" do
-        incomplete_order = create(:order, user: user, created_by: user, created_at: 3.days.ago, updated_at: 2.days.ago)
+        create(:order, user: user, created_by: user, created_at: 3.days.ago, updated_at: 2.days.ago)
         expect(user.last_incomplete_spree_order).to eq nil
       end
     end
 
     it "chooses the most recently created incomplete order" do
-      order_1 = create(:order, user: user, created_at: 1.second.ago)
+      create(:order, user: user, created_at: 1.second.ago)
       order_2 = create(:order, user: user)
       expect(user.last_incomplete_spree_order).to eq order_2
     end
@@ -103,14 +96,16 @@ describe Spree::LegacyUser, :type => :model do
       end
 
       it "drops payment source" do
-        user.drop_payment_source cc
+        ActiveSupport::Deprecation.silence do
+          user.drop_payment_source cc
+        end
         expect(cc.gateway_customer_profile_id).to be_nil
       end
     end
   end
 end
 
-describe Spree.user_class, :type => :model do
+describe Spree.user_class, type: :model do
   context "reporting" do
     let(:order_value) { BigDecimal.new("80.94") }
     let(:order_count) { 4 }
@@ -129,7 +124,7 @@ describe Spree.user_class, :type => :model do
       context "with orders" do
         before { load_orders }
         it "returns the total of completed orders for the user" do
-          expect(subject.lifetime_value).to eq (order_count * order_value)
+          expect(subject.lifetime_value).to eq(order_count * order_value)
         end
       end
       context "without orders" do
@@ -207,13 +202,13 @@ describe Spree.user_class, :type => :model do
           before { additional_store_credit.update_attributes(amount_authorized: authorized_amount) }
 
           it "returns sum of amounts minus used amount and authorized amount" do
-            expect(subject.total_available_store_credit.to_f).to eq (amount + additional_amount - amount_used - authorized_amount)
+            expect(subject.total_available_store_credit.to_f).to eq(amount + additional_amount - amount_used - authorized_amount)
           end
         end
 
         context "there are no authorized amounts on any of the store credits" do
           it "returns sum of amounts minus used amount" do
-            expect(subject.total_available_store_credit.to_f).to eq (amount + additional_amount - amount_used)
+            expect(subject.total_available_store_credit.to_f).to eq(amount + additional_amount - amount_used)
           end
         end
       end
@@ -225,20 +220,20 @@ describe Spree.user_class, :type => :model do
           before { additional_store_credit.update_attributes(amount_authorized: authorized_amount) }
 
           it "returns sum of amounts minus authorized amount" do
-            expect(subject.total_available_store_credit.to_f).to eq (amount + additional_amount - authorized_amount)
+            expect(subject.total_available_store_credit.to_f).to eq(amount + additional_amount - authorized_amount)
           end
         end
 
         context "there are no authorized amounts on any of the store credits" do
           it "returns sum of amounts" do
-            expect(subject.total_available_store_credit.to_f).to eq (amount + additional_amount)
+            expect(subject.total_available_store_credit.to_f).to eq(amount + additional_amount)
           end
         end
       end
 
       context "all store credits have never been used or authorized" do
         it "returns sum of amounts" do
-          expect(subject.total_available_store_credit.to_f).to eq (amount + additional_amount)
+          expect(subject.total_available_store_credit.to_f).to eq(amount + additional_amount)
         end
       end
     end

data/spec/models/spree/validations/db_maximum_length_validator_spec.rb

@@ -9,7 +9,7 @@ describe Spree::Validations::DbMaximumLengthValidator, type: :model do
     end
     let(:limit) { 255 }
     let(:product) { Spree::Product.new }
-    let(:slug) { "x" * (limit + 1)}
+    let(:slug) { "x" * (limit + 1) }
 
     before do
       product.slug = slug

data/spec/models/spree/variant/pricer_spec.rb

@@ -0,0 +1,48 @@
+require 'spec_helper'
+
+describe Spree::Variant::Pricer do
+  let(:variant) { build_stubbed(:variant) }
+
+  subject { described_class.new(variant) }
+
+  it { is_expected.to respond_to(:variant) }
+  it { is_expected.to respond_to(:price_for) }
+
+  describe ".pricing_options_class" do
+    it "returns the standard pricing options class" do
+      expect(described_class.pricing_options_class).to eq(Spree::Variant::PricingOptions)
+    end
+  end
+
+  describe "#price_for(options)" do
+    let(:variant) { create(:variant, price: 12.34) }
+
+    context "with the default currency" do
+      let(:pricing_options) { described_class.pricing_options_class.new(currency: "USD") }
+
+      it "returns the correct (default) price as a Spree::Money object" do
+        expect(subject.price_for(pricing_options)).to eq(Spree::Money.new(12.34, currency: "USD"))
+      end
+    end
+
+    context "with a different currency" do
+      let(:pricing_options) { described_class.pricing_options_class.new(currency: "EUR") }
+
+      context "when there is a price for that currency" do
+        before do
+          variant.prices.create(amount: 99.00, currency: "EUR")
+        end
+
+        it "returns the price in the correct currency as a Spree::Money object" do
+          expect(subject.price_for(pricing_options)).to eq(Spree::Money.new(99.00, currency: "EUR"))
+        end
+      end
+
+      context "when there is no price for that currency" do
+        it "returns nil" do
+          expect(subject.price_for(pricing_options)).to be_nil
+        end
+      end
+    end
+  end
+end

data/spec/models/spree/variant/pricing_options_spec.rb

@@ -0,0 +1,106 @@
+require 'spec_helper'
+
+describe Spree::Variant::PricingOptions do
+  subject { described_class.new }
+
+  context '.default_price_attributes' do
+    it 'can be passed into a WHERE clause on Spree::Prices' do
+      expect(Spree::Price.where(described_class.default_price_attributes).to_a).to eq([])
+    end
+
+    context "with a matching price present" do
+      let!(:price) { create(:price) }
+
+      it 'returns a matching price' do
+        expect(Spree::Price.where(described_class.default_price_attributes).to_a).to include(price)
+      end
+    end
+  end
+
+  context ".from_line_item" do
+    let(:line_item) { build_stubbed(:line_item, currency: "USD") }
+    subject { described_class.from_line_item(line_item) }
+
+    it "returns the order's currency" do
+      expect(subject.desired_attributes[:currency]).to eq("USD")
+    end
+
+    context "if line item has no order" do
+      before do
+        expect(line_item).to receive(:order).and_return(nil)
+      end
+
+      it "returns the line item's currency" do
+        expect(subject.desired_attributes[:currency]).to eq("USD")
+      end
+    end
+
+    context "if line item's order has no currency" do
+      before do
+        expect(line_item.order).to receive(:currency).and_return(nil)
+      end
+
+      it "returns the line item's currency" do
+        expect(subject.desired_attributes[:currency]).to eq("USD")
+      end
+    end
+
+    context "if neither order nor line item have a currency" do
+      before do
+        expect(line_item).to receive(:currency).and_return(nil)
+        expect(line_item).to receive(:order).and_return(nil)
+        expect(Spree::Config).to receive(:currency).at_least(:once).and_return("RUB")
+      end
+
+      it "returns the configured default currency" do
+        expect(subject.desired_attributes[:currency]).to eq("RUB")
+      end
+    end
+  end
+
+  describe '#desired_attributes' do
+    context "when called with no arguments" do
+      it "returns the default pricing options" do
+        expect(subject.desired_attributes).to eq(described_class.default_price_attributes)
+      end
+    end
+
+    context "when called with a different currency" do
+      subject { described_class.new(currency: "EUR") }
+
+      it "returns a Hash with the correct currency" do
+        expect(subject.desired_attributes[:currency]).to eq("EUR")
+      end
+    end
+  end
+
+  describe "#currency" do
+    context "when initialized with no currency" do
+      it "returns the default currency" do
+        expect(Spree::Config.currency).to eq("USD")
+        expect(subject.currency).to eq("USD")
+      end
+    end
+
+    context "when initialized with a different currency" do
+      subject { described_class.new(currency: "EUR") }
+
+      it "returns that currency" do
+        expect(subject.currency).to eq("EUR")
+      end
+    end
+  end
+
+  describe "#cache_key" do
+    it 'creates a cache key out of the values of the attributes hash' do
+      expect(subject.cache_key).to eq("USD")
+    end
+
+    context "with another currency" do
+      subject { described_class.new(currency: "EUR") }
+      it 'creates the correct cache key' do
+        expect(subject.cache_key).to eq("EUR")
+      end
+    end
+  end
+end

data/spec/models/spree/variant/scopes_spec.rb

@@ -1,29 +1,51 @@
 require 'spec_helper'
 
-describe "Variant scopes", :type => :model do
+describe "Variant scopes", type: :model do
   let!(:product) { create(:product) }
-  let!(:variant_1) { create(:variant, :product => product) }
-  let!(:variant_2) { create(:variant, :product => product) }
+  let!(:variant_1) { create(:variant, product: product) }
+  let!(:variant_2) { create(:variant, product: product) }
+
+  context ".with_prices" do
+    context "when searching for the default pricing options" do
+      it "finds all variants" do
+        expect(Spree::Variant.with_prices).to contain_exactly(product.master, variant_1, variant_2)
+      end
+    end
+
+    context "when searching for different pricing options" do
+      let(:pricing_options) { Spree::Config.pricing_options_class.new(currency: "EUR") }
+      context "when only one variant has price in Euro" do
+        before do
+          variant_1.prices.create(amount: 99.00, currency: "EUR")
+        end
+
+        context "and we search for variants with only prices in Euro" do
+          it "finds the one variant with a price in Euro" do
+            expect(Spree::Variant.with_prices(pricing_options)).to contain_exactly(variant_1)
+          end
+        end
+      end
+    end
+  end
 
   it ".descend_by_popularity" do
     # Requires a product with at least two variants, where one has a higher number of
     # orders than the other
     Spree::LineItem.delete_all # FIXME leaky database - too many line_items
-    create(:line_item, :variant => variant_1)
+    create(:line_item, variant: variant_1)
     expect(Spree::Variant.descend_by_popularity.first).to eq(variant_1)
   end
 
-
   context "finding by option values" do
-    let!(:option_type) { create(:option_type, :name => "bar") }
+    let!(:option_type) { create(:option_type, name: "bar") }
     let!(:option_value_1) do
-      option_value = create(:option_value, :name => "foo", :option_type => option_type)
+      option_value = create(:option_value, name: "foo", option_type: option_type)
       variant_1.option_values << option_value
       option_value
     end
 
     let!(:option_value_2) do
-      option_value = create(:option_value, :name => "fizz", :option_type => option_type)
+      option_value = create(:option_value, name: "fizz", option_type: option_type)
       variant_1.option_values << option_value
       option_value
     end
@@ -50,6 +72,7 @@ describe "Variant scopes", :type => :model do
 
     it "by mixed conditions" do
       variants = product_variants.has_option(option_type.id, "foo", option_value_2)
+      expect(variants).to be_empty
     end
   end
 end

data/spec/models/spree/variant_property_rule_spec.rb

@@ -53,7 +53,7 @@ describe Spree::VariantPropertyRule, type: :model do
   describe "#applies_to_variant?" do
     let(:variant_option_value_1) { create(:option_value) }
     let(:variant_option_value_2) { create(:option_value) }
-    let!(:variant) { create(:variant, option_values: option_values)}
+    let!(:variant) { create(:variant, option_values: option_values) }
 
     let(:rule_option_value) { create(:option_value) }
     let(:rule) { create(:variant_property_rule, option_value: rule_option_value) }