solidus_core 2.0.3 → 2.1.0.beta1

data/spec/models/spree/tax_rate_spec.rb

@@ -104,7 +104,7 @@ describe Spree::TaxRate, type: :model do
       end
 
       context "when there is a default tax zone" do
-        let(:default_zone) { create(:zone, :with_country, default_tax: true) }
+        let(:default_zone) { create(:zone, :with_country) }
         let(:included_in_price) { false }
         let!(:rate) do
           create(:tax_rate, zone: default_zone, included_in_price: included_in_price)
@@ -133,30 +133,6 @@ describe Spree::TaxRate, type: :model do
     end
   end
 
-  context ".adjust" do
-    let(:zone) { stub_model(Spree::Zone) }
-
-    context "with line items" do
-      let(:line_item) { stub_model(Spree::LineItem) }
-
-      it 'should emit a deprecation warning and call the item adjuster' do
-        expect(Spree::Deprecation).to receive(:warn)
-        expect(Spree::Tax::ItemAdjuster).to receive_message_chain(:new, :adjust!)
-        Spree::TaxRate.adjust(zone, [line_item])
-      end
-    end
-
-    context "with shipments" do
-      let(:shipment) { stub_model(Spree::Shipment) }
-
-      it 'should emit a deprecation warning and call the item adjuster' do
-        expect(Spree::Deprecation).to receive(:warn)
-        expect(Spree::Tax::ItemAdjuster).to receive_message_chain(:new, :adjust!)
-        Spree::TaxRate.adjust(zone, [shipment])
-      end
-    end
-  end
-
   describe "#adjust" do
     let(:taxable_address) { create(:address) }
     let(:order) { create(:order_with_line_items, ship_address: order_address) }
@@ -176,7 +152,10 @@ describe Spree::TaxRate, type: :model do
 
     describe 'adjustments' do
       before do
-        tax_rate.adjust(order.tax_zone, item)
+        # Please remove this silencing once we remove `Spree::Zone.default_tax`
+        Spree::Deprecation.silence do
+          tax_rate.adjust(nil, item)
+        end
       end
 
       let(:adjustment_label) { item.adjustments.tax.first.label }

data/spec/models/spree/transfer_item_spec.rb

@@ -261,4 +261,15 @@ describe Spree::TransferItem do
       end
     end
   end
+
+  describe "variant association" do
+    context "variant has been soft-deleted" do
+      before do
+        subject.variant.destroy
+      end
+      it "still returns the variant" do
+        expect(subject.variant).not_to be_nil
+      end
+    end
+  end
 end

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

@@ -23,7 +23,7 @@ describe Spree::Variant::PricingOptions do
   end
 
   context ".from_line_item" do
-    let(:line_item) { build_stubbed(:line_item, currency: "USD") }
+    let(:line_item) { build_stubbed(:line_item) }
     subject { described_class.from_line_item(line_item) }
 
     it "returns the order's currency" do
@@ -34,29 +34,19 @@ describe Spree::Variant::PricingOptions do
       expect(subject.desired_attributes[:country_iso]).to eq("US")
     end
 
-    context "if line item has no order" do
-      before do
-        expect(line_item).to receive(:order).at_least(:once).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
+    context 'if order has no currency' do
       before do
-        expect(line_item.order).to receive(:currency).and_return(nil)
+        expect(line_item.order).to receive(:currency).at_least(:once).and_return(nil)
+        expect(Spree::Config).to receive(:currency).at_least(:once).and_return("RUB")
       end
 
-      it "returns the line item's currency" do
-        expect(subject.desired_attributes[:currency]).to eq("USD")
+      it "returns the configured default currency" do
+        expect(subject.desired_attributes[:currency]).to eq("RUB")
       end
     end
 
-    context "if neither order nor line item have a currency" do
+    context "if line item has no order" do
       before do
-        expect(line_item).to receive(:currency).and_return(nil)
         expect(line_item).to receive(:order).at_least(:once).and_return(nil)
         expect(Spree::Config).to receive(:currency).at_least(:once).and_return("RUB")
       end

data/spec/models/spree/variant_spec.rb

@@ -208,9 +208,7 @@ describe Spree::Variant, type: :model do
       let(:pricing_options_germany) { Spree::Config.pricing_options_class.new(currency: "EUR") }
       let(:pricing_options_united_states) { Spree::Config.pricing_options_class.new(currency: "USD") }
       before do
