test-prof 1.0.6 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f26a5003d400d430571206914f2f15a94ef4cca220c5f359e315eda7adf7a6b9
-  data.tar.gz: 74d5cfb5e92351e628134dcd51230c6c984bd4b03518b89b4f98d8d20621e46f
+  metadata.gz: 9680aa33c1d917182a0be6e8cfd0656149d510b634db637b8023feda29f10886
+  data.tar.gz: 721767f61684ed87eff0f2e4c62080b9bb2a9e24bf6f47db194fc687bedbbe9b
 SHA512:
-  metadata.gz: ea8cd4e7907fceb36874a91240be7baa0bdfb3c43dbddda21dececde541dbe5b9d52738ef3412c9c906e208fe5d33d2b34ce4e13a9063d941f360f2ccb845a30
-  data.tar.gz: b87bec660bcd642dced3582c147317bb575628ef264eb7a33e31b59a1f5f7b740423fbd0a08dddf6c28638ffe266b460b05524cbfabbf95a93105053876aaf05
+  metadata.gz: 5a1d037cdac034f7c58f7bd090de128a81d41c3927787c953cacd33e8ecec1dd11cbda282f64fd542c2679b5176aa7bce4fe2ecb49806abac895d2cf9f478c00
+  data.tar.gz: baf837db1165a0d5631f07c9f4a978234afcce65fd9be886ef80bcf0a020fd43926e57eb5f295f0daddb22027c821ee72960fb01cd2cd4c7db6d18100d404343

data/CHANGELOG.md

@@ -1,6 +1,28 @@
 # Change log
 
-## master (unrealeased)
+## 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][])
+
+- Fixes the configuration of a printer for factory_prof runs
+
+- Ensure that defaults are stored in a threadsafe manner
+
+## 1.0.7 (2021-08-30)
+
+- Fix access to `let_it_be` variables in `after(:all)` hook. ([@cbarton][])
+
+- Add support for using the before_all hook with Rails' parallelize feature (using processes). ([@peret][])
+
+Make sure to include `TestProf::BeforeAll::Minitest` before you call `parallelize`.
 
 ## 1.0.6 (2021-06-23)
 
