mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
Merge pull request #31624 from y-yagi/fix_minitest_511
Add support for Minitest 5.11
This commit is contained in:
commit
013a8abd48
5 changed files with 17 additions and 11 deletions
1
Gemfile
1
Gemfile
|
@ -108,7 +108,6 @@ local_gemfile = File.expand_path(".Gemfile", __dir__)
|
|||
instance_eval File.read local_gemfile if File.exist? local_gemfile
|
||||
|
||||
group :test do
|
||||
gem "minitest", "~> 5.10.0"
|
||||
gem "minitest-bisect"
|
||||
|
||||
platforms :mri do
|
||||
|
|
|
@ -306,7 +306,7 @@ GEM
|
|||
mini_magick (4.8.0)
|
||||
mini_mime (0.1.4)
|
||||
mini_portile2 (2.3.0)
|
||||
minitest (5.10.3)
|
||||
minitest (5.11.1)
|
||||
minitest-bisect (1.4.0)
|
||||
minitest-server (~> 1.0)
|
||||
path_expander (~> 1.0)
|
||||
|
@ -522,7 +522,6 @@ DEPENDENCIES
|
|||
libxml-ruby
|
||||
listen (>= 3.0.5, < 3.2)
|
||||
mini_magick
|
||||
minitest (~> 5.10.0)
|
||||
minitest-bisect
|
||||
mocha
|
||||
mysql2 (>= 0.4.4)
|
||||
|
|
|
@ -45,7 +45,8 @@ module ActiveSupport
|
|||
end
|
||||
}
|
||||
end
|
||||
result = Marshal.dump(dup)
|
||||
test_result = defined?(Minitest::Result) ? Minitest::Result.from(self) : dup
|
||||
result = Marshal.dump(test_result)
|
||||
end
|
||||
|
||||
write.puts [result].pack("m")
|
||||
|
@ -69,8 +70,9 @@ module ActiveSupport
|
|||
|
||||
if ENV["ISOLATION_TEST"]
|
||||
yield
|
||||
test_result = defined?(Minitest::Result) ? Minitest::Result.from(self) : dup
|
||||
File.open(ENV["ISOLATION_OUTPUT"], "w") do |file|
|
||||
file.puts [Marshal.dump(dup)].pack("m")
|
||||
file.puts [Marshal.dump(test_result)].pack("m")
|
||||
end
|
||||
exit!
|
||||
else
|
||||
|
|
|
@ -64,11 +64,17 @@ module Rails
|
|||
end
|
||||
|
||||
def format_line(result)
|
||||
"%s#%s = %.2f s = %s" % [result.class, result.name, result.time, result.result_code]
|
||||
klass = result.respond_to?(:klass) ? result.klass : result.class
|
||||
"%s#%s = %.2f s = %s" % [klass, result.name, result.time, result.result_code]
|
||||
end
|
||||
|
||||
def format_rerun_snippet(result)
|
||||
location, line = result.method(result.name).source_location
|
||||
location, line = if result.respond_to?(:source_location)
|
||||
result.source_location
|
||||
else
|
||||
result.method(result.name).source_location
|
||||
end
|
||||
|
||||
"#{executable} #{relative_path_for(location)}:#{line}"
|
||||
end
|
||||
|
||||
|
|
|
@ -163,7 +163,7 @@ class TestUnitReporterTest < ActiveSupport::TestCase
|
|||
end
|
||||
|
||||
def failed_test
|
||||
ft = ExampleTest.new(:woot)
|
||||
ft = Minitest::Result.from(ExampleTest.new(:woot))
|
||||
ft.failures << begin
|
||||
raise Minitest::Assertion, "boo"
|
||||
rescue Minitest::Assertion => e
|
||||
|
@ -176,17 +176,17 @@ class TestUnitReporterTest < ActiveSupport::TestCase
|
|||
error = ArgumentError.new("wups")
|
||||
error.set_backtrace([ "some_test.rb:4" ])
|
||||
|
||||
et = ExampleTest.new(:woot)
|
||||
et = Minitest::Result.from(ExampleTest.new(:woot))
|
||||
et.failures << Minitest::UnexpectedError.new(error)
|
||||
et
|
||||
end
|
||||
|
||||
def passing_test
|
||||
ExampleTest.new(:woot)
|
||||
Minitest::Result.from(ExampleTest.new(:woot))
|
||||
end
|
||||
|
||||
def skipped_test
|
||||
st = ExampleTest.new(:woot)
|
||||
st = Minitest::Result.from(ExampleTest.new(:woot))
|
||||
st.failures << begin
|
||||
raise Minitest::Skip, "skipchurches, misstemples"
|
||||
rescue Minitest::Assertion => e
|
||||
|
|
Loading…
Reference in a new issue