rspec 0.8.2 → 0.9.0

data/spec/spec/mocks/at_most_spec.rb

@@ -1,15 +1,13 @@
 require File.dirname(__FILE__) + '/../../spec_helper.rb'
 
 module Spec
-module Mocks
-context "AtMost" do
-    setup do
-        @mock = Mock.new("test mock", {
-          :auto_verify => false
-        })
-      
-    end
-    specify "should fail when at most n times method is called n plus 1 times" do
+  module Mocks
+    describe "AtMost" do
+      before(:each) do
+        @mock = Mock.new("test mock")
+      end
+
+      it "should fail when at most n times method is called n plus 1 times" do
         @mock.should_receive(:random_call).at_most(4).times
         @mock.random_call
         @mock.random_call
@@ -17,81 +15,79 @@ context "AtMost" do
         @mock.random_call
         @mock.random_call
         lambda do
-          @mock.__verify
-        end.should_raise(MockExpectationError)
-      
-    end
-    specify "should fail when at most once method is called twice" do
+          @mock.rspec_verify
+        end.should raise_error(MockExpectationError)
+      end
+
+      it "should fail when at most once method is called twice" do
         @mock.should_receive(:random_call).at_most(:once)
         @mock.random_call
         @mock.random_call
         lambda do
-          @mock.__verify
-        end.should_raise(MockExpectationError)
-      
-    end
-    specify "should fail when at most twice method is called three times" do
+          @mock.rspec_verify
+        end.should raise_error(MockExpectationError)
+      end
+
+      it "should fail when at most twice method is called three times" do
         @mock.should_receive(:random_call).at_most(:twice)
         @mock.random_call
         @mock.random_call
         @mock.random_call
         lambda do
-          @mock.__verify
-        end.should_raise(MockExpectationError)
-      
-    end
-    specify "should pass when at most n times method is called exactly n times" do
+          @mock.rspec_verify
+        end.should raise_error(MockExpectationError)
+      end
+
+      it "should pass when at most n times method is called exactly n times" do
         @mock.should_receive(:random_call).at_most(4).times
         @mock.random_call
         @mock.random_call
         @mock.random_call
         @mock.random_call
-        @mock.__verify
-      
-    end
-    specify "should pass when at most n times method is called less than n times" do
+        @mock.rspec_verify
+      end
+
+      it "should pass when at most n times method is called less than n times" do
         @mock.should_receive(:random_call).at_most(4).times
         @mock.random_call
         @mock.random_call
         @mock.random_call
-        @mock.__verify
-      
-    end
-    specify "should pass when at most n times method is never called" do
+        @mock.rspec_verify
+      end
+
+      it "should pass when at most n times method is never called" do
         @mock.should_receive(:random_call).at_most(4).times
-        @mock.__verify
-      
-    end
-    specify "should pass when at most once method is called once" do
+        @mock.rspec_verify
+      end
+
+      it "should pass when at most once method is called once" do
         @mock.should_receive(:random_call).at_most(:once)
         @mock.random_call
-        @mock.__verify
-      
-    end
-    specify "should pass when at most once method is never called" do
+        @mock.rspec_verify
+      end
+
+      it "should pass when at most once method is never called" do
         @mock.should_receive(:random_call).at_most(:once)
-        @mock.__verify
-      
-    end
-    specify "should pass when at most twice method is called once" do
+        @mock.rspec_verify
+      end
+
+      it "should pass when at most twice method is called once" do
         @mock.should_receive(:random_call).at_most(:twice)
         @mock.random_call
-        @mock.__verify
-      
-    end
-    specify "should pass when at most twice method is called twice" do
+        @mock.rspec_verify
+      end
+
+      it "should pass when at most twice method is called twice" do
         @mock.should_receive(:random_call).at_most(:twice)
         @mock.random_call
         @mock.random_call
-        @mock.__verify
-      
-    end
-    specify "should pass when at most twice method is never called" do
+        @mock.rspec_verify
+      end
+
+      it "should pass when at most twice method is never called" do
         @mock.should_receive(:random_call).at_most(:twice)
-        @mock.__verify
-      
+        @mock.rspec_verify
+      end
     end
-  
-end
-end
+  end
 end

data/spec/spec/mocks/bug_report_10260_spec.rb

@@ -0,0 +1,8 @@
+require File.dirname(__FILE__) + '/../../spec_helper.rb'
+
+describe "An RSpec Mock" do
+  it "should hide internals in its inspect representation" do
+    m = mock('cup')
+    m.inspect.should =~ /#<Spec::Mocks::Mock:0x[a-f0-9.]+ @name="cup">/
+  end
+end

