selective-ruby-minitest 0.1.3 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 41cc2c0f392507e524f828b3b353b83a071d6d5716d95ccccf9ef793662e79d0
-  data.tar.gz: db7e463ae55a89a1beba6e6c10ed449c67c34605d96370e19383ac16987871a4
+  metadata.gz: 9cdd3bc1432a5d4ed5550f3a1cc8bd3034e4e96d6e24772e3b12c4170a0ff528
+  data.tar.gz: 3acd8d973aa50c2c2292181bb59c8e57bfe3236ca00ad0bcd713e77580bd74ca
 SHA512:
-  metadata.gz: 9baf717b9749184b2759cb5070334abdf042d9ab5f2a7ec315fd42277d7dd10db670ce9b0332a57e241df963404bf4c53d229c05f18c261d264be15a7f4d545f
-  data.tar.gz: 4bd2f6a0edd9364ec2f7f2cd6f2219e6739ea590e4a26ee6fcff92346631eaaec8b3c20e4bd414d5ab3143cc6906d0b1109b2b088ad1a1a3d8490e72e1a281b1
+  metadata.gz: 7907431f1aa57483b1523156bce6c7d3a45546f8b4ddd10a49e69bb1f94c20d526bf3f045cb8a51a69f4835dfffbf94c9d861e0fc7fd54c57f6cf78fa8bd47ba
+  data.tar.gz: 2007ac6dd36e472874b51349bdea1b1096a939d12cd86d8e4cce94701bbd454ada0cfa50ba48754d37a5bbabd9be7ad4ae28f72fbe2da2f70f92f9859fb08dee

data/.rspec

@@ -0,0 +1,2 @@
+--require spec_helper
+--format documentation

data/.rwx/ci.yml

@@ -0,0 +1,43 @@
+on:
+  cli:
+    init:
+      commit-sha: ${{ event.git.sha }}
+  github:
+    push:
+      if: ${{ event.git.branch == 'main' }}
+      init:
+        commit-sha: ${{ event.git.sha }}
+    pull_request:
+      init:
+        commit-sha: ${{ event.git.sha }}
+
+tasks:
+  - key: tests
+    parallel:
+      matrix:
+        ruby-version: ["2.7.8", "3.0.7", "3.1.7", "3.2.9", "3.3.10", "3.4.9", "4.0.7"]
+    call: ${{ run.dir }}/test.yml
+    init:
+      commit-sha: ${{ init.commit-sha }}
+      ruby-version: ${{ parallel.ruby-version }}
+      minitest-version: "~> 5.0"
+
+  - key: tests-minitest-6
+    parallel:
+      matrix:
+        ruby-version: ["3.2.9", "3.3.10", "3.4.9", "4.0.7"]
+    call: ${{ run.dir }}/test.yml
+    init:
+      commit-sha: ${{ init.commit-sha }}
+      ruby-version: ${{ parallel.ruby-version }}
+      minitest-version: "~> 6.0"
+
+  - key: tests-minitest-floor
+    parallel:
+      matrix:
+        ruby-version: ["2.7.8", "3.0.7", "3.1.7", "3.2.9", "3.3.10", "3.4.9"]
+    call: ${{ run.dir }}/test.yml
+    init:
+      commit-sha: ${{ init.commit-sha }}
+      ruby-version: ${{ parallel.ruby-version }}
+      minitest-version: "= 5.16.0"

data/.rwx/test.yml

@@ -0,0 +1,25 @@
+base:
+  image: ruby:${{ init.ruby-version }}
+  config: none
+
+tasks:
+  - key: code
+    run: |
+      git init -q .
+      git fetch -q --depth 1 https://github.com/selectiveci/selective-ruby-minitest.git ${{ init.commit-sha }}
+      git checkout -q FETCH_HEAD
+
+  - key: bundle-install
+    use: code
+    run: |
+      ruby -v
+      bundle install
+      grep "^    minitest " Gemfile.lock
+    env:
+      MINITEST_VERSION: ${{ init.minitest-version }}
+
+  - key: rspec
+    use: bundle-install
+    run: bundle exec rspec
+    env:
+      MINITEST_VERSION: ${{ init.minitest-version }}

