Require the store_key arg of Store.current

The previous behaviour was deprecated
solidusio · Dec 21, 2016 · 0abb4d0 · 0abb4d0
1 parent 64757eb
commit 0abb4d0
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 10 deletions.
diff --git a/core/app/models/spree/store.rb b/core/app/models/spree/store.rb
@@ -21,8 +21,7 @@ class Store < Spree::Base
 
     scope :by_url, lambda { |url| where("url like ?", "%#{url}%") }
 
-    def self.current(store_key = nil)
-      Spree::Deprecation.warn "Spree::Store.current needs a code or URL as an argument. If you want the default store use Spree::Store.default", caller if !store_key
+    def self.current(store_key)
       current_store = Store.find_by(code: store_key) || Store.by_url(store_key).first if store_key
       current_store || Store.default
     end

diff --git a/core/spec/models/spree/store_spec.rb b/core/spec/models/spree/store_spec.rb
@@ -23,14 +23,6 @@
 
     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)