rspec 1.2.0 → 1.2.1

data/spec/spec/example/example_methods_spec.rb

@@ -34,7 +34,7 @@ module Spec
 
       describe "#backtrace" do        
         it "returns the backtrace from where the example was defined" do
-          example = ExampleGroup.dup.new "name"
+          example = ExampleGroup.dup.new ExampleProxy.new
           example.backtrace.join("\n").should include("#{__FILE__}:#{__LINE__-1}")
         end
       end
@@ -46,46 +46,16 @@ module Spec
 
         it "sends a deprecation warning" do
           Kernel.should_receive(:warn).with(/#implementation_backtrace.*deprecated.*#backtrace instead/m)
-          example = ExampleGroup.dup.new "name"
+          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 "name"
+          example = ExampleGroup.dup.new ExampleProxy.new
           example.implementation_backtrace.join("\n").should include("#{__FILE__}:#{__LINE__-1}")
         end
       end
 
-      describe "#subject" do
-        before(:each) do
-          @example_group = ExampleGroupDouble
-        end
-
-        it "should return an instance of the described class" do
-          group = Class.new(ExampleGroupDouble).describe(Array)
-          example = group.new("")
-          example.subject.should == []
-        end
-    
-        it "should return a Module" do
-          group = Class.new(ExampleGroupDouble).describe(Enumerable)
-          example = group.new("")
-          example.subject.should == Enumerable
-        end
-
-        it "should return a string" do
-          group = Class.new(ExampleGroupDouble).describe('foo')
-          example = group.new("")
-          example.subject.should == 'foo'
-        end
-
-        it "should return a number" do
-          group = Class.new(ExampleGroupDouble).describe(15)
-          example = group.new("")
-          example.subject.should == 15
-        end
-      end
-
       describe "#should" do
         before(:each) do
           @example_group = Class.new(ExampleGroupDouble)
@@ -140,14 +110,14 @@ module Spec
 
     describe "#options" do
       it "should expose the options hash" do
-        example = ExampleGroupDouble.new "name", :this => 'that' do; end
+        example = ExampleGroupDouble.new ExampleProxy.new("name", :this => 'that') do; end
         example.options[:this].should == 'that'
       end
     end
     
     describe "#set_instance_variables_from_hash" do
       it "preserves the options" do
-        example = ExampleGroupDouble.new "name", :this => 'that' do; end
+        example = ExampleGroupDouble.new ExampleProxy.new("name", :this => 'that') do; end
         example.set_instance_variables_from_hash({:@_options => {}})
         example.options[:this].should == 'that'
       end

data/spec/spec/example/example_proxy_spec.rb

@@ -0,0 +1,47 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+module Spec
+  module Example
+
+    describe ExampleProxy do
+
+      describe "#description" do
+        it "provides the submitted description" do
+          proxy = ExampleProxy.new("the description")
+          proxy.description.should   == "the description"
+        end
+      end
+      
+      describe "#update" do
+        it "updates the description" do
+          proxy = ExampleProxy.new("old description")
+          proxy.update("new description")
+          proxy.description.should == "new description"
+        end
+      end
+
+      describe "#options" do
+        it "provides the submitted options" do
+          proxy = ExampleProxy.new(:ignore, {:these => :options})
+          proxy.options.should           == {:these => :options}
+        end
+      end
+
+      describe "#backtrace (deprecated - use #location)" do
+        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"
+        end
+      end
+      
+      describe "#location" do
+        it "provides the location of the declaration of this group" do
+          proxy = ExampleProxy.new(:ignore, {}, "path/to/location:37")
+          proxy.location.should              == "path/to/location:37"
+        end
+      end
+      
+    end
+
+  end
+end

data/spec/spec/example/nested_example_group_spec.rb

@@ -58,11 +58,11 @@ module Spec
 
     describe "Nested Example Groups" do
       describe "description options", :other_options => "other options" do
-        it "should have a spec_path" do
-          self.class.options[:spec_path].should match(/#{__FILE__}/)
+        it "includes :location" do
+          self.class.options[:location].should match(/#{__FILE__}/)
         end
 
-        it "should pass other options" do
+        it "includes any other options" do
           self.class.options[:other_options].should == "other options"
         end
       end

data/spec/spec/example/shared_example_group_spec.rb

@@ -66,12 +66,12 @@ module Spec
           SharedExampleGroup.register(
             "shared example_group",
             :shared => true,
-            :spec_path => "/my/spec/a/../shared.rb"
+            :location => "/my/spec/a/../shared.rb"
           )
           SharedExampleGroup.register(
             "shared example_group",
             :shared => true,
-            :spec_path => "/my/spec/b/../shared.rb"
+            :location => "/my/spec/b/../shared.rb"
           )
         end
 
@@ -79,13 +79,13 @@ module Spec
           SharedExampleGroup.register(
             "shared example_group",
             :shared => true,
-            :spec_path => "/my/spec/a/shared.rb"
+            :location => "/my/spec/a/shared.rb"
           )
           lambda do
             SharedExampleGroup.register(
               "shared example_group",
               :shared => true,
-              :spec_path => "/my/spec/b/shared.rb"
+              :location => "/my/spec/b/shared.rb"
             )
           end.should raise_error(ArgumentError, /already exists/)
         end

data/spec/spec/example/subject_spec.rb

@@ -0,0 +1,77 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+module Spec
+  module Example
+    describe "implicit subject" do
+      describe "with a class" do
+        it "returns an instance of the class" do
+          group = Class.new(ExampleGroupDouble).describe(Array)
+          example = group.new(ExampleProxy.new)
+          example.subject.should == []
+        end
+      end
+      
+      describe "with a Module" do
+        it "returns the Module" do
+          group = Class.new(ExampleGroupDouble).describe(Enumerable)
+          example = group.new(ExampleProxy.new)
+          example.subject.should == Enumerable
+        end
+      end
+      
+      describe "with a string" do
+        it "return the string" do
+          group = Class.new(ExampleGroupDouble).describe('foo')
+          example = group.new(ExampleProxy.new)
+          example.subject.should == 'foo'
+        end
+      end
+
+      describe "with a number" do
+        it "returns the number" do
+          group = Class.new(ExampleGroupDouble).describe(15)
+          example = group.new(ExampleProxy.new)
+          example.subject.should == 15
+        end
+      end
+      
+    end
+    
+    describe "explicit subject" do
+      describe "defined in a top level group" do
+        it "replaces the implicit subject in that group" do
+          group = Class.new(ExampleGroupDouble).describe(Array)
+          group.subject { [1,2,3] }
+          example = group.new(ExampleProxy.new)
+          example.subject.should == [1,2,3]
+        end
+      end
+
+      describe "defined in a top level group" do
+        it "is available in a nested group (subclass)" do
+          klass = Class.new do
+            extend  Spec::Example::Subject::ExampleGroupMethods
+            include Spec::Example::Subject::ExampleMethods
+            class << self
+              def described_class
+                Array
+              end
+            end
+            def described_class
+              self.class.described_class
+            end
+            
+            subject {
+              [1,2,3]
+            }
+          end
+          
+          subclass = Class.new(klass)
+          
+          object = subclass.new
+          object.subject.should == [1,2,3]
+        end
+      end
+    end
+  end
+end

data/spec/spec/matchers/be_close_spec.rb

@@ -1,29 +1,29 @@
 require File.dirname(__FILE__) + '/../../spec_helper.rb'
 module Spec
   module Matchers
-    describe "be_close" do
-      it "should match when value == target" do
+    describe "[actual.should] be_close(expected, delta)" do
+      it "matches when actual == expected" do
         be_close(5.0, 0.5).matches?(5.0).should be_true
       end
-      it "should match when value < (target + delta)" do
+      it "matches when actual < (expected + delta)" do
         be_close(5.0, 0.5).matches?(5.49).should be_true
       end
-      it "should match when value > (target - delta)" do
+      it "matches when actual > (expected - delta)" do
         be_close(5.0, 0.5).matches?(4.51).should be_true
       end
-      it "should not match when value == (target - delta)" do
+      it "does not match when actual == (expected - delta)" do
         be_close(5.0, 0.5).matches?(4.5).should be_false
       end
-      it "should not match when value < (target - delta)" do
+      it "does not match when actual < (expected - delta)" do
         be_close(5.0, 0.5).matches?(4.49).should be_false
       end
-      it "should not match when value == (target + delta)" do
+      it "does not match when actual == (expected + delta)" do
         be_close(5.0, 0.5).matches?(5.5).should be_false
       end
-      it "should not match when value > (target + delta)" do
+      it "does not match when actual > (expected + delta)" do
         be_close(5.0, 0.5).matches?(5.51).should be_false
       end
-      it "should provide a useful failure message" do
+      it "provides a failure message for should" do
         #given
           matcher = be_close(5.0, 0.5)
         #when
@@ -31,7 +31,7 @@ module Spec
         #then
           matcher.failure_message_for_should.should == "expected 5.0 +/- (< 0.5), got 5.51"
       end
-      it "should describe itself" do
+      it "provides a description" do
         matcher = be_close(5.0, 0.5)
         matcher.matches?(5.1)
         matcher.description.should == "be close to 5.0 (within +- 0.5)"

data/spec/spec/matchers/be_instance_of_spec.rb

@@ -3,27 +3,32 @@ require File.dirname(__FILE__) + '/../../spec_helper.rb'
 module Spec
   module Matchers
     [:be_instance_of, :be_an_instance_of].each do |method|
-      describe "#{method}" do
-        it "passes if object is instance of given class" do
+      describe "actual.should #{method}(expected)" do
+        it "passes if actual is instance of expected class" do
           5.should send(method, Fixnum)
         end
 
-        it "failse if object is instance of subclass of expected class" do
+        it "fails if actual is instance of subclass of expected class" do
           lambda { 5.should send(method, Numeric) }.should fail_with(%Q{expected instance of Numeric, got 5})
         end
 
-        it "fails with failure message unless object is kind of given class" do
+        it "fails with failure message for should unless actual is instance of expected class" do
           lambda { "foo".should send(method, Array) }.should fail_with(%Q{expected instance of Array, got "foo"})
         end
 
-        it "fails with negative failure message if object is kind of given class" do
-          lambda { "foo".should_not send(method, String) }.should fail_with(%Q{expected "foo" not to be an instance of String})
-        end
-
         it "provides a description" do
           Spec::Matchers::BeInstanceOf.new(Class).description.should == "be an instance of Class"
         end
       end
+      
+      describe "actual.should_not #{method}(expected)" do
+        
+        it "fails with failure message for should_not if actual is instance of expected class" do
+          lambda { "foo".should_not send(method, String) }.should fail_with(%Q{expected "foo" not to be an instance of String})
+        end
+
+      end
+
     end
   end
 end

data/spec/spec/matchers/be_kind_of_spec.rb

@@ -3,27 +3,29 @@ require File.dirname(__FILE__) + '/../../spec_helper.rb'
 module Spec
   module Matchers
     [:be_kind_of, :be_a_kind_of].each do |method|
-      describe "#{method}" do
-        it "passes if object is instance of given class" do
+      describe "actual.should #{method}(expected)" do
+        it "passes if actual is instance of expected class" do
           5.should send(method, Fixnum)
         end
 
-        it "passes if object is instance of subclass of expected class" do
+        it "passes if actual is instance of subclass of expected class" do
           5.should send(method, Numeric)
         end
 
-        it "fails with failure message unless object is kind of given class" do
+        it "fails with failure message for should unless actual is kind of expected class" do
           lambda { "foo".should send(method, Array) }.should fail_with(%Q{expected kind of Array, got "foo"})
         end
 
-        it "fails with negative failure message if object is kind of given class" do
-          lambda { "foo".should_not send(method, String) }.should fail_with(%Q{expected "foo" not to be a kind of String})
-        end
-
         it "provides a description" do
           Spec::Matchers::BeKindOf.new(Class).description.should == "be a kind of Class"
         end
       end
+      
+      describe "actual.should_not #{method}(expected)" do
+        it "fails with failure message for should_not if actual is kind of expected class" do
+          lambda { "foo".should_not send(method, String) }.should fail_with(%Q{expected "foo" not to be a kind of String})
+        end
+      end
     end
   end
 end

data/spec/spec/{dsl/matchers_spec.rb → matchers/dsl_spec.rb}

@@ -1,15 +1,15 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.dirname(__FILE__) + '/../../spec_helper.rb'
 
 module Spec
-  module DSL
-    module Matchers
+  module Matchers
+    module DSL
       describe "#create" do
         it "creates a method that initializes a new matcher with the submitted name and expected arg" do
           # FIXME - this expects new to be called, but we need something
           # more robust - that expects new to be called with a specific
           # block (lambda, proc, whatever)
           mod = Module.new
-          mod.extend Spec::DSL::Matchers
+          mod.extend Spec::Matchers::DSL
           mod.create(:foo)
     
           obj = Object.new

data/spec/spec/matchers/matcher_spec.rb

@@ -90,8 +90,60 @@ module Spec
         end
       end
 
-      context "matching with overrides" do
+      context "with no args" do
+        before(:each) do
+          @matcher = Spec::Matchers::Matcher.new(:matcher_name) do 
+            match do |actual|
+              actual == 5
+            end
+          end 
+        end
+        
+        it "matches" do
+          @matcher.matches?(5).should be_true
+        end
+        
+        it "describes" do
+          @matcher.description.should == "matcher name"
+        end
       end
+      
+      context "with 1 arg" do
+        before(:each) do
+          @matcher = Spec::Matchers::Matcher.new(:matcher_name, 1) do |expected|
+            match do |actual|
+              actual == 5 && expected == 1
+            end
+          end
+        end
+        
+        it "matches" do
+          @matcher.matches?(5).should be_true
+        end
+        
+        it "describes" do
+          @matcher.description.should == "matcher name 1"
+        end
+      end
+      
+      context "with multiple args" do
+        before(:each) do
+          @matcher = Spec::Matchers::Matcher.new(:matcher_name, 1, 2, 3, 4) do |a,b,c,d|
+            match do |sum|
+              a + b + c + d == sum
+            end
+          end
+        end
+        
+        it "matches" do
+          @matcher.matches?(10).should be_true
+        end
+        
+        it "describes" do
+          @matcher.description.should == "matcher name 1, 2, 3, and 4"
+        end
+      end
+
     end
   end
 end