test-prof 1.4.0.rc.4 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 46c375967bb8f18cb7a27c0852c3bbc277ea6cae7c0d9ed51d8fe709b1ec67e9
-  data.tar.gz: 133939cf5cd497246b36642d3552ac0883a3a558d32775be960a9f308e3e67a5
+  metadata.gz: 6636a3c69af7cd067079bd1e91ef72d38b650a372a13e6363c3de9e510a8970b
+  data.tar.gz: 2f1a503a8adcf4af85cad6b98ab4682394c5222b1f5290cc6aaeec97da77ef06
 SHA512:
-  metadata.gz: 830b4ed5c186ecec5a5396ad764f4d8c96700c8c0c3e55b2f0634b937906ec74d39e61ce1e270d9dd93a72b5618aaad87a6c0b316dc42874c3522631e1e8bbc6
-  data.tar.gz: 8e81d280c8f86adf1df271758d7bbf91499d86f2493ecbc6435f23cef73adfc23ed1404f475b10ef749a84dd19d0e87eff42aa61f1040738aef04cdb270a2689
+  metadata.gz: 68701c8c91b20f810ff93f3e3360d4f8f7b3210a2014f3a4463542b0e31b657ab3093da4eaf4b2bf9cee59d1e99ded9ef51d83e7a27855f05113f681219f7888
+  data.tar.gz: 438a4297ebff65d6f9d5aec752775a638f5c6255c63d439f278eda596825595c2b6d74cc609057c42712247a98eefb07c42dcd1133d4d1ae5162898a2af5068c

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## master (unreleased)
 
+## 1.4.0 (2024-08-12)
+
+- AnyFixture: Disable fixtures cache within _clean fixture_ context. Automatically _refind_ records when using `#fixture`. ([@palkan][])
+
 - Add new TPS (tests per second) profiler. ([@palkan][])
 
 - FactoryDefault: add Fabrication support. ([@palkan][])

data/lib/test_prof/any_fixture/dsl.rb

@@ -1,5 +1,10 @@
 # frozen_string_literal: true
 
+if defined?(::ActiveRecord::Base)
+  require "test_prof/ext/active_record_refind"
+  using TestProf::Ext::ActiveRecordRefind
+end
+
 module TestProf
   module AnyFixture
     # Adds "global" `fixture`, `before_fixtures_reset` and `after_fixtures_reset` methods (through refinement)
@@ -9,7 +14,20 @@ module TestProf
       # - Rails added `Kernel.prepend` in 6.1: https://github.com/rails/rails/commit/3124007bd674dcdc9c3b5c6b2964dfb7a1a0733c
       refine ::Object do
         def fixture(id, &block)
-          ::TestProf::AnyFixture.register(:"#{id}", &block)
+          id = :"#{id}"
+          record = ::TestProf::AnyFixture.cached(id)
+
+          return ::TestProf::AnyFixture.register(id, &block) unless record
+
+          return record.refind if record.is_a?(::ActiveRecord::Base)
+
+          if record.respond_to?(:to_ary)
+            return record.map do |rec|
+              rec.is_a?(::ActiveRecord::Base) ? rec.refind : rec
+            end
+          end
+
+          record
         end
 
         def before_fixtures_reset(&block)

data/lib/test_prof/any_fixture.rb

@@ -108,14 +108,18 @@ module TestProf
         cached(id) do
           raise "No fixture named #{id} has been registered" unless block_given?
 
+          next yield if @disabled
+
           ActiveSupport::Notifications.subscribed(method(:subscriber), "sql.active_record") do
             yield
           end
         end
       end
 
-      def cached(id)
-        cache.fetch(id) { yield }
+      def cached(id, &block)
+        return (block_given? ? yield : nil) if @disabled
+
+        cache.fetch(id, &block)
       end
 
       # Create and register new SQL dump.
@@ -174,6 +178,14 @@ module TestProf
         callbacks.clear
       end
 
+      def disable!
+        @disabled = true
+      end
+
+      def enable!
+        @disabled = false
+      end
+
       def before_fixtures_reset(&block)
         callbacks[:before_fixtures_reset] << block
       end
@@ -266,5 +278,7 @@ module TestProf
         connection.disable_referential_integrity { yield }
       end
     end
+
+    enable!
   end
 end

data/lib/test_prof/before_all/isolator.rb

@@ -1,20 +1,11 @@
 # frozen_string_literal: true
 
-module TestProf
-  module BeforeAll
-    # Disable Isolator within before_all blocks
-    module Isolator
-      def begin_transaction(*)
-        ::Isolator.transactions_threshold += 1
-        super
-      end
+TestProf::BeforeAll.configure do |config|
+  config.before(:begin) do
+    ::Isolator.incr_thresholds!
+  end
 
-      def rollback_transaction(*)
-        super
-        ::Isolator.transactions_threshold -= 1
-      end
-    end
+  config.after(:rollback) do
+    ::Isolator.decr_thresholds!
   end
 end
-
-TestProf::BeforeAll.singleton_class.prepend(TestProf::BeforeAll::Isolator)

data/lib/test_prof/recipes/rspec/any_fixture.rb

@@ -1,6 +1,9 @@
 # frozen_string_literal: true
 
 require "test_prof/any_fixture"
+require "test_prof/any_fixture/dsl"
+require "test_prof/ext/active_record_refind"
+
 require "test_prof/recipes/rspec/before_all"
 
 RSpec.shared_context "any_fixture:clean" do
@@ -8,6 +11,11 @@ RSpec.shared_context "any_fixture:clean" do
 
   before_all do
     TestProf::AnyFixture.clean
+    TestProf::AnyFixture.disable!
+  end
+
+  after(:all) do
+    TestProf::AnyFixture.enable!
   end
 end
 

data/lib/test_prof/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module TestProf
-  VERSION = "1.4.0.rc.4"
+  VERSION = "1.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: test-prof
 version: !ruby/object:Gem::Version
-  version: 1.4.0.rc.4
+  version: 1.4.0
 platform: ruby
 authors:
 - Vladimir Dementyev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-07-26 00:00:00.000000000 Z
+date: 2024-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -252,9 +252,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.4.19
 signing_key: