solidus_core 2.9.0 → 2.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0094b02cd702626b2e096ec98561a32fb8493227a6e5fa265f66abae656fdaf3'
-  data.tar.gz: 79dbb067dacfc98477078c1a48e812c6d5ac19596c897f573dcd892e8504b2d1
+  metadata.gz: a2edabaa78d1ec9b196da1fe62c6597ea1fd392a37185f48c6786e6d00f4566a
+  data.tar.gz: fb268588d3df1204706a1d89026b9de2b5967f5b9d5c3bcce91c52e05280a0cd
 SHA512:
-  metadata.gz: 6b2a0aa8d08f5474ab3e531d5b50b667650183e175daf4ed2f2e4ac2d1b9cbdab012a90bb9ccb488624b1a56eaf460faa07f3a56e566d5075d58bb10c7275317
-  data.tar.gz: 7daf2551e03bf901f010279aa59deb43ea215e0456b27e5cbf80e70d843ae54b41a47a92e1dbcc13f0a7bb720cf2d7805478bf69cffcc5611457f798436b6856
+  metadata.gz: 521bcc28081f5ad38b84736fa159e616fd22985b1ccf2022921945533dc00144b9688827fd1405b70212de8cc222b1482eac7f143f4b71f729c931a4bea319c4
+  data.tar.gz: e9a8edbd1fe694e5dd4d823d08dff30db1e036212c37837421702b9e31514db48fa1b5f58441b46a490c96d171dfe1964a776b13477826160b2f01ac24fbaa8e

data/lib/spree/core/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Spree
-  VERSION = "2.9.0"
+  VERSION = "2.9.1"
 
   def self.solidus_version
     VERSION

data/lib/spree/testing_support/preferences.rb

@@ -44,21 +44,36 @@ module Spree
       # This method  may be used for stubbing one or more different preferences
       # at the same time.
       #
-      # @param [Hash] preferences names and values to be stubbed
+      # @param prefs_or_conf_class [Class, Hash] the class we want to stub
+      #   preferences for or the preferences hash (see prefs param). If this
+      #   param is an Hash, preferences will be stubbed on Spree::Config.
+      # @param prefs [Hash, nil] names and values to be stubbed
       #
-      # @example Stubs `currency` and `track_inventory_levels` preferences
+      # @example Stubs `currency` and `track_inventory_levels` on `Spree::Config`:
       #   stub_spree_preferences(currency: 'EUR', track_inventory_levels: false)
       #   expect(Spree::Config.currency).to eql 'EUR'
       #
+      # @example Stubs `locale` preference on `Spree::Backend::Config`:
+      #   stub_spree_preferences(Spree::Backend::Config, locale: 'fr'),
+      #   expect(Spree::Backend::Config.locale).to eql 'fr'
+      #
       # @see https://github.com/solidusio/solidus/issues/3219
       #   Solidus #3219 for more details and motivations.
-      def stub_spree_preferences(preferences)
+      def stub_spree_preferences(prefs_or_conf_class, prefs = nil)
+        if prefs_or_conf_class.is_a?(Hash)
+          preference_store_class = Spree::Config
+          preferences = prefs_or_conf_class
+        else
+          preference_store_class = prefs_or_conf_class
+          preferences = prefs
+        end
+
         preferences.each do |name, value|
-          if Spree::Config.method(:[]).owner >= Spree::Config.class
-            allow(Spree::Config).to receive(:[]).and_call_original
+          if preference_store_class.method(:[]).owner >= preference_store_class.class
+            allow(preference_store_class).to receive(:[]).and_call_original
           end
-          allow(Spree::Config).to receive(:[]).with(name) { value }
-          allow(Spree::Config).to receive(name) { value }
+          allow(preference_store_class).to receive(:[]).with(name) { value }
+          allow(preference_store_class).to receive(name) { value }
         end
       end
 
@@ -75,12 +90,30 @@ module Spree
       #     expect(Spree::Config.currency).to eql 'EUR'
       #   end
       # @see Spree::TestingSupport::Preferences#stub_spree_preferences
-      def with_unfrozen_spree_preference_store
-        frozen_store = Spree::Config.preference_store
-        Spree::Config.preference_store = Spree::Config[:unfrozen_preference_store].dup
+      def with_unfrozen_spree_preference_store(preference_store_class: Spree::Config)
+        frozen_store = preference_store_class.preference_store
+        preference_store_class.preference_store = preference_store_class[:unfrozen_preference_store].dup
         yield
       ensure
-        Spree::Config.preference_store = frozen_store
+        preference_store_class.preference_store = frozen_store
+      end
+
+      # This class method allows to freeze preferences for a specific
+      # configuration store class. It also stores the current state into
+      # a new preference of that store, so it can be reused when needed
+      # (eg. with_unfrozen_spree_preference_store)
+      #
+      # It is meant to be used by extensions as well, for example if one
+      # extension has its own Spree::ExtensionName::Config class, we can
+      # freeze it and be sure we always stub values on it during tests.
+      #
+      # @param preference_store_class [Class] the configuration class we want
+      #   to freeze.
+      def self.freeze_preferences(preference_store_class)
+        config_class = preference_store_class.class
+        config_class.preference :unfrozen_preference_store, :hash
+        preference_store_class.unfrozen_preference_store = preference_store_class.preference_store.dup
+        preference_store_class.preference_store.freeze
       end
     end
   end
@@ -88,9 +121,15 @@ end
 
 RSpec.configure do |config|
   config.before :suite do
-    # keep a copy of the original unfrozen preference_store for later use:
-    Spree::AppConfiguration.preference :unfrozen_preference_store, :hash
-    Spree::Config.unfrozen_preference_store = Spree::Config.preference_store.dup
-    Spree::Config.preference_store.freeze
+    %w[
+      Spree::Config
+      Spree::Frontend::Config
+      Spree::Backend::Config
+      Spree::Api::Config
+    ].each do |configuration_class|
+      if Object.const_defined?(configuration_class)
+        Spree::TestingSupport::Preferences.freeze_preferences(configuration_class.constantize)
+      end
+    end
   end
 end

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

@@ -27,7 +27,7 @@ module Spree
         end
 
         context 'when track_inventory_levels is false' do
-          before { stub_spree_preferences track_inventory_levels: false }
+          before { stub_spree_preferences(track_inventory_levels: false) }
 
           specify { expect(subject.total_on_hand).to eq(Float::INFINITY) }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_core
 version: !ruby/object:Gem::Version
-  version: 2.9.0
+  version: 2.9.1
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-16 00:00:00.000000000 Z
+date: 2019-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer