k0kubun	2017-05-29 19:53:54 +0900 (Mon, 29 May 2017)

  New Revision: 58957

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=58957

  Log:
    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

  Modified files:
    trunk/spec/rubyspec/library/erb/result_spec.rb
    trunk/spec/rubyspec/library/erb/run_spec.rb
Index: spec/rubyspec/library/erb/result_spec.rb
===================================================================
--- spec/rubyspec/library/erb/result_spec.rb	(revision 58956)
+++ spec/rubyspec/library/erb/result_spec.rb	(revision 58957)
@@ -48,7 +48,7 @@ END https://github.com/ruby/ruby/blob/trunk/spec/rubyspec/library/erb/result_spec.rb#L48
 
 
   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 https://github.com/ruby/ruby/blob/trunk/spec/rubyspec/library/erb/result_spec.rb#L56
       end
     end
     expected = '&lt;&gt;'
-    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 https://github.com/ruby/ruby/blob/trunk/spec/rubyspec/library/erb/result_spec.rb#L77
 
     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
Index: spec/rubyspec/library/erb/run_spec.rb
===================================================================
--- spec/rubyspec/library/erb/run_spec.rb	(revision 58956)
+++ spec/rubyspec/library/erb/run_spec.rb	(revision 58957)
@@ -58,7 +58,7 @@ END https://github.com/ruby/ruby/blob/trunk/spec/rubyspec/library/erb/run_spec.rb#L58
   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 https://github.com/ruby/ruby/blob/trunk/spec/rubyspec/library/erb/run_spec.rb#L66
       end
     end
     expected = '&lt;&gt;'
-    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 https://github.com/ruby/ruby/blob/trunk/spec/rubyspec/library/erb/run_spec.rb#L86
 
     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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/