@@ -259,3 +281,6 @@ See [changelog](https://github.com/test-prof/test-prof/blob/v0.8.0/CHANGELOG.md)
 [@stefkin]: https://github.com/stefkin
 [@jaimerson]: https://github.com/jaimerson
 [@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

@@ -23,14 +23,14 @@ module TestProf
         end
 
         def compile_sql(sql, binds)
-          sql.gsub(/\$\d+/) { binds.shift }
+          sql.gsub(/\$\d+/) { binds.shift.gsub("\n", "' || chr(10) || '") }
         end
 
         def import(path)
           # 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/dump/sqlite.rb

@@ -18,7 +18,7 @@ module TestProf
         end
 
         def compile_sql(sql, binds)
-          sql.gsub(/\?/) { binds.shift }
+          sql.gsub(/\?/) { binds.shift.gsub("\n", "' || char(10) || '") }
         end
 
         def import(path)

data/lib/test_prof/any_fixture.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require "test_prof"
 require "test_prof/ext/float_duration"
 require "test_prof/any_fixture/dump"
 
@@ -118,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
@@ -174,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)
@@ -253,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/before_all/adapters/active_record.rb

@@ -37,6 +37,9 @@ module TestProf
       end
     end
 
+    # avoid instance variable collisions with cats
+    PREFIX_RESTORE_LOCK_THREAD = "@😺"
+
     configure do |config|
       # Make sure ActiveRecord uses locked thread.
       # It only gets locked in `before` / `setup` hook,
@@ -44,8 +47,14 @@ module TestProf
       # might lead to leaking connections
       config.before(:begin) do
         next unless ::ActiveRecord::Base.connection.pool.respond_to?(:lock_thread=)
+        instance_variable_set("#{PREFIX_RESTORE_LOCK_THREAD}_orig_lock_thread", ::ActiveRecord::Base.connection.pool.instance_variable_get(:@lock_thread))
         ::ActiveRecord::Base.connection.pool.lock_thread = true
       end
+
+      config.after(:rollback) do
+        next unless ::ActiveRecord::Base.connection.pool.respond_to?(:lock_thread=)
+        ::ActiveRecord::Base.connection.pool.lock_thread = instance_variable_get("#{PREFIX_RESTORE_LOCK_THREAD}_orig_lock_thread")
+      end
     end
   end
 end

data/lib/test_prof/before_all.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "test_prof"
+
 module TestProf
   # `before_all` helper configuration
   module BeforeAll

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/cops/rspec/aggregate_examples/matchers_with_side_effects.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative "../language"
+require "test_prof/cops/rspec/language"
 
 module RuboCop
   module Cop

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative "../language"
+require "test_prof/cops/rspec/language"
 
 module RuboCop
   module Cop

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

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require_relative "aggregate_examples/line_range_helpers"
-require_relative "aggregate_examples/metadata_helpers"
-require_relative "aggregate_examples/node_matchers"
+require "test_prof/cops/rspec/aggregate_examples/line_range_helpers"
+require "test_prof/cops/rspec/aggregate_examples/metadata_helpers"
+require "test_prof/cops/rspec/aggregate_examples/node_matchers"
 
-require_relative "aggregate_examples/its"
-require_relative "aggregate_examples/matchers_with_side_effects"
+require "test_prof/cops/rspec/aggregate_examples/its"
+require "test_prof/cops/rspec/aggregate_examples/matchers_with_side_effects"
 
 module RuboCop
   module Cop

data/lib/test_prof/factory_all_stub.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require "test_prof"
 require "test_prof/factory_bot"
 require "test_prof/factory_all_stub/factory_bot_patch"
 

data/lib/test_prof/factory_default.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require "test_prof"
 require "test_prof/factory_bot"
 require "test_prof/factory_default/factory_bot_patch"
 
@@ -31,7 +32,6 @@ module TestProf
         TestProf::FactoryBot::Strategy::Build.prepend StrategyExt
         TestProf::FactoryBot::Strategy::Stub.prepend StrategyExt
 
-        @store = {}
         # default is false to retain backward compatibility
         @preserve_traits = false
       end
@@ -57,12 +57,14 @@ module TestProf
       end
 
       def reset
-        @store.clear
+        store.clear
       end
 
       private
 
-      attr_reader :store
+      def store
+        Thread.current[:testprof_factory_store] ||= {}
+      end
     end
   end
 end

data/lib/test_prof/factory_prof.rb

@@ -100,15 +100,21 @@ module TestProf
       def run
         init
 
-        printer = config.printer
-
         started_at = TestProf.now
 
-        at_exit { printer.dump(result, start_time: started_at) }
+        at_exit do
+          print(started_at)
+        end
 
         start
       end
 
+      def print(started_at)
+        printer = config.printer
+
+        printer.dump(result, start_time: started_at)
+      end
+
       def start
         reset!
         @running = true

data/lib/test_prof/recipes/logging.rb

@@ -24,8 +24,6 @@ module TestProf
           ]
         end
 
-        # rubocop:disable Metrics/CyclomaticComplexity
-        # rubocop:disable Metrics/PerceivedComplexity
         def all_loggables
           return @all_loggables if instance_variable_defined?(:@all_loggables)
 

data/lib/test_prof/recipes/minitest/before_all.rb

@@ -2,6 +2,22 @@
 
 require "test_prof/before_all"
 
+Minitest.singleton_class.prepend(Module.new do
+  attr_reader :previous_klass
+  @previous_klass = nil
+
+  def run_one_method(klass, method_name)
+    return super unless klass.respond_to?(:parallelized) && klass.parallelized
+
+    if @previous_klass && @previous_klass != klass
+      @previous_klass.before_all_executor&.deactivate!
+    end
+    @previous_klass = klass
+
+    super
+  end
+end)
+
 module TestProf
   module BeforeAll
     # Add before_all hook to Minitest: wrap all examples into a transaction and
@@ -83,6 +99,38 @@ module TestProf
       class << self
         def included(base)
           base.extend ClassMethods
+
+          base.cattr_accessor :parallelized
+          if base.respond_to?(:parallelize_teardown)
+            base.parallelize_teardown do
+              last_klass = ::Minitest.previous_klass
+              if last_klass&.respond_to?(:parallelized) && last_klass&.parallelized
+                last_klass.before_all_executor&.deactivate!
+              end
+            end
+          end
+
+          if base.respond_to?(:parallelize)
+            base.singleton_class.prepend(Module.new do
+              def parallelize(workers: :number_of_processors, with: :processes)
+                # super.parallelize returns nil when no parallelization is set up
+                if super(workers: workers, with: with).nil?
+                  return
+                end
+
+                case with
+                when :processes
+                  self.parallelized = true
+                when :threads
+                  warn "!!! before_all is not implemented for parallalization with threads and " \
+                    "could work incorrectly"
+                else
+                  warn "!!! tests are using an unknown parallelization strategy and before_all " \
+                    "could work incorrectly"
+                end
+              end
+            end)
+          end
         end
       end
 