-        variant.prices << create(:price, variant: variant, currency: "USD", amount: 12.12, is_default: false)
-        variant.prices << create(:price, variant: variant, currency: "EUR", amount: 29.99)
-        variant.prices << create(:price, variant: variant, currency: "EUR", amount: 10.00, is_default: false)
+        variant.prices.create(currency: "EUR", amount: 29.99)
         variant.reload
       end
 
@@ -227,7 +225,7 @@ describe Spree::Variant, type: :model do
     context "when adding multiple prices" do
       it "it can reassign a default price" do
         expect(variant.default_price.amount).to eq(19.99)
-        variant.prices << create(:price, variant: variant, currency: "USD", amount: 12.12)
+        variant.prices.create(currency: "USD", amount: 12.12)
         expect(variant.reload.default_price.amount).to eq(12.12)
       end
     end

data/spec/models/spree/zone_spec.rb

@@ -60,7 +60,9 @@ describe Spree::Zone, type: :model do
       let(:address) { create(:address, country: country, state: country.states.first) }
 
       it "should return the qualifying zone" do
-        expect(Spree::Zone.match(address)).to eq(country_zone)
+        Spree::Deprecation.silence do
+          expect(Spree::Zone.match(address)).to eq(country_zone)
+        end
       end
     end
 
@@ -72,7 +74,9 @@ describe Spree::Zone, type: :model do
 
       context "when both zones have the same number of members" do
         it "should return the zone that was created first" do
-          expect(Spree::Zone.match(address)).to eq(country_zone)
+          Spree::Deprecation.silence do
+            expect(Spree::Zone.match(address)).to eq(country_zone)
+          end
         end
       end
 
@@ -82,7 +86,9 @@ describe Spree::Zone, type: :model do
         before { country_zone.members.create(zoneable: country2) }
 
         it "should return the zone with fewer members" do
-          expect(Spree::Zone.match(address)).to eq(second_zone)
+          Spree::Deprecation.silence do
+            expect(Spree::Zone.match(address)).to eq(second_zone)
+          end
         end
       end
     end
@@ -94,13 +100,17 @@ describe Spree::Zone, type: :model do
       before { state_zone.members.create(zoneable: country.states.first) }
 
       it "should return the zone with the more specific member type" do
-        expect(Spree::Zone.match(address)).to eq(state_zone)
+        Spree::Deprecation.silence do
+          expect(Spree::Zone.match(address)).to eq(state_zone)
+        end
       end
     end
 
     context "when there are no qualifying zones" do
       it "should return nil" do
-        expect(Spree::Zone.match(Spree::Address.new)).to be_nil
+        Spree::Deprecation.silence do
+          expect(Spree::Zone.match(Spree::Address.new)).to be_nil
+        end
       end
     end
   end
@@ -115,7 +125,9 @@ describe Spree::Zone, type: :model do
       before { country_zone.members.create(zoneable: country) }
 
       it 'should return a list of countries' do
-        expect(country_zone.country_list).to eq([country])
+        Spree::Deprecation.silence do
+          expect(country_zone.country_list).to eq([country])
+        end
       end
     end
 
@@ -125,7 +137,9 @@ describe Spree::Zone, type: :model do
       before { state_zone.members.create(zoneable: state) }
 
       it 'should return a list of countries' do
-        expect(state_zone.country_list).to eq([state.country])
+        Spree::Deprecation.silence do
+          expect(state_zone.country_list).to eq([state.country])
+        end
       end
     end
   end
@@ -160,7 +174,9 @@ describe Spree::Zone, type: :model do
 
       it "should be the correct zone" do
         create(:zone, name: 'foo')
-        expect(Spree::Zone.default_tax).to eq(@foo_zone)
+        Spree::Deprecation.silence do
+          expect(Spree::Zone.default_tax).to eq(@foo_zone)
+        end
       end
     end
 
@@ -182,12 +198,16 @@ describe Spree::Zone, type: :model do
     end
 
     it "should contain itself" do
-      expect(@source.contains?(@source)).to be true
+      Spree::Deprecation.silence do
+        expect(@source.contains?(@source)).to be true
+      end
     end
 
     context "when both source and target have no members" do
       it "should be false" do
-        expect(@source.contains?(@target)).to be false
+        Spree::Deprecation.silence do
+          expect(@source.contains?(@target)).to be false
+        end
       end
     end
 
@@ -195,7 +215,9 @@ describe Spree::Zone, type: :model do
       before { @source.members.create(zoneable: country1) }
 
       it "should be false" do
