shoulda-matchers 8.0.0 → 8.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 223ff92a4826a7403e0f1016553453323108899c2d2f7029873ea9f99b68a1c0
-  data.tar.gz: 2014f3ded4620ce71736c035b8f73959a2a85c1adead8067692173fbca6907de
+  metadata.gz: 0cad2b70febc8044b3a8a61bc3ce7aa00b780708d3e0d2baccedaa3922d6f42f
+  data.tar.gz: 4a3fca99d9bccfac2bc74035f1e1a8608ef24775a19dd7bc30b0a979e6f87ed1
 SHA512:
-  metadata.gz: 3a23155ac210adef58ea71d3cead443b1277b0292972f1365c140b20c671de2f743c39516871ab0ce6ffe0e48b2298a86635533f9fb1f2838577320505b6f91f
-  data.tar.gz: 6999714a118645d1aff05c32ad2a7337111aa7c7501f42822a34ca28e31b5d7caa84d49138ecebf0c1dfad17e9f24fd25583e41b73f9e981c4b9ff1da673fd39
+  metadata.gz: 29dcf4008451127b46e668f2399fe58d851ec54d2057595e59c7a57937b2f0e72d4a2aa4bdacd90f78d6a12a6de79f253675ab15ff4339c4222813bcaa449c04
+  data.tar.gz: 3f5b06b148848185c566f381f8cf3871dc56e454ea9ff59cb6106f1e969b854de53d07d84d6fa6d9554090440efcb568f30f33ac3dcfaada6fd4304fcbc284b5

data/lib/shoulda/matchers/active_record/uniqueness/namespace.rb

@@ -18,26 +18,11 @@ module Shoulda
           end
 
           def clear
-            test_model_classes = []
-
             constant.constants.each do |child_constant|
-              child = constant.const_get(child_constant)
-
-              if defined?(::ActiveRecord::Base) &&
-                 child.is_a?(Class) &&
-                 child < ::ActiveRecord::Base
-                test_model_classes << child
-              end
-
               constant.remove_const(child_constant)
             rescue NameError
               # Constant may have been removed elsewhere; ignore
             end
-
-            if defined?(::ActiveSupport::DescendantsTracker) &&
-               test_model_classes.any?
-              ::ActiveSupport::DescendantsTracker.clear(test_model_classes)
-            end
           end
 
           def to_s

data/lib/shoulda/matchers/active_record/uniqueness/test_models.rb

@@ -5,7 +5,25 @@ module Shoulda
       module Uniqueness
         # @private
         module TestModels
+          # Test models subclass real ActiveRecord models, so they register
+          # in `descendants`/`subclasses` and cannot be unregistered after
+          # the fact: ActiveSupport::DescendantsTracker.clear raises when
+          # config.enable_reloading is false (the default in the test
+          # environment), and the classes cannot be reliably garbage
+          # collected. Instead, mirror the filtering technique Rails itself
+          # uses for reloaded classes and hide them at the source.
+          module DescendantsFiltering
+            def descendants
+              super.reject { |klass| TestModels.contains?(klass) }
+            end
+
+            def subclasses
+              super.reject { |klass| TestModels.contains?(klass) }
+            end
+          end
+
           def self.create(model_name)
+            hide_from_descendants
             TestModelCreator.create(model_name, root_namespace)
           end
 
@@ -16,6 +34,20 @@ module Shoulda
           def self.root_namespace
             @_root_namespace ||= Namespace.new(self)
           end
+
+          def self.contains?(klass)
+            !klass.name.nil? && klass.name.start_with?(name_prefix)
+          end
+
+          def self.name_prefix
+            @_name_prefix ||= "#{name}::"
+          end
+
+          def self.hide_from_descendants
+            @_hide_from_descendants ||=
+              ::ActiveRecord::Base.singleton_class.
+                prepend(DescendantsFiltering) && true
+          end
         end
       end
     end

data/lib/shoulda/matchers/version.rb

@@ -1,6 +1,6 @@
 module Shoulda
   module Matchers
     # @private
-    VERSION = '8.0.0'.freeze
+    VERSION = '8.0.1'.freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shoulda-matchers
 version: !ruby/object:Gem::Version
-  version: 8.0.0
+  version: 8.0.1
 platform: ruby
 authors:
 - Tammer Saleh