From fc7241ffe2238d228e5121caf8e5ae18fa1ea20e Mon Sep 17 00:00:00 2001 From: k0kubun Date: Mon, 29 May 2017 10:53:54 +0000 Subject: rubyspec: Fix method redefinition warning ruby/spec/rubyspec/library/erb/run_spec.rb:63: warning: method redefined; discarding old main ruby/spec/rubyspec/library/erb/result_spec.rb:53: warning: previous definition of main was here ruby/spec/rubyspec/library/erb/run_spec.rb:76: warning: method redefined; discarding old main1 ruby/spec/rubyspec/library/erb/result_spec.rb:67: warning: previous definition of main1 was here ruby/spec/rubyspec/library/erb/run_spec.rb:81: warning: method redefined; discarding old main2 ruby/spec/rubyspec/library/erb/result_spec.rb:72: warning: previous definition of main2 was here git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@58957 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- spec/rubyspec/library/erb/result_spec.rb | 10 +++++----- spec/rubyspec/library/erb/run_spec.rb | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) (limited to 'spec') diff --git a/spec/rubyspec/library/erb/result_spec.rb b/spec/rubyspec/library/erb/result_spec.rb index bc429da381..d79584b221 100644 --- a/spec/rubyspec/library/erb/result_spec.rb +++ b/spec/rubyspec/library/erb/result_spec.rb @@ -48,7 +48,7 @@ END it "is able to h() or u() if ERB::Util is included" do - class MyERB1 + myerb1 = Class.new do include ERB::Util def main input = "<%=h '<>' %>" @@ -56,13 +56,13 @@ END end end expected = '<>' - actual = MyERB1.new.main() + actual = myerb1.new.main() actual.should == expected end it "use TOPLEVEL_BINDING if binding is not passed" do - class MyERB2 + myerb2 = Class.new do include ERB::Util def main1 #input = "<%= binding.to_s %>" @@ -77,10 +77,10 @@ END eval '_xxx_var_ = 123', TOPLEVEL_BINDING expected = '123' - MyERB2.new.main1().should == expected + myerb2.new.main1().should == expected lambda { - MyERB2.new.main2() + myerb2.new.main2() }.should raise_error(NameError) end end diff --git a/spec/rubyspec/library/erb/run_spec.rb b/spec/rubyspec/library/erb/run_spec.rb index 3110aac1b1..6ad3808a16 100644 --- a/spec/rubyspec/library/erb/run_spec.rb +++ b/spec/rubyspec/library/erb/run_spec.rb @@ -58,7 +58,7 @@ END end it "is able to h() or u() if ERB::Util is included" do - class MyERB1 + myerb1 = Class.new do include ERB::Util def main input = "<%=h '<>' %>" @@ -66,12 +66,12 @@ END end end expected = '<>' - actual = _steal_stdout { MyERB1.new.main() } + actual = _steal_stdout { myerb1.new.main() } actual.should == expected end it "use TOPLEVEL_BINDING if binding is not passed" do - class MyERB2 + myerb2 = Class.new do include ERB::Util def main1 #input = "<%= binding.to_s %>" @@ -86,11 +86,11 @@ END eval '_xxx_var_ = 123', TOPLEVEL_BINDING expected = '123' - actual = _steal_stdout { MyERB2.new.main1() } + actual = _steal_stdout { myerb2.new.main1() } actual.should == expected lambda { - _steal_stdout { MyERB2.new.main2() } + _steal_stdout { myerb2.new.main2() } }.should raise_error(NameError) end end -- cgit v1.2.3