@@ -118,7 +166,7 @@ module TestProf
             def run(*)
               super
             ensure
-              before_all_executor&.deactivate!
+              before_all_executor&.deactivate! unless parallelized
             end
           end)
         end

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require "test_prof"
-require_relative "./before_all"
+require "test_prof/recipes/rspec/before_all"
 
 module TestProf
   # Just like `let`, but persist the result for the whole group.
@@ -75,7 +75,7 @@ module TestProf
     # Use uniq prefix for instance variables to avoid collisions
     # We want to use the power of Ruby's unicode support)
     # And we love cats!)
-    PREFIX = RUBY_ENGINE == "jruby" ? "@__jruby_is_not_cat_friendly__" : "@😸"
+    PREFIX = "@😸"
 
     FROZEN_ERROR_HINT = "\nIf you are using `let_it_be`, you may want to pass `reload: true` or `refind: true` modifier to it."
 
@@ -107,7 +107,7 @@ module TestProf
         define_method(identifier) do
           # Trying to detect the context
           # Based on https://github.com/rspec/rspec-rails/commit/7cb796db064f58da7790a92e73ab906ef50b1f34
-          if @__inspect_output.include?("before(:context)") || @__inspect_output.include?("before_all")
+          if /(before|after)\(:context\)/.match?(@__inspect_output) || @__inspect_output.include?("before_all")
             instance_variable_get(:"#{PREFIX}#{identifier}")
           else
             # Fallback to let definition

data/lib/test_prof/rspec_dissect/collectors/before.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative "./base"
+require "test_prof/rspec_dissect/collectors/base"
 
 module TestProf
   module RSpecDissect

data/lib/test_prof/rspec_dissect/collectors/let.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative "./base"
+require "test_prof/rspec_dissect/collectors/base"
 
 module TestProf
   module RSpecDissect

data/lib/test_prof/rspec_stamp/parser.rb

@@ -28,8 +28,6 @@ module TestProf
       end
 
       class << self
-        # rubocop: disable Metrics/CyclomaticComplexity
-        # rubocop: disable Metrics/PerceivedComplexity
         def parse(code)
           sexp = Ripper.sexp(code)
           return unless sexp

data/lib/test_prof/rspec_stamp.rb

@@ -116,8 +116,6 @@ module TestProf
 
       private
 
-      # rubocop: disable Metrics/CyclomaticComplexity
-      # rubocop: disable Metrics/PerceivedComplexity
       def stamp_example(example, tags)
         matches = example.match(EXAMPLE_RXP)
         return false unless matches

data/lib/test_prof/rubocop.rb

@@ -9,5 +9,5 @@ end
 
 require "rubocop"
 
-require_relative "cops/inject"
+require "test_prof/cops/inject"
 require "test_prof/cops/rspec/aggregate_examples"

data/lib/test_prof/stack_prof.rb

@@ -162,13 +162,13 @@ module TestProf
         log :info, <<~MSG
           Run the following command to generate a flame graph report:
 
-          stackprof --flamegraph #{path} > #{html_path} && stackprof --flamegraph-viewer=#{html_path}
+          stackprof --d3-flamegraph #{path} > #{html_path} && stackprof --flamegraph-viewer=#{html_path}
         MSG
       end
 
       def dump_json_report(path)
         report = ::StackProf::Report.new(
-          Marshal.load(IO.binread(path)) # rubocop:disable Security/MarshalLoad
+          Marshal.load(IO.binread(path))
         )
         json_path = path.gsub(/\.dump$/, ".json")
         File.write(json_path, JSON.generate(report.data))

data/lib/test_prof/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module TestProf
-  VERSION = "1.0.6"
+  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.6
+  version: 1.0.9
 platform: ruby
 authors:
 - Vladimir Dementyev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-23 00:00:00.000000000 Z
+date: 2022-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -237,7 +237,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Ruby applications tests profiling tools