data/lib/selective/ruby/minitest/monkeypatches.rb

@@ -10,7 +10,9 @@ module Selective
 
           # This is the first half of Minitest.run
           def selective_prerun(args = [])
-            load_plugins unless args.delete("--no-plugins") || ENV["MT_NO_PLUGINS"]
+            if ::Minitest::VERSION.to_i < 6
+              load_plugins unless args.delete("--no-plugins") || ENV["MT_NO_PLUGINS"]
+            end
 
             options = process_args args
 
@@ -34,14 +36,14 @@ module Selective
           def selective_postrun(reporter, args = [])
             options = process_args args
 
-            parallel_executor.shutdown
+            parallel_executor.shutdown if parallel_executor.respond_to?(:shutdown)
 
             # might have been removed/replaced during init_plugins:
             summary = reporter.reporters.grep(::Minitest::SummaryReporter).first
 
             reporter.report
 
-            return empty_run! options if summary && summary.count == 0
+            return empty_run! options if summary && summary.count == 0 && respond_to?(:empty_run!)
             reporter.passed?
           end
         end

data/lib/selective/ruby/minitest/runner_wrapper.rb

@@ -42,7 +42,10 @@ module Selective
         def run_test_cases(test_case_ids)
           test_case_ids.map do |test_id|
             klass, method_name = get_test_from_map(test_id)
-            real_time = time { klass.run_one_method(klass, method_name, reporter) }
+            discard_previous_results(klass, method_name)
+            real_time = time do
+              with_test_map(test_id) { run_test(klass, method_name) }
+            end
             foo = format_test_case(test_id, klass, method_name, real_time)
             test_case_callback.call(foo)
           end
@@ -52,10 +55,7 @@ module Selective
           test = test_map[test_case_id]
           return unless test
 
-          result = summary_reporter.results.detect do |r|
-            r.source_location.first.gsub(root_path, "") == test[:file_path] &&
-              r.name == test[:method_name]
-          end
+          result = summary_reporter.results.detect { |r| same_test?(r, test[:klass], test[:method_name]) }
 
           return unless result
 
@@ -92,10 +92,99 @@ module Selective
 
         private
 
+        def run_test(klass, method_name)
+          if klass.respond_to?(:run_one_method)
+            klass.run_one_method(klass, method_name, reporter)
+          else
+            klass.run(klass, method_name, reporter)
+          end
+        end
+
         def time(&block)
           Benchmark.measure(&block).real
         end
 