data/spec/spec/mocks/bug_report_7611_spec.rb

@@ -7,12 +7,12 @@ module Bug7611
   class Bar < Foo
   end
 
-  context "A Partial Mock" do
-    specify "should respect subclasses" do
+  describe "A Partial Mock" do
+    it "should respect subclasses" do
       Foo.stub!(:new).and_return(Object.new)
     end
 
-    specify "should" do
+    it "should" do
       Bar.new.class.should == Bar
     end 
   end

data/spec/spec/mocks/bug_report_7805_spec.rb

@@ -3,12 +3,12 @@ require File.dirname(__FILE__) + '/../../spec_helper.rb'
 module Bug7805
   #This is really a duplicate of 8302
 
-  context "Stubs should correctly restore module methods" do
-    specify "1 - stub the open method" do
+  describe "Stubs should correctly restore module methods" do
+    it "1 - stub the open method" do
       File.stub!(:open).and_return("something")
       File.open.should == "something"
     end
-    specify "2 - use File.open to create example.txt" do
+    it "2 - use File.open to create example.txt" do
       filename = "#{File.dirname(__FILE__)}/example-#{Time.new.to_i}.txt"
       File.exist?(filename).should be_false
       file = File.open(filename,'w')

data/spec/spec/mocks/bug_report_8165_spec.rb

@@ -1,10 +1,10 @@
 require File.dirname(__FILE__) + '/../../spec_helper.rb'
 
-context "An object where respond_to? is true and does not have method" do
-  # When should_receive(:sym) is sent to any object, the MockHandler sends
+describe "An object where respond_to? is true and does not have method" do
+  # When should_receive(:sym) is sent to any object, the Proxy sends
   # respond_to?(:sym) to that object to see if the method should be proxied.
   #
-  # If respond_to? itself is proxied, then when the MockHandler sends respond_to?
+  # If respond_to? itself is proxied, then when the Proxy sends respond_to?
   # to the object, the proxy is invoked and responds yes (if so set in the spec).
   # When the object does NOT actually respond to :sym, an exception is thrown
   # when trying to proxy it.
@@ -12,7 +12,7 @@ context "An object where respond_to? is true and does not have method" do
   # The fix was to keep track of whether :respond_to? had been proxied and, if
   # so, call the munged copy of :respond_to? on the object.
 
-  specify "should not raise an exception" do
+  it "should not raise an exception" do
     obj = Object.new
     obj.should_receive(:respond_to?).with(:foobar).and_return(true)
     obj.should_receive(:foobar).and_return(:baz)
@@ -20,7 +20,7 @@ context "An object where respond_to? is true and does not have method" do
     obj.foobar.should == :baz
   end
 
-  specify "should not raise an exception" do
+  it "should not raise an exception" do
     obj = mock("obj")
     obj.should_receive(:respond_to?).with(:foobar).and_return(true)
     obj.should_receive(:foobar).and_return(:baz)

data/spec/spec/mocks/bug_report_8302_spec.rb

@@ -9,17 +9,17 @@ module Bug8302
     end
   end
 
-  context "Bug report 8302:" do
-    specify "class method is not restored correctly when proxied" do
+  describe "Bug report 8302:" do
+    it "class method is not restored correctly when proxied" do
       Foo.should_not_receive(:class_method).with(Array.new)
-      Foo.__verify
+      Foo.rspec_verify
       Foo.class_method(Array.new)
     end
 
-    specify "instance method is not restored correctly when proxied" do
+    it "instance method is not restored correctly when proxied" do
       foo = Foo.new
       foo.should_not_receive(:instance_bar).with(Array.new)
-      foo.__verify
+      foo.rspec_verify
       foo.instance_bar(Array.new)
     end
   end

data/spec/spec/mocks/failing_mock_argument_constraints_spec.rb

@@ -2,72 +2,71 @@ require File.dirname(__FILE__) + '/../../spec_helper.rb'
 
 module Spec
   module Mocks
-    context "FailingMockArgumentConstraints" do
-      setup do
-        @mock = Mock.new("test mock", {
-          :auto_verify => false
-        })
-        @reporter = Mock.new("reporter", {
-          :null_object => true,
-          :auto_verify => false
-        })
+    describe "FailingMockArgumentConstraints" do
+      before do
+        @mock = mock("test mock")
+        @reporter = Mock.new("reporter", :null_object => true)
       end
       
