spec/mock.rd in quarry-0.4.0 vs spec/mock.rd in quarry-0.5.0

@@ -1,53 +1,47 @@
 = Quarry's Mocking Facility
 
 Require mock.rb library.
 
-  require 'quarry/stub/mock'
+  require 'quarry/mock'
 
-
 == Delegation Approach
 
-   obj = "hello"
+  obj = "hello"
 
-   @mck = Quarry::Mock.new
+  @mck = Quarry::Mock.new
 
-   @mck.upcase == "HeLLo"
+  @mck.upcase == "HeLLo"
 
-   alt = obj.mock(@mck)
+  alt = obj.mock(@mck)
 
-   lambda{ alt.upcase }.assert_raises(Assertion)
+  expect(Assertion){ alt.upcase }
 
-   obj.upcase.assert == "HELLO"
+  obj.upcase.assert == "HELLO"
 
-
 == Singleton Approach
 
-   obj = "hi"
+  obj = "hi"
 
-   obj.extend(@mck)
+  obj.extend(@mck)
 
-   @mck.upcase == "hI"
+  @mck.upcase == "hI"
 
-   lambda{ obj.upcase }.assert_raises(Assertion)
+  expect(Assertion){ obj.upcase }
 
-   obj.remove(@mck)
+  obj.remove_mock(@mck)
 
-   obj.upcase.assert == "HI"
+  obj.upcase.assert == "HI"
 
+== Quick Extend Mocks
 
-== Quick Extend Stubs
+  obj = "hey"
 
-   obj = "hey"
+  # implict obj.extend(obj.mock) here
+  obj.mock.upcase == "HeY"
 
-   # implict obj.extend(obj.mock) here
-   obj.mock.upcase == "HeY"
+  expect(Assertion){ obj.upcase }
 
-   lambda{ obj.upcase }.assert_raises(Assertion)
+  obj.remove_mock  # imples obj.remove_stub(obj.mock)
 
-   obj.remove  # imples obj.remove(obj.stub)
-
-   obj.upcase.assert == "HEY"
-
-QED.
-
+  obj.upcase.assert == "HEY"