diff options
author | aycabta <aycabta@gmail.com> | 2019-08-06 20:28:48 +0900 |
---|---|---|
committer | aycabta <aycabta@gmail.com> | 2019-08-06 20:28:48 +0900 |
commit | 43b52ac0a52807c415e9d24d25954f5055567c5e (patch) | |
tree | c22b2efe4c6d780bc7510e09f75d8885f9d415ab /test/irb | |
parent | 1ee88c51b3c319b74b69540e111e4a1c24833cad (diff) | |
download | ruby-43b52ac0a52807c415e9d24d25954f5055567c5e.tar.gz |
Revert "Don't echo results of assignment expressions"
This reverts commit 1ee88c51b3c319b74b69540e111e4a1c24833cad.
Diffstat (limited to 'test/irb')
-rw-r--r-- | test/irb/test_context.rb | 125 | ||||
-rw-r--r-- | test/irb/test_raise_no_backtrace_exception.rb | 1 |
2 files changed, 0 insertions, 126 deletions
diff --git a/test/irb/test_context.rb b/test/irb/test_context.rb index c73849baec..8b245d105d 100644 --- a/test/irb/test_context.rb +++ b/test/irb/test_context.rb @@ -26,10 +26,6 @@ module TestIRB def encoding Encoding.default_external end - - def reset - @line_no = 0 - end end def setup @@ -88,126 +84,5 @@ module TestIRB def test_default_config assert_equal(true, @context.use_colorize?) end - - def test_assignment_expression - input = TestInputMethod.new - irb = IRB::Irb.new(IRB::WorkSpace.new(Object.new), input) - [ - "foo = bar", - "@foo = bar", - "$foo = bar", - "@@foo = bar", - "::Foo = bar", - "a::Foo = bar", - "Foo = bar", - "foo.bar = 1", - "foo[1] = bar", - "foo += bar", - "foo -= bar", - "foo ||= bar", - "foo &&= bar", - "foo, bar = 1, 2", - "foo.bar=(1)", - "foo; foo = bar", - "foo; foo = bar; ;\n ;", - "foo\nfoo = bar", - ].each do |exp| - assert( - irb.assignment_expression?(exp), - "#{exp.inspect}: should be an assignment expression" - ) - end - - [ - "foo", - "foo.bar", - "foo[0]", - "foo = bar; foo", - "foo = bar\nfoo", - ].each do |exp| - refute( - irb.assignment_expression?(exp), - "#{exp.inspect}: should not be an assignment expression" - ) - end - end - - def test_echo_on_assignment - input = TestInputMethod.new([ - "a = 1\n", - "a\n", - "a, b = 2, 3\n", - "a\n", - "b\n", - "b = 4\n", - "_\n" - ]) - irb = IRB::Irb.new(IRB::WorkSpace.new(Object.new), input) - - # The default - irb.context.echo = true - irb.context.echo_on_assignment = false - out, err = capture_io do - irb.eval_input - end - assert_empty err - assert_equal("=> 1\n=> 2\n=> 3\n=> 4\n", out) - - # Everything is output, like before echo_on_assignment was introduced - input.reset - irb.context.echo = true - irb.context.echo_on_assignment = true - out, err = capture_io do - irb.eval_input - end - assert_empty err - assert_equal("=> 1\n=> 1\n=> [2, 3]\n=> 2\n=> 3\n=> 4\n=> 4\n", out) - - # Nothing is output when echo is false - input.reset - irb.context.echo = false - irb.context.echo_on_assignment = false - out, err = capture_io do - irb.eval_input - end - assert_empty err - assert_equal("", out) - - # Nothing is output when echo is false even if echo_on_assignment is true - input.reset - irb.context.echo = false - irb.context.echo_on_assignment = true - out, err = capture_io do - irb.eval_input - end - assert_empty err - assert_equal("", out) - end - - def test_echo_on_assignment_conf - # Default - IRB.conf[:ECHO] = nil - IRB.conf[:ECHO_ON_ASSIGNMENT] = nil - input = TestInputMethod.new() - irb = IRB::Irb.new(IRB::WorkSpace.new(Object.new), input) - - assert(irb.context.echo?, "echo? should be true by default") - refute(irb.context.echo_on_assignment?, "echo_on_assignment? should be false by default") - - # Explicitly set :ECHO to false - IRB.conf[:ECHO] = false - 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_on_assignment?, "echo_on_assignment? should be false by default") - - # Explicitly set :ECHO_ON_ASSIGNMENT to true - IRB.conf[:ECHO] = nil - IRB.conf[:ECHO_ON_ASSIGNMENT] = true - irb = IRB::Irb.new(IRB::WorkSpace.new(Object.new), input) - - assert(irb.context.echo?, "echo? should be true by default") - assert(irb.context.echo_on_assignment?, "echo_on_assignment? should be true when IRB.conf[:ECHO_ON_ASSIGNMENT] is set to true") - end end end diff --git a/test/irb/test_raise_no_backtrace_exception.rb b/test/irb/test_raise_no_backtrace_exception.rb index 2174600082..e92d8dc970 100644 --- a/test/irb/test_raise_no_backtrace_exception.rb +++ b/test/irb/test_raise_no_backtrace_exception.rb @@ -7,7 +7,6 @@ module TestIRB bundle_exec = ENV.key?('BUNDLE_GEMFILE') ? ['-rbundler/setup'] : [] assert_in_out_err(bundle_exec + %w[-rirb -W0 -e IRB.start(__FILE__) -- -f --], <<-IRB, /Exception: foo/, []) e = Exception.new("foo") - puts e.inspect def e.backtrace; nil; end raise e IRB |