rspec-unit 1.0.0 → 1.1.0

data/Gemfile

@@ -1,7 +1,7 @@
 source :gemcutter
 
 # gem 'bundler', '>= 0.9.16'
-gem 'rspec', '= 2.0.0'
+gem 'rspec', '= 2.1.0'
 
 group :test do
   gem 'rake',        '>= 0.8.7'

data/Gemfile.lock

@@ -10,16 +10,14 @@ GEM
       rubyforge (>= 2.0.0)
     json_pure (1.4.6)
     rake (0.8.7)
-    rspec (2.0.0)
-      rspec-core (= 2.0.0)
-      rspec-expectations (= 2.0.0)
-      rspec-mocks (= 2.0.0)
-    rspec-core (2.0.0)
-    rspec-expectations (2.0.0)
-      diff-lcs (>= 1.1.2)
-    rspec-mocks (2.0.0)
-      rspec-core (= 2.0.0)
-      rspec-expectations (= 2.0.0)
+    rspec (2.1.0)
+      rspec-core (~> 2.1.0)
+      rspec-expectations (~> 2.1.0)
+      rspec-mocks (~> 2.1.0)
+    rspec-core (2.1.0)
+    rspec-expectations (2.1.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.1.0)
     rubyforge (2.0.4)
       json_pure (>= 1.1.7)
 
@@ -30,4 +28,4 @@ PLATFORMS
 DEPENDENCIES
   jeweler (>= 1.4.0)
   rake (>= 0.8.7)
-  rspec (= 2.0.0)
+  rspec (= 2.1.0)

data/Rakefile

@@ -10,7 +10,7 @@ begin
     gem.homepage = "http://github.com/glv/rspec-unit"
     gem.authors = ["Glenn Vanderburg"]
     gem.rubyforge_project = "rspec-unit"
-    gem.add_dependency('rspec', '~> 2.0')
+    gem.add_dependency('rspec', '~> 2.1')
     gem.has_rdoc = false
     gem.files =  FileList["[A-Z]*", "{bin,lib,spec}/**/*"].exclude('**/*.rbc')
     gem.rubyforge_project = 'glv' 

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 1
-:minor: 0
+:minor: 1
 :patch: 0

data/lib/rspec/unit/test_case.rb

@@ -63,6 +63,16 @@ module RSpec
         @_caller_lines ||= {}
       end
       
+      def self.find_caller_lines(name)
+        klass = self
+        while klass.respond_to?(:caller_lines)
+          lines = klass.caller_lines[name]
+          return lines unless lines.nil?
+          klass = klass.superclass
+        end
+        []
+      end
+          
       def self.test_method_metadata
         @_test_method_metadata ||= {}
       end
@@ -94,7 +104,7 @@ module RSpec
       
       def self.tests
         @tests ||= test_methods.sort.map do |m|
-          meta = (test_method_metadata[m] || {}).merge({:caller => caller_lines[m], 
+          meta = (test_method_metadata[m] || {}).merge({:caller => find_caller_lines(m),
                                                         :full_description => "#{display_name}##{m}",
                                                         :test_unit => true})
           Core::Example.new(self, m, meta, proc{execute(m)})
@@ -102,9 +112,10 @@ module RSpec
       end
 
       class <<self
-        private :test_case_name, :caller_lines, :test_method_metadata,
+        private :test_case_name, :test_method_metadata,
                 :install_setup_and_teardown, :test_method?, :test_methods,
                 :number_of_tests, :tests
+        protected :caller_lines, :find_caller_lines
       end
           
       def initialize

data/spec/test_case_spec.rb

@@ -197,6 +197,31 @@ describe "RSpec::Unit::TestCase" do
     end
   end
   
+  describe "find_caller_lines" do
+    it "returns [] if the method name is not found" do
+      @foo.send(:find_caller_lines, 'wrong').should be_empty
+      bar = Class.new(@foo)
+      bar.send(:find_caller_lines, 'wrong').should be_empty
+    end
+    
+    it "returns a stack trace array if the name is found in caller_lines" do
+      @foo.class_eval do
+        def test_bar; end
+      end
+      
+      @foo.send(:find_caller_lines, 'test_bar').should_not be_empty
+    end
+
+    it "returns a stack trace array if the name is found in the parent's caller_lines" do
+      @foo.class_eval do
+        def test_bar; end
+      end
+      bar = Class.new(@foo)
+      
+      bar.send(:find_caller_lines, 'test_bar').should_not be_empty
+    end
+  end
+  
   describe "test class metadata" do
     before do
       class SampleTestCaseForName < RSpec::Unit::TestCase
@@ -226,12 +251,7 @@ describe "RSpec::Unit::TestCase" do
     it "sets :location to file_path and line_number" do
       @foo.metadata[:example_group][:location].should == "#{__FILE__}:#{@foo_definition_line}"
     end
-    
-    it "sets :caller" do
-      @foo.metadata[:example_group][:caller].first.should =~ Regexp.new(Regexp.escape(@foo.metadata[:example_group][:location]))
-      @foo.metadata[:example_group][:caller].size.should be_>(@caller_at_foo_definition.size)
-    end
-    
+        
     it "has nil for :block and :describes" do
       @foo.metadata[:example_group][:block].should be_nil
       @foo.metadata[:example_group][:describes].should be_nil
@@ -304,14 +324,6 @@ describe "RSpec::Unit::TestCase" do
       test_baz_metadata[:example_group].should == @foo.metadata[:example_group]
     end
     
-    it "sets :caller" do
-      @foo.class_eval do
-        def test_baz; end
-      end
-      test_baz_metadata[:caller].first.should match(/^#{Regexp.escape(@foo.examples.first.metadata[:location])}/)
-      test_baz_metadata[:caller].size.should be_>(caller.size)
-    end        
-  
     it "records test_info metadata for next test method" do
       @foo.class_eval do
         test_info :foo => :bar
@@ -327,6 +339,39 @@ describe "RSpec::Unit::TestCase" do
         def test_quux; end
       end
       find_example(@foo, 'test_quux').metadata[:foo].should be_nil
+    end
+    
+    context "inherited methods" do
+      def test_baz_metadata
+        find_example(@bar, 'test_baz').metadata
+      end
+
+      it "sets :file_path to the file where the method is defined" do
+        @foo.class_eval do
+          def test_baz; end
+        end
+        @bar = Class.new(@foo)
+        
+        test_baz_metadata[:file_path].should == __FILE__
+      end
+
+      it "sets :line_number to the line where the method definition begins" do
+        @foo.class_eval do
+          def test_baz; end
+        end
+        @bar = Class.new(@foo)
+
+        test_baz_metadata[:line_number].should == (__LINE__ - 4)
+      end
+
+      it "sets :location to file path and line number" do
+        @foo.class_eval do
+          def test_baz; end
+        end
+        @bar = Class.new(@foo)
+        
+        test_baz_metadata[:location].should == "#{__FILE__}:#{__LINE__-4}"
+      end
     end    
   end
   

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
+  - 1
   - 0
-  - 0
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors: 
 - Glenn Vanderburg
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-10 00:00:00 -05:00
+date: 2010-11-07 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,8 +26,8 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 2
-        - 0
-        version: "2.0"
+        - 1
+        version: "2.1"
   requirement: *id001
   prerelease: false
 description: test/unit compatibility for RSpec 2.