зеркало из https://github.com/github/ruby.git
[ruby/irb] Properly reset USE_COLORIZE after changing it in tests
Some context tests assigns USE_COLORIZE to false and never change it back. This can potentially affect other tests' result as the default should be nil (activated) instead. https://github.com/ruby/irb/commit/986eb16ece
This commit is contained in:
st0012
git
Родитель
69337a65b2
Коммит
a415a3de05
|
|
@ -279,7 +279,6 @@ module TestIRB
|
||||||
end
|
end
|
||||||
|
|
||||||
def test_omit_on_assignment
|
def test_omit_on_assignment
|
||||||
IRB.conf[:USE_COLORIZE] = false
|
|
||||||
input = TestInputMethod.new([
|
input = TestInputMethod.new([
|
||||||
"a = [1] * 100\n",
|
"a = [1] * 100\n",
|
||||||
"a\n",
|
"a\n",
|
||||||
|
|
@ -343,101 +342,103 @@ module TestIRB
|
||||||
end
|
end
|
||||||
|
|
||||||
def test_omit_multiline_on_assignment
|
def test_omit_multiline_on_assignment
|
||||||
IRB.conf[:USE_COLORIZE] = false
|
without_colorize do
|
||||||
input = TestInputMethod.new([
|
input = TestInputMethod.new([
|
||||||
"class A; def inspect; ([?* * 1000] * 3).join(%{\\n}); end; end; a = A.new\n",
|
"class A; def inspect; ([?* * 1000] * 3).join(%{\\n}); end; end; a = A.new\n",
|
||||||
"a\n"
|
"a\n"
|
||||||
])
|
])
|
||||||
value = ([?* * 1000] * 3).join(%{\n})
|
value = ([?* * 1000] * 3).join(%{\n})
|
||||||
value_first_line = (?* * 1000).to_s
|
value_first_line = (?* * 1000).to_s
|
||||||
irb = IRB::Irb.new(IRB::WorkSpace.new(Object.new), input)
|
irb = IRB::Irb.new(IRB::WorkSpace.new(Object.new), input)
|
||||||
irb.context.return_format = "=> %s\n"
|
irb.context.return_format = "=> %s\n"
|
||||||
|
|
||||||
irb.context.echo = true
|
irb.context.echo = true
|
||||||
irb.context.echo_on_assignment = false
|
irb.context.echo_on_assignment = false
|
||||||
out, err = capture_output do
|
out, err = capture_output do
|
||||||
irb.eval_input
|
irb.eval_input
|
||||||
end
|
end
|
||||||
assert_empty err
|
assert_empty err
|
||||||
assert_equal("=> \n#{value}\n", out)
|
assert_equal("=> \n#{value}\n", out)
|
||||||
irb.context.evaluate('A.remove_method(:inspect)', 0)
|
irb.context.evaluate('A.remove_method(:inspect)', 0)
|
||||||
|
|
||||||
input.reset
|
input.reset
|
||||||
irb.context.echo = true
|
irb.context.echo = true
|
||||||
irb.context.echo_on_assignment = :truncate
|
irb.context.echo_on_assignment = :truncate
|
||||||
out, err = capture_output do
|
out, err = capture_output do
|
||||||
irb.eval_input
|
irb.eval_input
|
||||||
end
|
end
|
||||||
assert_empty err
|
assert_empty err
|
||||||
assert_equal("=> #{value_first_line[0..(input.winsize.last - 9)]}...\n=> \n#{value}\n", out)
|
assert_equal("=> #{value_first_line[0..(input.winsize.last - 9)]}...\n=> \n#{value}\n", out)
|
||||||
irb.context.evaluate('A.remove_method(:inspect)', 0)
|
irb.context.evaluate('A.remove_method(:inspect)', 0)
|
||||||
|
|
||||||
input.reset
|
input.reset
|
||||||
irb.context.echo = true
|
irb.context.echo = true
|
||||||
irb.context.echo_on_assignment = true
|
irb.context.echo_on_assignment = true
|
||||||
out, err = capture_output do
|
out, err = capture_output do
|
||||||
irb.eval_input
|
irb.eval_input
|
||||||
end
|
end
|
||||||
assert_empty err
|
assert_empty err
|
||||||
assert_equal("=> \n#{value}\n=> \n#{value}\n", out)
|
assert_equal("=> \n#{value}\n=> \n#{value}\n", out)
|
||||||
irb.context.evaluate('A.remove_method(:inspect)', 0)
|
irb.context.evaluate('A.remove_method(:inspect)', 0)
|
||||||
|
|
||||||
input.reset
|
input.reset
|
||||||
irb.context.echo = false
|
irb.context.echo = false
|
||||||
irb.context.echo_on_assignment = false
|
irb.context.echo_on_assignment = false
|
||||||
out, err = capture_output do
|
out, err = capture_output do
|
||||||
irb.eval_input
|
irb.eval_input
|
||||||
end
|
end
|
||||||
assert_empty err
|
assert_empty err
|
||||||
assert_equal("", out)
|
assert_equal("", out)
|
||||||
irb.context.evaluate('A.remove_method(:inspect)', 0)
|
irb.context.evaluate('A.remove_method(:inspect)', 0)
|
||||||
|
|
||||||
input.reset
|
input.reset
|
||||||
irb.context.echo = false
|
irb.context.echo = false
|
||||||
irb.context.echo_on_assignment = :truncate
|
irb.context.echo_on_assignment = :truncate
|
||||||
out, err = capture_output do
|
out, err = capture_output do
|
||||||
irb.eval_input
|
irb.eval_input
|
||||||
end
|
end
|
||||||
assert_empty err
|
assert_empty err
|
||||||
assert_equal("", out)
|
assert_equal("", out)
|
||||||
irb.context.evaluate('A.remove_method(:inspect)', 0)
|
irb.context.evaluate('A.remove_method(:inspect)', 0)
|
||||||
|
|
||||||
input.reset
|
input.reset
|
||||||
irb.context.echo = false
|
irb.context.echo = false
|
||||||
irb.context.echo_on_assignment = true
|
irb.context.echo_on_assignment = true
|
||||||
out, err = capture_output do
|
out, err = capture_output do
|
||||||
irb.eval_input
|
irb.eval_input
|
||||||
|
end
|
||||||
|
assert_empty err
|
||||||
|
assert_equal("", out)
|
||||||
|
irb.context.evaluate('A.remove_method(:inspect)', 0)
|
||||||
end
|
end
|
||||||
assert_empty err
|
|
||||||
assert_equal("", out)
|
|
||||||
irb.context.evaluate('A.remove_method(:inspect)', 0)
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def test_echo_on_assignment_conf
|
def test_echo_on_assignment_conf
|
||||||
# Default
|
# Default
|
||||||
IRB.conf[:ECHO] = nil
|
IRB.conf[:ECHO] = nil
|
||||||
IRB.conf[:ECHO_ON_ASSIGNMENT] = nil
|
IRB.conf[:ECHO_ON_ASSIGNMENT] = nil
|
||||||
IRB.conf[:USE_COLORIZE] = false
|
without_colorize do
|
||||||
input = TestInputMethod.new()
|
input = TestInputMethod.new()
|
||||||
irb = IRB::Irb.new(IRB::WorkSpace.new(Object.new), input)
|
irb = IRB::Irb.new(IRB::WorkSpace.new(Object.new), input)
|
||||||
|
|
||||||
assert(irb.context.echo?, "echo? should be true by default")
|
assert(irb.context.echo?, "echo? should be true by default")
|
||||||
assert_equal(:truncate, irb.context.echo_on_assignment?, "echo_on_assignment? should be :truncate by default")
|
assert_equal(:truncate, irb.context.echo_on_assignment?, "echo_on_assignment? should be :truncate by default")
|
||||||
|
|
||||||
# Explicitly set :ECHO to false
|
# Explicitly set :ECHO to false
|
||||||
IRB.conf[:ECHO] = false
|
IRB.conf[:ECHO] = false
|
||||||
irb = IRB::Irb.new(IRB::WorkSpace.new(Object.new), input)
|
irb = IRB::Irb.new(IRB::WorkSpace.new(Object.new), input)
|
||||||
|
|
||||||
refute(irb.context.echo?, "echo? should be false when IRB.conf[:ECHO] is set to false")
|
refute(irb.context.echo?, "echo? should be false when IRB.conf[:ECHO] is set to false")
|
||||||
assert_equal(:truncate, irb.context.echo_on_assignment?, "echo_on_assignment? should be :truncate by default")
|
assert_equal(:truncate, irb.context.echo_on_assignment?, "echo_on_assignment? should be :truncate by default")
|
||||||
|
|
||||||
# Explicitly set :ECHO_ON_ASSIGNMENT to true
|
# Explicitly set :ECHO_ON_ASSIGNMENT to true
|
||||||
IRB.conf[:ECHO] = nil
|
IRB.conf[:ECHO] = nil
|
||||||
IRB.conf[:ECHO_ON_ASSIGNMENT] = false
|
IRB.conf[:ECHO_ON_ASSIGNMENT] = false
|
||||||
irb = IRB::Irb.new(IRB::WorkSpace.new(Object.new), input)
|
irb = IRB::Irb.new(IRB::WorkSpace.new(Object.new), input)
|
||||||
|
|
||||||
assert(irb.context.echo?, "echo? should be true by default")
|
assert(irb.context.echo?, "echo? should be true by default")
|
||||||
refute(irb.context.echo_on_assignment?, "echo_on_assignment? should be false when IRB.conf[:ECHO_ON_ASSIGNMENT] is set to false")
|
refute(irb.context.echo_on_assignment?, "echo_on_assignment? should be false when IRB.conf[:ECHO_ON_ASSIGNMENT] is set to false")
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def test_multiline_output_on_default_inspector
|
def test_multiline_output_on_default_inspector
|
||||||
|
|
@ -445,31 +446,32 @@ module TestIRB
|
||||||
def main.inspect
|
def main.inspect
|
||||||
"abc\ndef"
|
"abc\ndef"
|
||||||
end
|
end
|
||||||
IRB.conf[:USE_COLORIZE] = false
|
|
||||||
input = TestInputMethod.new([
|
|
||||||
"self"
|
|
||||||
])
|
|
||||||
irb = IRB::Irb.new(IRB::WorkSpace.new(main), input)
|
|
||||||
irb.context.return_format = "=> %s\n"
|
|
||||||
|
|
||||||
# The default
|
without_colorize do
|
||||||
irb.context.newline_before_multiline_output = true
|
input = TestInputMethod.new([
|
||||||
out, err = capture_output do
|
"self"
|
||||||
irb.eval_input
|
])
|
||||||
end
|
irb = IRB::Irb.new(IRB::WorkSpace.new(main), input)
|
||||||
assert_empty err
|
irb.context.return_format = "=> %s\n"
|
||||||
assert_equal("=> \nabc\ndef\n",
|
|
||||||
out)
|
|
||||||
|
|
||||||
# No newline before multiline output
|
# The default
|
||||||
input.reset
|
irb.context.newline_before_multiline_output = true
|
||||||
irb.context.newline_before_multiline_output = false
|
out, err = capture_output do
|
||||||
out, err = capture_output do
|
irb.eval_input
|
||||||
irb.eval_input
|
end
|
||||||
|
assert_empty err
|
||||||
|
assert_equal("=> \nabc\ndef\n",
|
||||||
|
out)
|
||||||
|
|
||||||
|
# No newline before multiline output
|
||||||
|
input.reset
|
||||||
|
irb.context.newline_before_multiline_output = false
|
||||||
|
out, err = capture_output do
|
||||||
|
irb.eval_input
|
||||||
|
end
|
||||||
|
assert_empty err
|
||||||
|
assert_equal("=> abc\ndef\n", out)
|
||||||
end
|
end
|
||||||
assert_empty err
|
|
||||||
assert_equal("=> abc\ndef\n",
|
|
||||||
out)
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def test_default_return_format
|
def test_default_return_format
|
||||||
|
|
@ -642,5 +644,15 @@ module TestIRB
|
||||||
:*, /\b6\n/,
|
:*, /\b6\n/,
|
||||||
], out)
|
], out)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
private
|
||||||
|
|
||||||
|
def without_colorize
|
||||||
|
original_value = IRB.conf[:USE_COLORIZE]
|
||||||
|
IRB.conf[:USE_COLORIZE] = false
|
||||||
|
yield
|
||||||
|
ensure
|
||||||
|
IRB.conf[:USE_COLORIZE] = original_value
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
||||||
Загрузка…
Ссылка в новой задаче