+        # Records the files a test executes (setup and teardown included) when
+        # the server has asked for a test map; a plain pass-through otherwise
+        # and on older cores that predate test maps.
+        def with_test_map(test_id, &block)
+          if ::Selective::Ruby::Core.const_defined?(:TestMap)
+            ::Selective::Ruby::Core::TestMap.around(test_id, &block)
+          else
+            yield
+          end
+        end
+
+        # Auto-retry (and a manual rerun) can hand a test case back to the very
+        # process that already ran it. Every reporter recorded that first attempt,
+        # so running it again without forgetting the first makes reporters that
+        # keep per-test records -- minitest-reporters' JUnitReporter, for example --
+        # emit the test twice with identical identity. Tools that key on test
+        # identity (Captain, for one) then hold a duplicate they can never
+        # reconcile: their own retries update one copy while the other stays
+        # failed, and the task can never go green. Drop the stale records first so
+        # only the latest attempt is reported, and keep the statistics counters
+        # honest about how many distinct tests ran.
+        def discard_previous_results(klass, method_name)
+          key = [klass.name, method_name]
+          previously_run = previous_runs.key?(key)
+          previous_runs[key] = true
+
+          all_reporters.each do |r|
+            stale = []
+
+            if r.respond_to?(:tests) && r.tests.is_a?(Array)
+              stale.concat(r.tests.select { |result| same_test?(result, klass, method_name) })
+              r.tests.reject! { |result| same_test?(result, klass, method_name) }
+            end
+
+            if r.respond_to?(:results) && r.results.is_a?(Array)
+              stale.concat(r.results.select { |result| same_test?(result, klass, method_name) })
+              r.results.reject! { |result| same_test?(result, klass, method_name) }
+            end
+
+            forget_statistics(r, stale.uniq, previously_run)
+          end
+        end
+
+        def previous_runs
+          @previous_runs ||= {}
+        end
+
+        # Every reporter in the composite, including the ones minitest-reporters
+        # hides behind its DelegateReporter (which can itself be nested).
+        def all_reporters(reporters = reporter.reporters, seen = {})
+          reporters.flat_map do |r|
+            next [] if seen[r.object_id]
+
+            seen[r.object_id] = true
+            nested = []
+            nested.concat(Array(r.send(:all_reporters))) if r.respond_to?(:all_reporters, true)
+            nested.concat(Array(r.reporters)) if r.respond_to?(:reporters)
+            [r, *all_reporters(nested, seen)]
+          end
+        end
+
+        def same_test?(result, klass, method_name)
+          result.respond_to?(:klass) && result.respond_to?(:name) &&
+            result.klass.to_s == klass.name && result.name == method_name
+        end
+
+        # Minitest::StatisticsReporter counts every recorded run, whether or not it
+        # kept the result object (it only keeps failures and skips). A previously
+        # passing test leaves nothing to find in `tests`/`results`, so the rerun
+        # itself is the signal that one count has to come off.
+        def forget_statistics(r, stale, previously_run)
+          if previously_run && r.respond_to?(:count) && r.respond_to?(:count=) && r.count.to_i.positive?
+            r.count -= 1
+          end
+
+          assertions = stale.sum { |result| result.respond_to?(:assertions) ? result.assertions.to_i : 0 }
+          if assertions.positive? && r.respond_to?(:assertions) && r.respond_to?(:assertions=)
+            r.assertions = [r.assertions.to_i - assertions, 0].max
+          end
+        end
+
         def get_test_from_map(test_id)
           t = test_map[test_id]
 

data/lib/selective/ruby/minitest/version.rb

@@ -3,7 +3,7 @@
 module Selective
   module Ruby
     module Minitest
-      VERSION = "0.1.3"
+      VERSION = "0.1.5"
     end
   end
 end

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: selective-ruby-minitest
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.5
 platform: ruby
 authors:
 - Benjamin Wood
 - Nate Vick
-autorequire: 
 bindir: exe
 cert_chain: []
-date: 2026-04-22 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zeitwerk
@@ -39,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.2.5
+- !ruby/object:Gem::Dependency
+  name: benchmark
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -53,6 +66,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.16'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.16'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
 description: Selective is an intelligent test runner for your current CI provider.
   Get real-time test results, intelligent ordering based on code changes, shorter
   run times, automatic flake detection, the ability to re-enqueue failed tests, and
@@ -64,6 +97,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".rspec"
+- ".rwx/ci.yml"
+- ".rwx/test.yml"
 - LICENSE
 - Rakefile
 - lib/selective-ruby-minitest.rb
@@ -77,7 +113,6 @@ metadata:
   homepage_uri: https://www.selective.ci
   source_code_uri: http://github.com/selectiveci/selective-ruby-minitest
   changelog_uri: https://github.com/selectiveci/selective-ruby-minitest/blob/main/CHANGELOG.md
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -85,15 +120,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.22
-signing_key: 
+rubygems_version: 4.0.20
 specification_version: 4
 summary: Selective Ruby Minitest Client
 test_files: []