-        expect(@source.contains?(@target)).to be false
+        Spree::Deprecation.silence do
+          expect(@source.contains?(@target)).to be false
+        end
       end
     end
 
@@ -203,7 +225,9 @@ describe Spree::Zone, type: :model do
       before { @target.members.create(zoneable: country1) }
 
       it "should be false" do
-        expect(@source.contains?(@target)).to be false
+        Spree::Deprecation.silence do
+          expect(@source.contains?(@target)).to be false
+        end
       end
     end
 
@@ -213,7 +237,9 @@ describe Spree::Zone, type: :model do
       end
 
       it "should be true" do
-        expect(@source.contains?(@target)).to be true
+        Spree::Deprecation.silence do
+          expect(@source.contains?(@target)).to be true
+        end
       end
     end
 
@@ -230,7 +256,9 @@ describe Spree::Zone, type: :model do
         end
 
         it "should be true" do
-          expect(@source.contains?(@target)).to be true
+          Spree::Deprecation.silence do
+            expect(@source.contains?(@target)).to be true
+          end
         end
       end
 
@@ -242,7 +270,9 @@ describe Spree::Zone, type: :model do
         end
 
         it "should be false" do
-          expect(@source.contains?(@target)).to be false
+          Spree::Deprecation.silence do
+            expect(@source.contains?(@target)).to be false
+          end
         end
       end
 
@@ -253,7 +283,9 @@ describe Spree::Zone, type: :model do
         end
 
         it "should be false" do
-          expect(@source.contains?(@target)).to be false
+          Spree::Deprecation.silence do
+            expect(@source.contains?(@target)).to be false
+          end
         end
       end
     end
@@ -265,7 +297,9 @@ describe Spree::Zone, type: :model do
       end
 
       it "should be false" do
-        expect(@source.contains?(@target)).to be false
+        Spree::Deprecation.silence do
+          expect(@source.contains?(@target)).to be false
+        end
       end
     end
 
@@ -279,7 +313,9 @@ describe Spree::Zone, type: :model do
         end
 
         it "should be true" do
-          expect(@source.contains?(@target)).to be true
+          Spree::Deprecation.silence do
+            expect(@source.contains?(@target)).to be true
+          end
         end
       end
 
@@ -291,7 +327,9 @@ describe Spree::Zone, type: :model do
         end
 
         it "should be false" do
-          expect(@source.contains?(@target)).to be false
+          Spree::Deprecation.silence do
+            expect(@source.contains?(@target)).to be false
+          end
         end
       end
 
@@ -302,7 +340,9 @@ describe Spree::Zone, type: :model do
         end
 
         it "should be false" do
-          expect(@source.contains?(@target)).to be false
+          Spree::Deprecation.silence do
+            expect(@source.contains?(@target)).to be false
+          end
         end
       end
     end

data/spec/shared_examples/calculator_shared_examples.rb

@@ -0,0 +1,8 @@
+shared_examples_for 'a calculator with a description' do
+  describe ".description" do
+    subject { described_class.description }
+    it "has a description" do
+      expect(subject.size).to be > 0
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_core
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.1.0.beta1
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-12 00:00:00.000000000 Z
+date: 2016-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
@@ -120,14 +120,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.18
+        version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.18
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
@@ -398,13 +398,11 @@ files:
 - app/models/spree/gateway/bogus_simple.rb
 - app/models/spree/image.rb
 - app/models/spree/inventory_unit.rb
-- app/models/spree/item_adjustments.rb
 - app/models/spree/legacy_user.rb
 - app/models/spree/line_item.rb
 - app/models/spree/line_item_action.rb
 - app/models/spree/log_entry.rb
 - app/models/spree/option_type.rb
-- app/models/spree/option_type_prototype.rb
 - app/models/spree/option_value.rb
 - app/models/spree/option_values_variant.rb
 - app/models/spree/order.rb
@@ -457,6 +455,7 @@ files:
 - app/models/spree/promotion/rules/taxon.rb
 - app/models/spree/promotion/rules/user.rb
 - app/models/spree/promotion/rules/user_logged_in.rb
+- app/models/spree/promotion/rules/user_role.rb
 - app/models/spree/promotion_action.rb
 - app/models/spree/promotion_builder.rb
 - app/models/spree/promotion_category.rb
@@ -468,12 +467,10 @@ files:
 - app/models/spree/promotion_handler/free_shipping.rb
 - app/models/spree/promotion_handler/page.rb
 - app/models/spree/promotion_rule.rb
