solidus_core 2.1.0.beta1 → 2.1.0.rc1

data/spec/models/spree/promotion/actions/create_item_adjustments_spec.rb

@@ -97,13 +97,13 @@ module Spree
 
           context "when the adjustable is actionable" do
             it "calls compute on the calculator" do
-              expect(action.calculator).to receive(:compute).with(line_item)
+              expect(action.calculator).to receive(:compute).with(line_item).and_call_original
               action.compute_amount(line_item)
             end
 
             context "calculator returns amount greater than item total" do
               before do
-                expect(action.calculator).to receive(:compute).with(line_item).and_return(300)
+                action.calculator.preferred_amount = 300
                 allow(line_item).to receive_messages(amount: 100)
               end
 

data/spec/models/spree/store_spec.rb

@@ -23,14 +23,6 @@ describe Spree::Store, type: :model do
 
     delegate :current, to: :described_class
 
-    context "with no argument" do
-      it 'should return default' do
-        Spree::Deprecation.silence do
-          expect(current).to eql(store_default)
-        end
-      end
-    end
-
     context "with no match" do
       it 'should return the default domain' do
         expect(current('foobar.com')).to eql(store_default)

data/spec/models/spree/user_spec.rb

@@ -94,13 +94,6 @@ describe Spree::LegacyUser, type: :model do
       it "has payment sources" do
         expect(user.payment_sources.first.gateway_customer_profile_id).not_to be_empty
       end
-
-      it "drops payment source" do
-        Spree::Deprecation.silence do
-          user.drop_payment_source cc
-        end
-        expect(cc.gateway_customer_profile_id).to be_nil
-      end
     end
   end
 end

data/spec/models/spree/variant_spec.rb

@@ -178,14 +178,6 @@ describe Spree::Variant, type: :model do
     end
   end
 
-  context "#currency" do
-    it "returns the globally configured currency" do
-      Spree::Deprecation.silence do
-        expect(variant.currency).to eql "USD"
-      end
-    end
-  end
-
   context "#display_amount" do
     it "returns a Spree::Money" do
       variant.price = 21.22

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_core
 version: !ruby/object:Gem::Version
-  version: 2.1.0.beta1
+  version: 2.1.0.rc1
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-06 00:00:00.000000000 Z
+date: 2016-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
@@ -586,7 +586,6 @@ files:
 - config/initializers/assets.rb
 - config/initializers/friendly_id.rb
 - config/initializers/premailer_assets.rb
-- config/initializers/spree_user.rb
 - config/locales/en.yml
 - db/default/spree/countries.rb
 - db/default/spree/return_reasons.rb
@@ -938,7 +937,6 @@ files:
 - lib/spree/core/product_duplicator.rb
 - lib/spree/core/product_filters.rb
 - lib/spree/core/role_configuration.rb
-- lib/spree/core/routes.rb
 - lib/spree/core/search/base.rb
 - lib/spree/core/search/variant.rb
 - lib/spree/core/stock_configuration.rb

data/config/initializers/spree_user.rb

@@ -1,10 +0,0 @@
-# Ensure that Spree.user_class includes the UserMethods concern
-# Previously these methods were injected automatically onto the class, which we
-# are still doing for compatability, but with a warning.
-
-Spree::Core::Engine.config.to_prepare do
-  if Spree.user_class && !Spree.user_class.included_modules.include?(Spree::UserMethods)
-    Spree::Deprecation.warn "#{Spree.user_class} must include Spree::UserMethods"
-    Spree.user_class.include Spree::UserMethods
-  end
-end

data/lib/spree/core/routes.rb

@@ -1,20 +0,0 @@
-module Spree
-  module Core
-    class Engine < ::Rails::Engine
-      def self.add_routes(&block)
-        Spree::Deprecation.warn "Spree::Core::Engine.add_routes is deprecated, use Spree::Core::Engine.routes.draw instead"
-        routes.draw(&block)
-      end
-
-      def self.append_routes(&block)
-        Spree::Deprecation.warn "Spree::Core::Engine.append_routes is deprecated, use Spree::Core::Engine.routes.append instead"
-        routes.append(&block)
-      end
-
-      def self.draw_routes(&block)
-        Spree::Deprecation.warn "Spree::Core::Engine.draw_routes is deprecated, use Spree::Core::Engine.routes.draw instead"
-        routes.draw(&block)
-      end
-    end
-  end
-end