test/test.rb in method_source-0.2.0 vs test/test.rb in method_source-0.3.2

@@ -5,10 +5,12 @@
 require "#{direc}/test_helper"
 
 describe MethodSource do
 
   before do
+    @hello_module_source = "  def hello; :hello_module; end\n"
+    @hello_singleton_source = "def $o.hello; :hello_singleton; end\n"
     @hello_source = "def hello; :hello; end\n"
     @hello_comment = "# A comment for hello\n# It spans two lines and is indented by 2 spaces\n"
     @lambda_comment = "# This is a comment for MyLambda\n"
     @lambda_source = "MyLambda = lambda { :lambda }\n"
     @proc_source = "MyProc = Proc.new { :proc }\n"
@@ -19,32 +21,38 @@
     UnboundMethod.method_defined?(:source).should == true
     Proc.method_defined?(:source).should == true
   end
 
   describe "Methods" do
-    if RUBY_VERSION =~ /1.9/
-      it 'should return source for method' do
-        method(:hello).source.should == @hello_source
-      end
-      
-      it 'should return a comment for method' do
-        method(:hello).comment.should == @hello_comment
-      end
+    it 'should return source for method' do
+      method(:hello).source.should == @hello_source
+    end
 
-      it 'should raise for C methods' do
-        lambda { method(:puts).source }.should.raise RuntimeError
-      end
+    it 'should return source for a method defined in a module' do
+      M.instance_method(:hello).source.should == @hello_module_source
+    end
 
-    else
-      it 'should raise on #source for 1.8' do
-        lambda { method(:hello).source }.should.raise RuntimeError
-      end
+    it 'should return source for a singleton method as an instance method' do
+      class << $o; self; end.instance_method(:hello).source.should == @hello_singleton_source
     end
+
+    it 'should return source for a singleton method' do
+      $o.method(:hello).source.should == @hello_singleton_source
+    end
+    
+    
+    it 'should return a comment for method' do
+      method(:hello).comment.should == @hello_comment
+    end
+
+    it 'should raise for C methods' do
+      lambda { method(:puts).source }.should.raise RuntimeError
+    end
   end
 
-  describe "Lambdas and Procs" do
-    if RUBY_VERSION =~ /1.9/
+  if RUBY_VERSION =~ /1.9/
+    describe "Lambdas and Procs" do
       it 'should return source for proc' do
         MyProc.source.should == @proc_source
       end
       
       it 'should return an empty string if there is no comment' do
@@ -56,44 +64,37 @@
       end
       
       it 'should return comment for lambda' do
         MyLambda.comment.should == @lambda_comment
       end
-    else
-      it 'should raise on #source for 1.8' do
-        lambda { method(:hello).source }.should.raise RuntimeError
-      end
     end      
   end
+  describe "Comment tests" do
+    before do
+      @comment1 = "# a\n# b\n"
+      @comment2 = "# a\n# b\n"
+      @comment3 = "# a\n#\n# b\n"
+      @comment4 = "# a\n# b\n"
+      @comment5 = "# a\n# b\n# c\n# d\n"
+    end
 
-  if RUBY_VERSION =~ /1.9/
-    describe "Comment tests" do
-      before do
-        @comment1 = "# a\n# b\n"
-        @comment2 = "# a\n# b\n"
-        @comment3 = "# a\n#\n# b\n"
-        @comment4 = "# a\n# b\n"
-        @comment5 = "# a\n# b\n# c\n# d\n"
-      end
+    it "should correctly extract multi-line comments" do
+      method(:comment_test1).comment.should == @comment1
+    end
 
-      it "should correctly extract multi-line comments" do
-        method(:comment_test1).comment.should == @comment1
-      end
+    it "should correctly strip leading whitespace before comments" do
+      method(:comment_test2).comment.should == @comment2
+    end
 
-      it "should correctly strip leading whitespace before comments" do
-        method(:comment_test2).comment.should == @comment2
-      end
-
-      it "should keep empty comment lines" do
-        method(:comment_test3).comment.should == @comment3
-      end
-      
-      it "should ignore blank lines between comments" do
-        method(:comment_test4).comment.should == @comment4
-      end
-
-      it "should align all comments to same indent level" do
-        method(:comment_test5).comment.should == @comment5
-      end      
+    it "should keep empty comment lines" do
+      method(:comment_test3).comment.should == @comment3
     end
+    
+    it "should ignore blank lines between comments" do
+      method(:comment_test4).comment.should == @comment4
+    end
+
+    it "should align all comments to same indent level" do
+      method(:comment_test5).comment.should == @comment5
+    end      
   end
 end