+- app/models/spree/promotion_rule_role.rb
 - app/models/spree/promotion_rule_taxon.rb
 - app/models/spree/promotion_rule_user.rb
 - app/models/spree/property.rb
-- app/models/spree/property_prototype.rb
-- app/models/spree/prototype.rb
-- app/models/spree/prototype_taxon.rb
 - app/models/spree/refund.rb
 - app/models/spree/refund_reason.rb
 - app/models/spree/reimbursement.rb
@@ -553,7 +550,6 @@ files:
 - app/models/spree/tax_rate.rb
 - app/models/spree/taxon.rb
 - app/models/spree/taxonomy.rb
-- app/models/spree/tracker.rb
 - app/models/spree/transfer_item.rb
 - app/models/spree/unit_cancel.rb
 - app/models/spree/user_address.rb
@@ -799,7 +795,6 @@ files:
 - db/migrate/20150121202544_add_restock_inventory_to_stock_location.rb
 - db/migrate/20150122202432_add_code_to_spree_promotion_categories.rb
 - db/migrate/20150127161843_create_order_stock_locations.rb
-- db/migrate/20150128032538_remove_environment_from_tracker.rb
 - db/migrate/20150203151219_add_fulfillable_to_stock_location.rb
 - db/migrate/20150205210527_add_code_to_refund_reason.rb
 - db/migrate/20150213160148_add_promotion_code_id_to_orders_promotions.rb
@@ -896,13 +891,16 @@ files:
 - db/migrate/20160616232103_remove_user_id_from_promotion_rules.rb
 - db/migrate/20160718205341_add_payment_id_index_to_spree_refunds.rb
 - db/migrate/20160718205859_add_reimbursement_id_index_to_spree_refunds.rb
+- db/migrate/20160924135758_remove_is_default_from_prices.rb
+- db/migrate/20161009141333_remove_currency_from_line_items.rb
+- db/migrate/20161014221052_add_available_to_columns_and_remove_display_on_from_payment_methods.rb
+- db/migrate/20161123154034_add_available_to_users_and_remove_display_on_from_shipping_methods.rb
 - db/seeds.rb
 - lib/generators/spree/custom_user/custom_user_generator.rb
 - lib/generators/spree/custom_user/templates/authentication_helpers.rb.tt
 - lib/generators/spree/custom_user/templates/initializer.rb.tt
 - lib/generators/spree/custom_user/templates/migration.rb.tt
 - lib/generators/spree/dummy/dummy_generator.rb
-- lib/generators/spree/dummy/templates/initializers/custom_user.rb
 - lib/generators/spree/dummy/templates/rails/application.rb
 - lib/generators/spree/dummy/templates/rails/boot.rb
 - lib/generators/spree/dummy/templates/rails/database.yml
@@ -928,7 +926,6 @@ files:
 - lib/spree/core/controller_helpers/store.rb
 - lib/spree/core/controller_helpers/strong_parameters.rb
 - lib/spree/core/current_store.rb
-- lib/spree/core/delegate_belongs_to.rb
 - lib/spree/core/engine.rb
 - lib/spree/core/environment.rb
 - lib/spree/core/environment/calculators.rb
@@ -1018,7 +1015,6 @@ files:
 - lib/spree/testing_support/factories/promotion_code_factory.rb
 - lib/spree/testing_support/factories/promotion_factory.rb
 - lib/spree/testing_support/factories/property_factory.rb
-- lib/spree/testing_support/factories/prototype_factory.rb
 - lib/spree/testing_support/factories/refund_factory.rb
 - lib/spree/testing_support/factories/refund_reason_factory.rb
 - lib/spree/testing_support/factories/reimbursement_factory.rb
@@ -1048,7 +1044,6 @@ files:
 - lib/spree/testing_support/factories/tax_rate_factory.rb
 - lib/spree/testing_support/factories/taxon_factory.rb
 - lib/spree/testing_support/factories/taxonomy_factory.rb
-- lib/spree/testing_support/factories/tracker_factory.rb
 - lib/spree/testing_support/factories/user_factory.rb
 - lib/spree/testing_support/factories/variant_factory.rb
 - lib/spree/testing_support/factories/variant_property_rule_condition_factory.rb
@@ -1092,7 +1087,6 @@ files:
 - spec/lib/spree/core/controller_helpers/store_spec.rb
 - spec/lib/spree/core/controller_helpers/strong_parameters_spec.rb
 - spec/lib/spree/core/current_store_spec.rb