-      specify "should reject goose when expecting a duck" do
+      after do
+        @mock.rspec_reset
+      end
+      
+      it "should reject goose when expecting a duck" do
         @mock.should_receive(:random_call).with(DuckTypeArgConstraint.new(:abs, :div))
-        lambda { @mock.random_call("I don't respond to :abs or :div") }.should_raise(MockExpectationError)
+        lambda { @mock.random_call("I don't respond to :abs or :div") }.should raise_error(MockExpectationError)
       end
       
-      specify "should reject non boolean" do
+      it "should reject non boolean" do
         @mock.should_receive(:random_call).with(:boolean)
         lambda do
           @mock.random_call("false")
-        end.should_raise(MockExpectationError)
+        end.should raise_error(MockExpectationError)
       end
       
-      specify "should reject non numeric" do
+      it "should reject non numeric" do
         @mock.should_receive(:random_call).with(:numeric)
         lambda do
           @mock.random_call("1")
-        end.should_raise(MockExpectationError)
+        end.should raise_error(MockExpectationError)
       end
       
-      specify "should reject non string" do
+      it "should reject non string" do
         @mock.should_receive(:random_call).with(:string)
         lambda do
           @mock.random_call(123)
-        end.should_raise(MockExpectationError)
+        end.should raise_error(MockExpectationError)
       end
       
-      specify "should fail if regexp does not match submitted string" do
+      it "should fail if regexp does not match submitted string" do
         @mock.should_receive(:random_call).with(/bcd/)
-        lambda { @mock.random_call("abc") }.should_raise(MockExpectationError)
+        lambda { @mock.random_call("abc") }.should raise_error(MockExpectationError)
       end
       
-      specify "should fail if regexp does not match submitted regexp" do
+      it "should fail if regexp does not match submitted regexp" do
         @mock.should_receive(:random_call).with(/bcd/)
-        lambda { @mock.random_call(/bcde/) }.should_raise(MockExpectationError)
+        lambda { @mock.random_call(/bcde/) }.should raise_error(MockExpectationError)
       end
       
-      specify "should fail for a hash w/ wrong values" do
+      it "should fail for a hash w/ wrong values" do
         @mock.should_receive(:random_call).with(:a => "b", :c => "d")
         lambda do
           @mock.random_call(:a => "b", :c => "e")
