Merge pull request #368 from ysakasin/fix_test_execution_order

Fix breaking change of execution order on TestTask
ruby · Dec 21, 2020 · b6bf56c · b6bf56c
2 parents 65be0c7 + 37635e6
commit b6bf56c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/rake/testtask.rb b/lib/rake/testtask.rb
@@ -181,7 +181,7 @@ def run_code # :nodoc:
       when :testrb
         "-S testrb"
       when :rake
-        "-r#{__dir__}/rake_test_loader"
+        "#{__dir__}/rake_test_loader.rb"
       end
     end
 

diff --git a/test/test_rake_test_task.rb b/test/test_rake_test_task.rb
@@ -128,7 +128,7 @@ def test_run_code_rake
       t.loader = :rake
     end
 
-    assert_match(/\A-r.*?\Z/, test_task.run_code)
+    assert_includes test_task.run_code, "lib/rake/rake_test_loader.rb"
   ensure
     Gem.loaded_specs["rake"] = rake
   end