rspec 1.2.2 → 1.2.3

data/spec/spec/example/example_group_methods_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+  require File.dirname(__FILE__) + '/../../spec_helper'
 
 module Spec
   module Example
@@ -47,6 +47,14 @@ module Spec
                 @child_example_group.location.should =~ /#{__FILE__}:#{__LINE__ - 15}/
               end
             end
+            
+            describe "when creating an example group with no description" do
+              it "raises an ArgumentError" do
+                lambda do
+                  Class.new(ExampleGroupDouble).describe
+                end.should raise_error(Spec::Example::NoDescriptionError, /No description supplied for example group declared on #{__FILE__}:#{__LINE__ - 1}/)
+              end
+            end
 
             describe "when creating a SharedExampleGroup" do
               before(:each) do
@@ -79,6 +87,7 @@ module Spec
                 before(:all) do
                   @example_group = Class.new(ExampleGroupDouble).describe("bar")
                   @example_proxy = @example_group.__send__(method, "foo", {:this => :that}) {}
+                  @location = "#{__FILE__}:#{__LINE__ - 1}"
                 end
 
                 specify "with a description" do
@@ -89,12 +98,13 @@ module Spec
                   @example_proxy.options.should == {:this => :that}
                 end
 
-                specify "with a default backtrace" do
-                  @example_proxy.backtrace.should =~ /#{__FILE__}:#{__LINE__ - 12}/
+                specify "with a default backtrace (DEPRECATED)" do
+                  Spec.stub!(:deprecate)
+                  @example_proxy.backtrace.should =~ /#{@location}/
                 end
 
                 specify "with a default location" do
-                  @example_proxy.location.should =~ /#{__FILE__}:#{__LINE__ - 16}/
+                  @example_proxy.location.should =~ /#{@location}/
                 end
               end
             end
@@ -106,7 +116,8 @@ module Spec
                   @example_proxy = @example_group.__send__(method, "foo", {:this => :that}, "the location") {}
                 end
 
-                specify "with the supplied location as #backtrace" do
+                specify "with the supplied location as #backtrace (DEPRECATED)" do
+                  Spec.stub!(:deprecate)
                   @example_proxy.backtrace.should == "the location"
                 end
 
@@ -593,33 +604,6 @@ module Spec
           end
         end
 
-        describe "#backtrace" do        
-          it "returns the backtrace from where the example group was defined" do
-            example_group = Class.new(ExampleGroupDouble).describe("foo") do
-              example "bar" do; end
-            end
-            example_group.backtrace.join("\n").should include("#{__FILE__}:#{__LINE__-3}")
-          end
-        end
-
-        describe "#example_group_backtrace (deprecated)" do        
-          before(:each) do
-            Kernel.stub!(:warn)
-          end
-          it "sends a deprecation warning" do
-            example_group = Class.new(ExampleGroupDouble) {}
-            Kernel.should_receive(:warn).with(/#example_group_backtrace.*deprecated.*#backtrace instead/m)
-            example_group.example_group_backtrace
-          end
-
-          it "returns the backtrace from where the example group was defined" do
-            example_group = Class.new(ExampleGroupDouble).describe("foo") do
-              example "bar" do; end
-            end
-            example_group.example_group_backtrace.join("\n").should include("#{__FILE__}:#{__LINE__-3}")
-          end
-        end
-        
         describe "#before" do
           it "stores before(:each) blocks" do
             example_group = Class.new(ExampleGroupDouble) {}

data/spec/spec/example/example_group_proxy_spec.rb

@@ -26,14 +26,24 @@ module Spec
         end
       end
 
-      describe "#filtered_description" do
+      describe "#filtered_description (DEPRECATED)" do
+        before(:each) do
+          Spec.stub!(:deprecate)
+        end
+        
+        it "is deprecated" do
+          Spec.should_receive(:deprecate)
+          proxy.filtered_description(/(ignore)/)
+        end
+        
         it "builds the description from the group's nested_descriptions" do
           group.stub!(:nested_descriptions => ["ignore","the","description"])
-          proxy.filtered_description(/ignore/).should == "the description"
+          proxy.filtered_description(/(ignore)/).should == "the description"
         end
+        
         it "filters out description parts that match the supplied regexp" do
-          group.stub!(:nested_descriptions => ["ignore this one","the","description"])
-          proxy.filtered_description(/ignore/).should == "the description"
+          group.stub!(:nested_descriptions => ["ignore the","description"])
+          proxy.filtered_description(/(ignore )/).should == "the description"
         end
       end
       
@@ -45,10 +55,20 @@ module Spec
       end
       
       describe "#backtrace (deprecated - use #location)" do
+        before(:each) do
+          Spec.stub!(:deprecate)
+        end
+
         it "provides the location of the declaration of this group" do
-          group.stub!(:backtrace => "path/to/location:37")
+          group.stub!(:location => "path/to/location:37")
           proxy.backtrace.should == "path/to/location:37"
         end
+        
+        it "warns deprecation" do
+          Spec.should_receive(:deprecate)
+          group.stub!(:location => "path/to/location:37")
+          proxy.backtrace
+        end
       end
       
       describe "#location" do

data/spec/spec/example/example_group_spec.rb

@@ -278,9 +278,9 @@ module Spec
             ExampleGroupFactory.reset
           end
 
-          it "should send reporter add_example_group" do
+          it "should send reporter example_group_started" do
+            reporter.should_receive(:example_group_started)
             example_group.run(options)
-            reporter.example_groups.should == [example_group]
           end
 
           it "should run example on run" do

data/spec/spec/example/example_methods_spec.rb

@@ -32,30 +32,6 @@ module Spec
         end
       end
 
-      describe "#backtrace" do        
-        it "returns the backtrace from where the example was defined" do
-          example = ExampleGroup.dup.new ExampleProxy.new
-          example.backtrace.join("\n").should include("#{__FILE__}:#{__LINE__-1}")
-        end
-      end
-      
-      describe "#implementation_backtrace (deprecated)" do
-        before(:each) do
-          Kernel.stub!(:warn)
-        end
-
-        it "sends a deprecation warning" do
-          Kernel.should_receive(:warn).with(/#implementation_backtrace.*deprecated.*#backtrace instead/m)
-          example = ExampleGroup.dup.new ExampleProxy.new
-          example.implementation_backtrace
-        end
-        
-        it "returns the backtrace from where the example was defined" do
-          example = ExampleGroup.dup.new ExampleProxy.new
-          example.implementation_backtrace.join("\n").should include("#{__FILE__}:#{__LINE__-1}")
-        end
-      end
-
       describe "#should" do
         before(:each) do
           @example_group = Class.new(ExampleGroupDouble)
@@ -122,6 +98,25 @@ module Spec
         example.options[:this].should == 'that'
       end
     end
+    
+    describe "#description" do
+      it "returns the supplied description" do
+        example = ExampleGroupDouble.new ExampleProxy.new("name") do; end
+        example.description.should == "name"
+      end
+      it "returns the generated description if there is no description supplied" do
+        example = ExampleGroupDouble.new ExampleProxy.new do; end
+        Spec::Matchers.stub!(:generated_description).and_return('this message')
+        example.description.should == "this message"
+      end
+      it "raises if there is no supplied or generated description" do
+        example = ExampleGroupDouble.new ExampleProxy.new(nil, {}, "this backtrace") do; end
+        Spec::Matchers.stub!(:generated_description).and_return(nil)
+        lambda do
+          example.description
+        end.should raise_error(/No description supplied for example declared on this backtrace/)
+      end
+    end
 
   end
 end

data/spec/spec/example/example_proxy_spec.rb

@@ -27,7 +27,17 @@ module Spec
         end
       end
 
-      describe "#backtrace (deprecated - use #location)" do
+      describe "#backtrace (DEPRECATED - use #location)" do
+        before(:each) do
+          Spec.stub!(:deprecate)
+        end
+        
+        it "is deprecated" do
+          Spec.should_receive(:deprecate)
+          proxy = ExampleProxy.new(:ignore, {}, "path/to/location:37")
+          proxy.backtrace
+        end
+        
         it "provides the location of the declaration of this group" do
           proxy = ExampleProxy.new(:ignore, {}, "path/to/location:37")
           proxy.backtrace.should             == "path/to/location:37"

data/spec/spec/example/pending_module_spec.rb

@@ -8,17 +8,6 @@ module Spec
             pending "TODO"
           }.should raise_error(ExamplePendingError, /TODO/)
         end
-
-        it "reports the file and line number" do
-          file = __FILE__
-          line_number = __LINE__ + 2
-          begin
-            pending("TODO")
-          rescue => error
-          ensure
-            error.pending_caller.should =~ /^#{file}:#{line_number}/
-          end
-        end
       end
       
       context "when the supplied block fails" do
@@ -29,19 +18,6 @@ module Spec
             end
           }.should raise_error(ExamplePendingError, /TODO/)
         end
-
-        it "reports the file and line number" do
-          file = __FILE__
-          line_number = __LINE__ + 2
-          begin
-            pending do
-              raise
-            end
-          rescue => error
-          ensure
-            error.pending_caller.should =~ /#{file}:#{line_number}/
-          end
-        end
       end
       
       context "when the supplied block fails with a mock" do
@@ -54,21 +30,6 @@ module Spec
             end
           }.should raise_error(ExamplePendingError, /TODO/)
         end
-
-        it "reports the file and line number" do
-          file = __FILE__
-          line_number = __LINE__ + 2
-          begin
-            pending do
-              m = mock("thing")
-              m.should_receive(:foo)
-              m.rspec_verify
-            end
-          rescue => error
-          ensure
-            error.pending_caller.should =~ /#{file}:#{line_number}/
-          end
-        end
       end
       
       context "when the supplied block passes" do
@@ -83,81 +44,14 @@ module Spec
     end
     
     describe ExamplePendingError do
-      it "should have the caller (from two calls from initialization)" do
-        two_calls_ago = caller[0]
-        ExamplePendingError.new("a message").pending_caller.should == two_calls_ago
-      end
-      
-      it "should keep the trace information from initialization" do
-        two_calls_ago = caller[0]
-        obj = ExamplePendingError.new("a message")
-        obj.pending_caller
-        def another_caller(obj)
-          obj.pending_caller
-        end
-        
-        another_caller(obj).should == two_calls_ago
-      end
-      
       it "should have the message provided" do
         ExamplePendingError.new("a message").message.should == "a message"
       end
-
-      it "should use a 'ExamplePendingError' as it's default message" do
-        ExamplePendingError.new.message.should == "Spec::Example::ExamplePendingError"
-      end
     end
     
     describe NotYetImplementedError do
-      def rspec_root
-        File.expand_path(__FILE__.gsub("/spec/spec/example/pending_module_spec.rb", "/lib"))
-      end
-      
-      it "should have the root rspec path" do
-        NotYetImplementedError::RSPEC_ROOT_LIB.should == rspec_root
-      end
-      
-      it "should always have the error 'Not Yet Implemented'" do
-        NotYetImplementedError.new([]).message.should == "Not Yet Implemented"
-      end
-      
-      describe "pending_caller" do
-        it "should select an element out of the backtrace" do
-          error = NotYetImplementedError.new(["foo/bar.rb:18"])
-          
-          error.pending_caller.should == "foo/bar.rb:18"
-        end
-        
-        it "should actually report the element from the backtrace" do
-          error = NotYetImplementedError.new(["bar.rb:18"])
-          
-          error.pending_caller.should == "bar.rb:18"
-        end
-        
-        it "should not use an element with the rspec root path" do
-          error = NotYetImplementedError.new(["#{rspec_root}:8"])
-          
-          error.pending_caller.should be_nil
-        end
-        
-        it "should select the first line in the backtrace which isn't in the rspec root" do
-          error = NotYetImplementedError.new([
-            "#{rspec_root}/foo.rb:2",
-            "#{rspec_root}/foo/bar.rb:18",
-            "path1.rb:22",
-            "path2.rb:33"
-          ])
-          
-          error.pending_caller.should == "path1.rb:22"
-        end
-        
-        it "should cache the caller" do
-          backtrace = mock('backtrace')
-          backtrace.should_receive(:detect).once
-          
-          error = NotYetImplementedError.new(backtrace)
-          error.pending_caller.should == error.pending_caller
-        end
+      it "should have the message 'Not Yet Implemented'" do
+        NotYetImplementedError.new.message.should == "Not Yet Implemented"
       end
     end
   end

data/spec/spec/example/predicate_matcher_spec.rb

@@ -9,12 +9,32 @@ module Spec
     end
     
     describe "predicate_matcher[method_on_object] = matcher_method" do
-      predicate_matchers[:swim] = :can_swim?
+      before(:each) do
+        Spec.stub!(:deprecate)
+      end
+      
+      it "is deprecated" do
+        Spec.should_receive(:deprecate)
+        group = ExampleGroupDouble.describe("foo") do
+          predicate_matchers[:swim] = :can_swim?
+        end
+        group.run(Spec::Runner::Options.new(StringIO.new, StringIO.new))
+      end
+
       it "should match matcher_method if method_on_object returns true" do
-        swim(100).matches?(Fish.new).should be_true
+        group = ExampleGroupDouble.describe(Fish) do
+          predicate_matchers[:swim] = :can_swim?
+          it { should swim(100) }
+        end
+        group.run(Spec::Runner::Options.new(StringIO.new, StringIO.new))
       end
+
       it "should not match matcher_method if method_on_object returns false" do
-        swim(10000).matches?(Fish.new).should be_false
+        group = ExampleGroupDouble.describe(Fish) do
+          predicate_matchers[:swim] = :can_swim?
+          it { should_not swim(1000) }
+        end
+        group.run(Spec::Runner::Options.new(StringIO.new, StringIO.new))
       end
     end
   end

data/spec/spec/expectations/extensions/object_spec.rb

@@ -5,17 +5,17 @@ describe Object, "#should" do
     @target = "target"
     @matcher = mock("matcher")
     @matcher.stub!(:matches?).and_return(true)
-    @matcher.stub!(:failure_message)
+    @matcher.stub!(:failure_message_for_should)
   end
   
-  it "should accept and interact with a matcher" do
+  it "accepts and interacts with a matcher" do
     @matcher.should_receive(:matches?).with(@target).and_return(true)    
     @target.should @matcher
   end
   
-  it "should ask for a failure_message when matches? returns false" do
+  it "asks for a failure_message_for_should when matches? returns false" do
     @matcher.should_receive(:matches?).with(@target).and_return(false)
-    @matcher.should_receive(:failure_message).and_return("the failure message")
+    @matcher.should_receive(:failure_message_for_should).and_return("the failure message")
     lambda {
       @target.should @matcher
     }.should fail_with("the failure message")
@@ -28,18 +28,18 @@ describe Object, "#should_not" do
     @matcher = mock("matcher")
   end
   
-  it "should accept and interact with a matcher" do
+  it "accepts and interacts with a matcher" do
     @matcher.should_receive(:matches?).with(@target).and_return(false)
-    @matcher.stub!(:negative_failure_message)
+    @matcher.stub!(:failure_message_for_should_not)
     
     @target.should_not @matcher
   end
   
-  it "should ask for a negative_failure_message when matches? returns true" do
+  it "asks for a failure_message_for_should_not when matches? returns true" do
     @matcher.should_receive(:matches?).with(@target).and_return(true)
-    @matcher.should_receive(:negative_failure_message).and_return("the negative failure message")
+    @matcher.should_receive(:failure_message_for_should_not).and_return("the failure message for should not")
     lambda {
       @target.should_not @matcher
-    }.should fail_with("the negative failure message")
+    }.should fail_with("the failure message for should not")
   end
 end