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

Simplify default rake test loader #357

Merged
merged 1 commit into from
Oct 22, 2020
Merged
Show file tree
Hide file tree
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
37 changes: 1 addition & 36 deletions lib/rake/testtask.rb
Original file line number Diff line number Diff line change
Expand Up @@ -181,44 +181,9 @@ def run_code # :nodoc:
when :testrb
"-S testrb"
when :rake
"#{rake_include_arg} \"#{rake_loader}\""
"-r#{__dir__}/rake_test_loader"
end
end

def rake_loader # :nodoc:
find_file("rake/rake_test_loader") or
fail "unable to find rake test loader"
end

def find_file(fn) # :nodoc:
$LOAD_PATH.each do |path|
file_path = File.join(path, "#{fn}.rb")
return file_path if File.exist? file_path
end
nil
end

def rake_include_arg # :nodoc:
spec = Gem.loaded_specs["rake"]
if spec.respond_to?(:default_gem?) && spec.default_gem?
""
else
"-I\"#{rake_lib_dir}\""
end
end

def rake_lib_dir # :nodoc:
find_dir("rake") or
fail "unable to find rake lib"
end

def find_dir(fn) # :nodoc:
$LOAD_PATH.each do |path|
file_path = File.join(path, "#{fn}.rb")
return path if File.exist? file_path
end
nil
end

end
end
2 changes: 1 addition & 1 deletion test/test_rake_test_task.rb
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ def test_run_code_rake
t.loader = :rake
end

assert_match(/\A-I".*?" ".*?"\Z/, test_task.run_code)
assert_match(/\A-r.*?\Z/, test_task.run_code)
ensure
Gem.loaded_specs["rake"] = rake
end
Expand Down