зеркало из https://github.com/github/ruby.git
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
This commit is contained in:
Родитель
26e32b7d65
Коммит
fc7241ffe2
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Загрузка…
Ссылка в новой задаче