-        end.should_raise(MockExpectationError, /Mock 'test mock' expected :random_call with \(\{(:a=>\"b\", :c=>\"d\"|:c=>\"d\", :a=>\"b\")\}\) but received it with \(\{(:a=>\"b\", :c=>\"e\"|:c=>\"e\", :a=>\"b\")\}\)/)
+        end.should raise_error(MockExpectationError, /Mock 'test mock' expected :random_call with \(\{(:a=>\"b\", :c=>\"d\"|:c=>\"d\", :a=>\"b\")\}\) but received it with \(\{(:a=>\"b\", :c=>\"e\"|:c=>\"e\", :a=>\"b\")\}\)/)
       end
       
-      specify "should fail for a hash w/ wrong keys" do
+      it "should fail for a hash w/ wrong keys" do
         @mock.should_receive(:random_call).with(:a => "b", :c => "d")
         lambda do
           @mock.random_call("a" => "b", "c" => "d")
-        end.should_raise(MockExpectationError, /Mock 'test mock' expected :random_call with \(\{(:a=>\"b\", :c=>\"d\"|:c=>\"d\", :a=>\"b\")\}\) but received it with \(\{(\"a\"=>\"b\", \"c\"=>\"d\"|\"c\"=>\"d\", \"a\"=>\"b\")\}\)/)
+        end.should raise_error(MockExpectationError, /Mock 'test mock' expected :random_call with \(\{(:a=>\"b\", :c=>\"d\"|:c=>\"d\", :a=>\"b\")\}\) but received it with \(\{(\"a\"=>\"b\", \"c\"=>\"d\"|\"c\"=>\"d\", \"a\"=>\"b\")\}\)/)
       end
       
-      specify "should match against a Matcher" do
+      it "should match against a Matcher" do
         lambda do
           @mock.should_receive(:msg).with(equal(3))
           @mock.msg(37)
-        end.should_raise(MockExpectationError, "Mock 'test mock' expected :msg with (equal 3) but received it with (37)")
+        end.should raise_error(MockExpectationError, "Mock 'test mock' expected :msg with (equal 3) but received it with (37)")
       end
     end
   end

data/spec/spec/mocks/mock_ordering_spec.rb

@@ -3,59 +3,63 @@ require File.dirname(__FILE__) + '/../../spec_helper'
 module Spec
   module Mocks
 
-    context "Mock ordering" do
+    describe "Mock ordering" do
 
-      setup do
-        @mock = Mock.new("test mock", :auto_verify => false)
+      before do
+        @mock = mock("test mock")
+      end
+      
+      after do
+        @mock.rspec_reset
       end
 
-      specify "should pass two calls in order" do
+      it "should pass two calls in order" do
         @mock.should_receive(:one).ordered
         @mock.should_receive(:two).ordered
         @mock.one
         @mock.two
-        @mock.__verify
+        @mock.rspec_verify
       end
 
-      specify "should pass three calls in order" do
+      it "should pass three calls in order" do
         @mock.should_receive(:one).ordered
         @mock.should_receive(:two).ordered
         @mock.should_receive(:three).ordered
         @mock.one
         @mock.two
         @mock.three
-        @mock.__verify
+        @mock.rspec_verify
       end
 
-      specify "should fail if second call comes first" do
+      it "should fail if second call comes first" do
         @mock.should_receive(:one).ordered
         @mock.should_receive(:two).ordered
         lambda do
           @mock.two
-        end.should_raise(MockExpectationError, "Mock 'test mock' received :two out of order")
+        end.should raise_error(MockExpectationError, "Mock 'test mock' received :two out of order")
       end
 
-      specify "should fail if third call comes first" do
+      it "should fail if third call comes first" do
         @mock.should_receive(:one).ordered
         @mock.should_receive(:two).ordered
         @mock.should_receive(:three).ordered
         @mock.one
         lambda do
           @mock.three
-        end.should_raise(MockExpectationError, "Mock 'test mock' received :three out of order")
+        end.should raise_error(MockExpectationError, "Mock 'test mock' received :three out of order")
       end
       
-      specify "should fail if third call comes second" do
+      it "should fail if third call comes second" do
         @mock.should_receive(:one).ordered
         @mock.should_receive(:two).ordered
         @mock.should_receive(:three).ordered
         @mock.one
         lambda do
           @mock.three
-        end.should_raise(MockExpectationError, "Mock 'test mock' received :three out of order")
+        end.should raise_error(MockExpectationError, "Mock 'test mock' received :three out of order")
       end
 
-      specify "should ignore order of non ordered calls" do
+      it "should ignore order of non ordered calls" do
         @mock.should_receive(:ignored_0)
         @mock.should_receive(:ordered_1).ordered
         @mock.should_receive(:ignored_1)
@@ -72,7 +76,7 @@ module Spec
         @mock.ignored_2
         @mock.ordered_3
         @mock.ignored_1
-        @mock.__verify
+        @mock.rspec_verify
       end
             
     end

data/spec/spec/mocks/mock_space_spec.rb

@@ -0,0 +1,54 @@
+require File.dirname(__FILE__) + '/../../spec_helper.rb'
+require 'spec/mocks'
+
+module Spec
+  module Mocks
+    describe Space do
+      before :each do
+        @space = Space.new
+        klazz = Class.new do
+          def rspec_verify
+            @verified = true
+          end
+          def verified?
+            @verified
+          end
+          def rspec_reset
+            @reset = true
+          end
+          def reset?
+            @reset
+          end
+        end
+        @m1 = klazz.new
+        @m2 = klazz.new
+      end
+      it "should verify all mocks within" do
+        @space.add(@m1)
+        @space.add(@m2)
+        @space.verify_all
+        @m1.should be_verified
+        @m2.should be_verified
+      end
+      it "should reset all mocks within" do
+        @space.add(m1 = mock("mock1"))
+        @space.add(m2 = mock("mock2"))
+        m1.should_receive(:rspec_reset)
+        m2.should_receive(:rspec_reset)
+        @space.reset_all
+      end
+      it "should clear internal mocks on reset_all" do
+        @space.add(m = mock("mock"))
+        @space.reset_all
+        @space.instance_eval { mocks.empty? }.should be_true
+      end
+      it "should only add an instance once" do
+        @space.add(m1 = mock("mock1"))
+        @space.add(m1)
+        m1.should_receive(:rspec_verify)
+        @space.verify_all
+      end
+    end
+  end
+end
+