Remove global mock

Author: JonRowe

lib/rspec/active_model/mocks/mocks.rb

@@ -94,6 +94,8 @@ def association(association_name)
     #   * A String representing a Class that extends ActiveModel::Naming
     #   * A Class that extends ActiveModel::Naming
     def mock_model(string_or_model_class, stubs={})
+      @__rspec_active_model_mocks ||= Hash.new { |h, k| h[k] = [] }
+
       if String === string_or_model_class
         if Object.const_defined?(string_or_model_class)
           model_class = Object.const_get(string_or_model_class)
@@ -135,16 +137,12 @@ def self.param_delimiter; "-"; end
                 :blank? => false }.merge(stubs)
 
       double("#{model_class.name}_#{stubs[:id]}", stubs).tap do |m|
-        mock_store_klass = RSpec::ActiveModel::Mocks::Mocks
         if model_class.method(:===).owner == Module && !stubs.key?(:===)
-          allow(mock_store_klass).to receive(:mock_store) do
-            @mock_store ||= Hash.new { |h, k| h[k] = [] }
-          end
           allow(model_class).to receive(:===).and_wrap_original do |original, other|
-            mock_store_klass.mock_store[model_class].include?(other) || original.call(other)
+            @__rspec_active_model_mocks[model_class].include?(other) || original.call(other)
           end
         end
-        mock_store_klass.mock_store[model_class] << m if mock_store_klass.respond_to?(:mock_store)
+        @__rspec_active_model_mocks[model_class] << m
         msingleton = class << m; self; end
         msingleton.class_eval do
           include ActiveModelInstanceMethods