test-prof 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 762cb1cd173cb06523693291ebd0abeff0608d027606f5a42eb49cb429f0ebb2
-  data.tar.gz: 704e418622ec41c6dc0df0323ff0de7eb6b072fa71649f54043fb2e38931d3b2
+  metadata.gz: c7db3f483d344fd783b2438241a2c1498789367740412a66b1586b1ba9a745e0
+  data.tar.gz: a5c652b48e625d0872add68708a544ea9f929af83cd4e802dffdc277d01c2d5f
 SHA512:
-  metadata.gz: cd989d5a679bacbd7aaa27faa9d828548de4d2b863c7e62566a6f8b3ac215b9e5fd205ab3dbf1a5cb5f755c7000151e75c7fe7d02735aff6a66b56e314da7925
-  data.tar.gz: 0e34dc7b6e413eec8a6b6f670458ec5801e9ed9233274effaa5b39920057816ea008a17dd17f3a1dbb641909bad8da1d5253b66e56a67b82a72608addf04646e
+  metadata.gz: ddb20836e08c4488e878b3dc91950f52a812251197b1e1ab697ec3f874d2c9a6ba891fe29bcf8124685ceafa58fa2fe953e873d9f5eff535bf60f55d786d52d6
+  data.tar.gz: f54e9e90d3924a344ae97fe3fed45f976e7e91f8513a6a7190153dadeb215b00fa2c3920ea2903e5553c00e8968964b8119117423d1a2f49d9e0d4232f76f4b9

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## 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][])

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

@@ -120,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.2.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.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Vladimir Dementyev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-08 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