Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix breaking change of execution order on TestTask #368

Merged
merged 1 commit into from
Dec 21, 2020
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Fix breaking change of execution order on TestTask
Due to #357, execution order on Rake 13.0.2 changes from Rake 13.0.1.

Example:
```
Rake::TestTask do |t|
  t.test_files = [
    "test/a.rb",
    "test/b.rb",
  ]
end
```

On 13.0.2, Rake executes test/b.rb before test/a.rb because test/a.rb are loaded before rake_test_loader.rb.
rake_test_loader.rb executes the Ruby code in ARGV using Kernel.#require, but does not execute test/a.rb which is already loaded.

In addition, Rake 13.0.1 allows specifying test_files without .rb but 13.0.2 doesn't allows.
This commit also fixes this problem.
```
Rake::TestTask do |t|
  t.test_files = [
    "test/setup",
    "test/a.rb",
  ]
end
```
ysakasin committed Dec 20, 2020
commit 37635e61ad2b663542216105ba23042f1e80683c
2 changes: 1 addition & 1 deletion lib/rake/testtask.rb
Original file line number Diff line number Diff line change
@@ -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

2 changes: 1 addition & 1 deletion test/test_rake_test_task.rb
Original file line number Diff line number Diff line change
@@ -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