test-prof 1.0.8 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e1623dde5386ea71184b81cf99eb67ac377613d46b2ebac3ce874164103fcbd
-  data.tar.gz: 1b9fa94cb2616226019cbc57ee8dbefa5c03db8f42f0be277352884ab6dfdb48
+  metadata.gz: 9680aa33c1d917182a0be6e8cfd0656149d510b634db637b8023feda29f10886
+  data.tar.gz: 721767f61684ed87eff0f2e4c62080b9bb2a9e24bf6f47db194fc687bedbbe9b
 SHA512:
-  metadata.gz: 7eeec86920c82c3afb8b89478b3992bf1750fdacd949913c0a6c18a684bcefb5998880e4da2cecec1c8d5866dcc89b8a16de31e7e881713f8a4707aa08b25fd6
-  data.tar.gz: 793ec788e3cb95c29b8b3b1a9026db05e64d1ae828ca2ce8a180ffc460cf3d653710b2c4356e47d0dbc3aa8a3fd5ea633502fa5c0f0114a467a5dd01ae99b5b5
+  metadata.gz: 5a1d037cdac034f7c58f7bd090de128a81d41c3927787c953cacd33e8ecec1dd11cbda282f64fd542c2679b5176aa7bce4fe2ecb49806abac895d2cf9f478c00
+  data.tar.gz: baf837db1165a0d5631f07c9f4a978234afcce65fd9be886ef80bcf0a020fd43926e57eb5f295f0daddb22027c821ee72960fb01cd2cd4c7db6d18100d404343

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## master (unreleased)
 
+## 1.0.9 (2022-05-05)
+
+- Add `AnyFixture.before_fixtures_reset` and `AnyFixture.after_fixtures_reset` callbacks. ([@ruslanshakirov][])
+
+- Fixes ActiveRecord 6.1 issue with AnyFixture and Postgres config ([@markedmondson][])
+
 ## 1.0.8 (2022-03-11)
 
 - Restore the lock_thread value after rollback. ([@cou929][])
@@ -277,3 +283,4 @@ See [changelog](https://github.com/test-prof/test-prof/blob/v0.8.0/CHANGELOG.md)
 [@alexvko]: https://github.com/alexvko
 [@grillermo]: https://github.com/grillermo
 [@cou929]: https://github.com/cou929
+[@ruslanshakirov]: https://github.com/ruslanshakirov

data/lib/test_prof/any_fixture/dsl.rb

@@ -2,7 +2,7 @@
 
 module TestProf
   module AnyFixture
-    # Adds "global" `fixture` method (through refinement)
+    # Adds "global" `fixture`, `before_fixtures_reset` and `after_fixtures_reset` methods (through refinement)
     module DSL
       # Refine object, 'cause refining modules (Kernel) is vulnerable to prepend:
       # - https://bugs.ruby-lang.org/issues/13446
@@ -11,6 +11,14 @@ module TestProf
         def fixture(id, &block)
           ::TestProf::AnyFixture.register(:"#{id}", &block)
         end
+
+        def before_fixtures_reset(&block)
+          ::TestProf::AnyFixture.before_fixtures_reset(&block)
+        end
+
+        def after_fixtures_reset(&block)
+          ::TestProf::AnyFixture.after_fixtures_reset(&block)
+        end
       end
     end
   end

data/lib/test_prof/any_fixture/dump/postgresql.rb

@@ -30,7 +30,7 @@ module TestProf
           # Test if psql is installed
           `psql --version`
 
-          tasks = ActiveRecord::Tasks::PostgreSQLDatabaseTasks.new(conn.pool.spec.config.with_indifferent_access)
+          tasks = ActiveRecord::Tasks::PostgreSQLDatabaseTasks.new(config)
 
           while_disconnected do
             tasks.structure_load(path, "--output=/dev/null")
@@ -85,6 +85,15 @@ module TestProf
         def execute(query)
           super.values
         end
+
+        def config
+          conn_pool = conn.pool
+          if conn_pool.respond_to?(:spec) # Support for Rails < 6.1
+            conn_pool.spec.config
+          else
+            conn_pool.db_config
+          end
+        end
       end
     end
   end

data/lib/test_prof/any_fixture.rb

@@ -119,6 +119,8 @@ module TestProf
       # returns the result of the block execution
       def register(id)
         cached(id) do
+          raise "No fixture named #{id} has been registered" unless block_given?
+
           ActiveSupport::Notifications.subscribed(method(:subscriber), "sql.active_record") do
             yield
           end
@@ -175,9 +177,22 @@ module TestProf
 
       # Reset all information and clean tables
       def reset
+        callbacks[:before_fixtures_reset].each(&:call)
+
         clean
         tables_cache.clear
         cache.clear
+
+        callbacks[:after_fixtures_reset].each(&:call)
+        callbacks.clear
+      end
+
+      def before_fixtures_reset(&block)
+        callbacks[:before_fixtures_reset] << block
+      end
+
+      def after_fixtures_reset(&block)
+        callbacks[:after_fixtures_reset] << block
       end
 
       def subscriber(_event, _start, _finish, _id, data)
@@ -254,6 +269,10 @@ module TestProf
         @tables_cache ||= {}
       end
 
+      def callbacks
+        @callbacks ||= Hash.new { |h, k| h[k] = [] }
+      end
+
       def disable_referential_integrity
         connection = ActiveRecord::Base.connection
         return yield unless connection.respond_to?(:disable_referential_integrity)

data/lib/test_prof/cops/rspec/aggregate_examples/its.rb

@@ -48,14 +48,15 @@ module RuboCop
 
           def transform_its(body, arguments)
             argument = arguments.first
-            replacement = case argument.type
-                          when :array
-                            key = argument.values.first
-                            "expect(subject[#{key.source}])"
-                          else
-                            property = argument.value
-                            "expect(subject.#{property})"
-            end
+            replacement =
+              case argument.type
+              when :array
+                key = argument.values.first
+                "expect(subject[#{key.source}])"
+              else
+                property = argument.value
+                "expect(subject.#{property})"
+              end
             body.source.gsub(/is_expected|are_expected/, replacement)
           end
 

data/lib/test_prof/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module TestProf
-  VERSION = "1.0.8"
+  VERSION = "1.0.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: test-prof
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.9
 platform: ruby
 authors:
 - Vladimir Dementyev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-05 00:00:00.000000000 Z
+date: 2022-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler