test-prof 1.1.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e19d20bbf0af4e016f9dabfe56e8074cce79d750a359555a2855b982298aa8b
-  data.tar.gz: 609607e479fabd363a6ee27e20b2f55845c9a5682fdec6352b5411b7c20e5ed5
+  metadata.gz: c7db3f483d344fd783b2438241a2c1498789367740412a66b1586b1ba9a745e0
+  data.tar.gz: a5c652b48e625d0872add68708a544ea9f929af83cd4e802dffdc277d01c2d5f
 SHA512:
-  metadata.gz: a17fe83206dd28c8b632acc3cfeb79c1acdf8344fbb199f1a688f1e61ef9f11097f0de0cc04ba1d153d108c2e966622062ea4e9917c2e8083c921de7b5bba9b6
-  data.tar.gz: cdaf249b8072a916dad83d690d32d9264ff40c46c542f26374fd217324af99a04be61560753d37ee44a0298f05b71d1ef0616e62bf020035414c4ed28d51fab3
+  metadata.gz: ddb20836e08c4488e878b3dc91950f52a812251197b1e1ab697ec3f874d2c9a6ba891fe29bcf8124685ceafa58fa2fe953e873d9f5eff535bf60f55d786d52d6
+  data.tar.gz: f54e9e90d3924a344ae97fe3fed45f976e7e91f8513a6a7190153dadeb215b00fa2c3920ea2903e5553c00e8968964b8119117423d1a2f49d9e0d4232f76f4b9

data/CHANGELOG.md

@@ -2,6 +2,16 @@
 
 ## master (unreleased)
 
+## 1.2.1 (2023-03-22)
+
+- Fix regression with `before_all(setup_fixtures: true)` and `rspec-rails` v6.0+. ([@palkan][])
+
+- Upgrade to RubyProf 1.4+. ([@palkan][])
+
+## 1.2.0 (2023-02-07)
+
+- Add support for multiple databases to `before_all` / `let_it_be` with Active Record. ([@rutgerw][])
+
 ## 1.1.0 (2022-12-06)
 
 - LetItBe: freeze records during initialization with `freeze: true`. ([@palkan][])
@@ -279,7 +289,7 @@ end
 - Add threshold and custom event support to FactoryDoctor. ([@palkan][])
 
 ```sh
-$ FDOC=1 FDOC_EVENT="sql.rom" FDOC_THRESHOLD=0.1 rspec
+FDOC=1 FDOC_EVENT="sql.rom" FDOC_THRESHOLD=0.1 rspec
 ```
 
 - Add Fabrication support to FactoryDoctor. ([@palkan][])
@@ -328,16 +338,6 @@ end
 See [changelog](https://github.com/test-prof/test-prof/blob/v0.8.0/CHANGELOG.md) for versions <0.9.0.
 
 [@palkan]: https://github.com/palkan
-[@marshall-lee]: https://github.com/marshall-lee
-[@danielwestendorf]: https://github.com/danielwestendorf
-[@shkrt]: https://github.com/Shkrt
-[@idolgirev]: https://github.com/IDolgirev
-[@desoleary]: https://github.com/desoleary
-[@rabotyaga]: https://github.com/rabotyaga
-[@vasfed]: https://github.com/Vasfed
-[@szemek]: https://github.com/szemek
-[@mkldon]: https://github.com/mkldon
-[@dmagro]: https://github.com/dmagro
 [@danielwaterworth]: https://github.com/danielwaterworth
 [@envek]: https://github.com/Envek
 [@tyleriguchi]: https://github.com/tyleriguchi
@@ -347,9 +347,12 @@ 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
 [@ygelfand]: https://github.com/ygelfand
 [@cbliard]: https://github.com/cbliard
 [@maxshend]: https://github.com/maxshend
+[@rutgerw]: https://github.com/rutgerw
+[@markedmondson]: https://github.com/markedmondson
+[@cbarton]: https://github.com/cbarton
+[@peret]: https://github.com/peret

data/lib/test_prof/any_fixture.rb

@@ -102,19 +102,6 @@ module TestProf
         yield config
       end
 
-      # Backward compatibility
-      def reporting_enabled=(val)
-        warn "AnyFixture.reporting_enabled is deprecated and will be removed in 1.1. Use AnyFixture.config.reporting_enabled instead"
-        config.reporting_enabled = val
-      end
-
-      def reporting_enabled
-        warn "AnyFixture.reporting_enabled is deprecated and will be removed in 1.1. Use AnyFixture.config.reporting_enabled instead"
-        config.reporting_enabled
-      end
-
-      alias_method :reporting_enabled?, :reporting_enabled
-
       # Register a block of code as a fixture,
       # returns the result of the block execution
       def register(id)

data/lib/test_prof/before_all/adapters/active_record.rb

@@ -6,17 +6,30 @@ module TestProf
       # ActiveRecord adapter for `before_all`
       module ActiveRecord
         class << self
+          def all_connections
+            @all_connections ||= if ::ActiveRecord::Base.respond_to? :connects_to
+              ::ActiveRecord::Base.connection_handler.connection_pool_list.map(&:connection)
+            else
+              Array.wrap(::ActiveRecord::Base.connection)
+            end
+          end
+
           def begin_transaction
-            ::ActiveRecord::Base.connection.begin_transaction(joinable: false)
+            @all_connections = nil
+            all_connections.each do |connection|
+              connection.begin_transaction(joinable: false)
+            end
           end
 
           def rollback_transaction
-            if ::ActiveRecord::Base.connection.open_transactions.zero?
-              warn "!!! before_all transaction has been already rollbacked and " \
-                   "could work incorrectly"
-              return
+            all_connections.each do |connection|
+              if connection.open_transactions.zero?
+                warn "!!! before_all transaction has been already rollbacked and " \
+                      "could work incorrectly"
+                next
+              end
+              connection.rollback_transaction
             end
-            ::ActiveRecord::Base.connection.rollback_transaction
           end
 
           def setup_fixtures(test_object)

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

@@ -12,6 +12,7 @@ module TestProf
         if within_before_all?
           before(:all) do
             @__inspect_output = "before_all hook"
+            ::RSpec.current_scope = :before_all if ::RSpec.respond_to?(:current_scope=)
             instance_eval(&block)
           end
           return
@@ -22,6 +23,7 @@ module TestProf
 
         before(:all) do
           @__inspect_output = "before_all hook"
+          ::RSpec.current_scope = :before_all if ::RSpec.respond_to?(:current_scope=)
           BeforeAll.setup_fixtures(self) if setup_fixtures
           BeforeAll.begin_transaction(context, current_metadata) do
             instance_eval(&block)

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

@@ -82,10 +82,12 @@ module TestProf
                              "Available modifiers are: #{modifiers.keys.join(", ")}"
       end
     end
+
     # 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 = "@😸"
+    # Allow overriding the prefix (there are some intermittent issues on JRuby still)
+    PREFIX = ENV.fetch("LET_IT_BE_IVAR_PREFIX", "@😸")
 
     FROZEN_ERROR_HINT = "\nIf you are using `let_it_be`, you may want to pass `reload: true` or `refind: true` modifier to it."
 
@@ -118,11 +120,13 @@ module TestProf
       LetItBe.module_for(self).module_eval do
         define_method(identifier) do
           # Trying to detect the context
-          # Based on https://github.com/rspec/rspec-rails/commit/7cb796db064f58da7790a92e73ab906ef50b1f34
-          if /(before|after)\(:context\)/.match?(@__inspect_output) || @__inspect_output.include?("before_all")
+          # First, check for ::RSpec.current_scope (modern RSpec) and then read @__inspect_output
+          # (based on https://github.com/rspec/rspec-rails/commit/7cb796db064f58da7790a92e73ab906ef50b1f34)
+          if ::RSpec.respond_to?(:current_scope) && %i[before_all before_context_hook after_context_hook].include?(::RSpec.current_scope)
+            instance_variable_get(:"#{PREFIX}#{identifier}")
+          elsif /(before|after)\(:context\)/.match?(@__inspect_output) || @__inspect_output.include?("before_all")
             instance_variable_get(:"#{PREFIX}#{identifier}")
           else
-            # Fallback to let definition
             super()
           end
         end

data/lib/test_prof/ruby_prof.rb

@@ -173,9 +173,7 @@ module TestProf
 
         return unless init_ruby_prof
 
-        options = {
-          merge_fibers: true
-        }
+        options = {}
 
         options[:include_threads] = [Thread.current] unless
           config.include_threads?
@@ -214,7 +212,7 @@ module TestProf
           <<~MSG
             Please, install 'ruby-prof' first:
                # Gemfile
-              gem 'ruby-prof', '>= 0.16.0', require: false
+              gem 'ruby-prof', '>= 1.4.0', require: false
           MSG
         ) { check_ruby_prof_version }
       end

data/lib/test_prof/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: test-prof
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Vladimir Dementyev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-06 00:00:00.000000000 Z
+date: 2023-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -39,19 +39,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '13.0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: isolator
   requirement: !ruby/object:Gem::Requirement
@@ -237,7 +237,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.11
+rubygems_version: 3.4.8
 signing_key:
 specification_version: 4
 summary: Ruby applications tests profiling tools