-- spec/lib/spree/core/delegate_belongs_to_spec.rb
 - spec/lib/spree/core/environment_extension_spec.rb
 - spec/lib/spree/core/importer/order_spec.rb
 - spec/lib/spree/core/price_migrator_spec.rb
@@ -1123,7 +1117,6 @@ files:
 - spec/lib/spree/core/testing_support/factories/promotion_code_factory_spec.rb
 - spec/lib/spree/core/testing_support/factories/promotion_factory_spec.rb
 - spec/lib/spree/core/testing_support/factories/property_factory_spec.rb
-- spec/lib/spree/core/testing_support/factories/prototype_factory_spec.rb
 - spec/lib/spree/core/testing_support/factories/refund_factory_spec.rb
 - spec/lib/spree/core/testing_support/factories/refund_reason_factory_spec.rb
 - spec/lib/spree/core/testing_support/factories/reimbursement_factory_spec.rb
@@ -1153,7 +1146,6 @@ files:
 - spec/lib/spree/core/testing_support/factories/tax_rate_factory_spec.rb
 - spec/lib/spree/core/testing_support/factories/taxon_factory_spec.rb
 - spec/lib/spree/core/testing_support/factories/taxonomy_factory_spec.rb
-- spec/lib/spree/core/testing_support/factories/tracker_factory_spec.rb
 - spec/lib/spree/core/testing_support/factories/user_factory_spec.rb
 - spec/lib/spree/core/testing_support/factories/variant_factory_spec.rb
 - spec/lib/spree/core/testing_support/factories/variant_property_rule_condition_factory_spec.rb
@@ -1189,7 +1181,9 @@ files:
 - spec/models/spree/calculator/flat_percent_item_total_spec.rb
 - spec/models/spree/calculator/flat_rate_spec.rb
 - spec/models/spree/calculator/flexi_rate_spec.rb
+- spec/models/spree/calculator/free_shipping_spec.rb
 - spec/models/spree/calculator/percent_on_line_item_spec.rb
+- spec/models/spree/calculator/percent_per_item_spec.rb
 - spec/models/spree/calculator/price_sack_spec.rb
 - spec/models/spree/calculator/refunds/default_refund_amount_spec.rb
 - spec/models/spree/calculator/shipping/flat_percent_item_total_spec.rb
@@ -1214,7 +1208,6 @@ files:
 - spec/models/spree/gateway/bogus_spec.rb
 - spec/models/spree/gateway_spec.rb
 - spec/models/spree/inventory_unit_spec.rb
-- spec/models/spree/item_adjustments_spec.rb
 - spec/models/spree/line_item_spec.rb
 - spec/models/spree/option_type_spec.rb
 - spec/models/spree/option_value_spec.rb
@@ -1293,7 +1286,9 @@ files:
 - spec/models/spree/promotion/rules/product_spec.rb
 - spec/models/spree/promotion/rules/taxon_spec.rb
 - spec/models/spree/promotion/rules/user_logged_in_spec.rb
+- spec/models/spree/promotion/rules/user_role_spec.rb
 - spec/models/spree/promotion/rules/user_spec.rb
+- spec/models/spree/promotion_action_spec.rb
 - spec/models/spree/promotion_builder_spec.rb
 - spec/models/spree/promotion_category_spec.rb
 - spec/models/spree/promotion_code/code_builder_spec.rb
@@ -1365,7 +1360,6 @@ files:
 - spec/models/spree/tax_rate_spec.rb
 - spec/models/spree/taxon_spec.rb
 - spec/models/spree/taxonomy_spec.rb
-- spec/models/spree/tracker_spec.rb
 - spec/models/spree/transfer_item_spec.rb
 - spec/models/spree/unit_cancel_spec.rb
 - spec/models/spree/user_spec.rb
@@ -1379,6 +1373,7 @@ files:
 - spec/models/spree/variant_property_rule_value_spec.rb
 - spec/models/spree/variant_spec.rb
 - spec/models/spree/zone_spec.rb
+- spec/shared_examples/calculator_shared_examples.rb
 - spec/spec_helper.rb
 - spec/support/big_decimal.rb
 - spec/support/concerns/default_price.rb
@@ -1391,7 +1386,7 @@ files:
 - vendor/assets/stylesheets/normalize.css
 homepage: http://solidus.io
 licenses:
-- BSD-3
+- BSD-3-Clause
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -1401,15 +1396,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.1.0
+      version: 2.2.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.8.23
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Essential models, mailers, and classes for the Solidus e-commerce project.