mocha 0.10.5 → 1.13.0

data/lib/mocha/expectation.rb

@@ -9,17 +9,18 @@ require 'mocha/is_a'
 require 'mocha/in_state_ordering_constraint'
 require 'mocha/change_state_side_effect'
 require 'mocha/cardinality'
+require 'mocha/configuration'
+require 'mocha/block_matcher'
 
-module Mocha # :nodoc:
-
-  # Methods on expectations returned from Mock#expects, Mock#stubs, Object#expects and Object#stubs.
+module Mocha
+  # Methods on expectations returned from {Mock#expects}, {Mock#stubs}, {ObjectMethods#expects} and {ObjectMethods#stubs}.
   class Expectation
-
-    # :call-seq: times(range) -> expectation
-    #
     # Modifies expectation so that the number of calls to the expected method must be within a specific +range+.
     #
-    # +range+ can be specified as an exact integer or as a range of integers
+    # @param [Range,Integer] range specifies the allowable range in the number of expected invocations.
+    # @return [Expectation] the same expectation, thereby allowing invocations of other {Expectation} methods to be chained.
+    #
+    # @example Specifying a specific number of expected invocations.
     #   object = mock()
     #   object.expects(:expected_method).times(3)
     #   3.times { object.expected_method }
@@ -30,6 +31,7 @@ module Mocha # :nodoc:
     #   2.times { object.expected_method }
     #   # => verify fails
     #
+    # @example Specifying a range in the number of expected invocations.
     #   object = mock()
     #   object.expects(:expected_method).times(2..4)
     #   3.times { object.expected_method }
@@ -40,13 +42,15 @@ module Mocha # :nodoc:
     #   object.expected_method
     #   # => verify fails
     def times(range)
-      @cardinality = Cardinality.times(range)
+      @cardinality.times(range)
       self
     end
 
-    # :call-seq: twice() -> expectation
-    #
     # Modifies expectation so that the expected method must be called exactly twice.
+    #
+    # @return [Expectation] the same expectation, thereby allowing invocations of other {Expectation} methods to be chained.
+    #
+    # @example Expected method must be invoked exactly twice.
     #   object = mock()
     #   object.expects(:expected_method).twice
     #   object.expected_method
@@ -57,22 +61,24 @@ module Mocha # :nodoc:
     #   object.expects(:expected_method).twice
     #   object.expected_method
     #   object.expected_method
-    #   object.expected_method
-    #   # => verify fails
+    #   object.expected_method # => unexpected invocation
     #
     #   object = mock()
     #   object.expects(:expected_method).twice
     #   object.expected_method
     #   # => verify fails
     def twice
-      @cardinality = Cardinality.exactly(2)
+      @cardinality.exactly(2)
       self
     end
 
-    # :call-seq: once() -> expectation
-    #
     # Modifies expectation so that the expected method must be called exactly once.
+    #
     # Note that this is the default behaviour for an expectation, but you may wish to use it for clarity/emphasis.
+    #
+    # @return [Expectation] the same expectation, thereby allowing invocations of other {Expectation} methods to be chained.
+    #
+    # @example Expected method must be invoked exactly once.
     #   object = mock()
     #   object.expects(:expected_method).once
     #   object.expected_method
@@ -81,36 +87,39 @@ module Mocha # :nodoc:
     #   object = mock()
     #   object.expects(:expected_method).once
     #   object.expected_method
-    #   object.expected_method
-    #   # => verify fails
+    #   object.expected_method # => unexpected invocation
     #
     #   object = mock()
     #   object.expects(:expected_method).once
     #   # => verify fails
     def once
-      @cardinality = Cardinality.exactly(1)
+      @cardinality.exactly(1)
       self
     end
 
-    # :call-seq: never() -> expectation
-    #
     # Modifies expectation so that the expected method must never be called.
+    #
+    # @return [Expectation] the same expectation, thereby allowing invocations of other {Expectation} methods to be chained.
+    #
+    # @example Expected method must never be called.
     #   object = mock()
     #   object.expects(:expected_method).never
-    #   object.expected_method
-    #   # => verify fails
+    #   object.expected_method # => unexpected invocation
     #
     #   object = mock()
     #   object.expects(:expected_method).never
     #   # => verify succeeds
     def never
-      @cardinality = Cardinality.exactly(0)
+      @cardinality.exactly(0)
       self
     end
 
-    # :call-seq: at_least(minimum_number_of_times) -> expectation
-    #
     # Modifies expectation so that the expected method must be called at least a +minimum_number_of_times+.
+    #
+    # @param [Integer] minimum_number_of_times minimum number of expected invocations.
+    # @return [Expectation] the same expectation, thereby allowing invocations of other {Expectation} methods to be chained.
+    #
+    # @example Expected method must be called at least twice.
     #   object = mock()
     #   object.expects(:expected_method).at_least(2)
     #   3.times { object.expected_method }
@@ -121,13 +130,15 @@ module Mocha # :nodoc:
     #   object.expected_method
     #   # => verify fails
     def at_least(minimum_number_of_times)
-      @cardinality = Cardinality.at_least(minimum_number_of_times)
+      @cardinality.at_least(minimum_number_of_times)
       self
     end
 
-    # :call-seq: at_least_once() -> expectation
-    #
     # Modifies expectation so that the expected method must be called at least once.
+    #
+    # @return [Expectation] the same expectation, thereby allowing invocations of other {Expectation} methods to be chained.
+    #
+    # @example Expected method must be called at least once.
     #   object = mock()
     #   object.expects(:expected_method).at_least_once
     #   object.expected_method
@@ -138,12 +149,14 @@ module Mocha # :nodoc:
     #   # => verify fails
     def at_least_once
       at_least(1)
-      self
     end
 
-    # :call-seq: at_most(maximum_number_of_times) -> expectation
-    #
     # Modifies expectation so that the expected method must be called at most a +maximum_number_of_times+.
+    #
+    # @param [Integer] maximum_number_of_times maximum number of expected invocations.
+    # @return [Expectation] the same expectation, thereby allowing invocations of other {Expectation} methods to be chained.
+    #
+    # @example Expected method must be called at most twice.
     #   object = mock()
     #   object.expects(:expected_method).at_most(2)
     #   2.times { object.expected_method }
@@ -151,16 +164,17 @@ module Mocha # :nodoc:
     #
     #   object = mock()
     #   object.expects(:expected_method).at_most(2)
-    #   3.times { object.expected_method }
-    #   # => verify fails
+    #   3.times { object.expected_method } # => unexpected invocation
     def at_most(maximum_number_of_times)
-      @cardinality = Cardinality.at_most(maximum_number_of_times)
+      @cardinality.at_most(maximum_number_of_times)
       self
     end
 
-    # :call-seq: at_most_once() -> expectation
-    #
     # Modifies expectation so that the expected method must be called at most once.
+    #
+    # @return [Expectation] the same expectation, thereby allowing invocations of other {Expectation} methods to be chained.
+    #
+    # @example Expected method must be called at most once.
     #   object = mock()
     #   object.expects(:expected_method).at_most_once
     #   object.expected_method
@@ -168,16 +182,22 @@ module Mocha # :nodoc:
     #
     #   object = mock()
     #   object.expects(:expected_method).at_most_once
-    #   2.times { object.expected_method }
-    #   # => verify fails
-    def at_most_once()
+    #   2.times { object.expected_method } # => unexpected invocation
+    def at_most_once
       at_most(1)
-      self
     end
 
-    # :call-seq: with(*expected_parameters, &matching_block) -> expectation
-    #
     # Modifies expectation so that the expected method must be called with +expected_parameters+.
+    #
+    # May be used with parameter matchers in {ParameterMatchers}.
+    #
+    # @param [*Array] expected_parameters parameters expected.
+    # @yield optional block specifying custom matching.
+    # @yieldparam [*Array] actual_parameters parameters with which expected method was invoked.
+    # @yieldreturn [Boolean] +true+ if +actual_parameters+ are acceptable.
+    # @return [Expectation] the same expectation, thereby allowing invocations of other {Expectation} methods to be chained.
+    #
+    # @example Expected method must be called with expected parameters.
     #   object = mock()
     #   object.expects(:expected_method).with(:param1, :param2)
     #   object.expected_method(:param1, :param2)
@@ -187,10 +207,8 @@ module Mocha # :nodoc:
     #   object.expects(:expected_method).with(:param1, :param2)
     #   object.expected_method(:param3)
     #   # => verify fails
-    # May be used with parameter matchers in Mocha::ParameterMatchers.
     #
-    # If a +matching_block+ is given, the block is called with the parameters passed to the expected method.
-    # The expectation is matched if the block evaluates to +true+.
+    # @example Expected method must be called with a value divisible by 4.
     #   object = mock()
     #   object.expects(:expected_method).with() { |value| value % 4 == 0 }
     #   object.expected_method(16)
@@ -205,79 +223,148 @@ module Mocha # :nodoc:
       self
     end
 
-    # :call-seq: yields(*parameters) -> expectation
+    # Modifies expectation so that the expected method must be called with a block.
+    #
+    # @return [Expectation] the same expectation, thereby allowing invocations of other {Expectation} methods to be chained.
     #
-    # Modifies expectation so that when the expected method is called, it yields with the specified +parameters+.
+    # @example Expected method must be called with a block.
     #   object = mock()
-    #   object.expects(:expected_method).yields('result')
-    #   yielded_value = nil
-    #   object.expected_method { |value| yielded_value = value }
-    #   yielded_value # => 'result'
-    # May be called multiple times on the same expectation for consecutive invocations. Also see Expectation#then.
+    #   object.expects(:expected_method).with_block_given
+    #   object.expected_method { 1 + 1 }
+    #   # => verify succeeds
+    #
     #   object = mock()
-    #   object.stubs(:expected_method).yields(1).then.yields(2)
-    #   yielded_values_from_first_invocation = []
-    #   yielded_values_from_second_invocation = []
-    #   object.expected_method { |value| yielded_values_from_first_invocation << value } # first invocation
-    #   object.expected_method { |value| yielded_values_from_second_invocation << value } # second invocation
-    #   yielded_values_from_first_invocation # => [1]
-    #   yielded_values_from_second_invocation # => [2]
-    def yields(*parameters)
-      @yield_parameters.add(*parameters)
+    #   object.expects(:expected_method).with_block_given
+    #   object.expected_method
+    #   # => verify fails
+    def with_block_given
+      @block_matcher = BlockMatchers::BlockGiven.new
       self
     end
 
-    # :call-seq: multiple_yields(*parameter_groups) -> expectation
-    #
-    # Modifies expectation so that when the expected method is called, it yields multiple times per invocation with the specified +parameter_groups+.
+    # Modifies expectation so that the expected method must be called without a block.
     #
-    # Note that each +parameter_group+ should be an Array representing the parameters to be passed to the block for a single yield. In the following example when the expected_method is called, the stub will invoke the block twice, the first time it passes 'result_1', 'result_2' as the parameters, and the second time it passes 'result_3' as the parameters.
+    # @return [Expectation] the same expectation, thereby allowing invocations of other {Expectation} methods to be chained.
     #
+    # @example Expected method must be called without a block.
     #   object = mock()
-    #   object.expects(:expected_method).multiple_yields(['result_1', 'result_2'], ['result_3'])
-    #   yielded_values = []
-    #   object.expected_method { |*values| yielded_values << values }
-    #   yielded_values # => [['result_1', 'result_2'], ['result_3]]
-    # May be called multiple times on the same expectation for consecutive invocations. Also see Expectation#then.
+    #   object.expects(:expected_method).with_no_block_given
+    #   object.expected_method
+    #   # => verify succeeds
+    #
     #   object = mock()
-    #   object.stubs(:expected_method).multiple_yields([1, 2], [3]).then.multiple_yields([4], [5, 6])
-    #   yielded_values_from_first_invocation = []
-    #   yielded_values_from_second_invocation = []
-    #   object.expected_method { |*values| yielded_values_from_first_invocation << values } # first invocation
-    #   object.expected_method { |*values| yielded_values_from_second_invocation << values } # second invocation
-    #   yielded_values_from_first_invocation # => [[1, 2], [3]]
-    #   yielded_values_from_second_invocation # => [[4], [5, 6]]
-    def multiple_yields(*parameter_groups)
-      @yield_parameters.multiple_add(*parameter_groups)
+    #   object.expects(:expected_method).with_block_given
+    #   object.expected_method { 1 + 1 }
+    #   # => verify fails
+    def with_no_block_given
+      @block_matcher = BlockMatchers::NoBlockGiven.new
       self
     end
 
-    # :call-seq: returns(value) -> expectation
-    #            returns(*values) -> expectation
+    # Modifies expectation so that when the expected method is called, it yields to the block with the specified +parameters+.
+    #
+    # If no +parameters+ are specified, it yields to the block without any parameters.
+    #
+    # If no block is provided, the method will still attempt to yield resulting in a +LocalJumpError+. Note that this is what would happen if a "real" (non-mock) method implementation tried to yield to a non-existent block.
+    #
+    # May be called multiple times on the same expectation for consecutive invocations.
+    #
+    # @param [*Array] parameters parameters to be yielded.
+    # @return [Expectation] the same expectation, thereby allowing invocations of other {Expectation} methods to be chained.
+    # @see #then
+    #
+    # @example Yield when expected method is invoked.
+    #   benchmark = mock()
+    #   benchmark.expects(:measure).yields
+    #   yielded = false
+    #   benchmark.measure { yielded = true }
+    #   yielded # => true
+    #
+    # @example Yield parameters when expected method is invoked.
+    #   fibonacci = mock()
+    #   fibonacci.expects(:next_pair).yields(0, 1)
+    #   sum = 0
+    #   fibonacci.next_pair { |first, second| sum = first + second }
+    #   sum # => 1
+    #
+    # @example Yield different parameters on different invocations of the expected method.
+    #   fibonacci = mock()
+    #   fibonacci.expects(:next_pair).yields(0, 1).then.yields(1, 1)
+    #   sum = 0
+    #   fibonacci.next_pair { |first, second| sum = first + second }
+    #   sum # => 1
+    #   fibonacci.next_pair { |first, second| sum = first + second }
+    #   sum # => 2
+    def yields(*parameters)
+      multiple_yields(parameters)
+    end
+
+    # Modifies expectation so that when the expected method is called, it yields multiple times per invocation with the specified +parameter_groups+.
     #
+    # If no block is provided, the method will still attempt to yield resulting in a +LocalJumpError+. Note that this is what would happen if a "real" (non-mock) method implementation tried to yield to a non-existent block.
+    #
+    # @param [*Array<Array>] parameter_groups each element of +parameter_groups+ should iself be an +Array+ representing the parameters to be passed to the block for a single yield. Any element of +parameter_groups+ that is not an +Array+ is wrapped in an +Array+.
+    # @return [Expectation] the same expectation, thereby allowing invocations of other {Expectation} methods to be chained.
+    # @see #then
+    #
+    # @example When +foreach+ is called, the stub will invoke the block twice, the first time it passes ['row1_col1', 'row1_col2'] as the parameters, and the second time it passes ['row2_col1', ''] as the parameters.
+    #   csv = mock()
+    #   csv.expects(:foreach).with("path/to/file.csv").multiple_yields(['row1_col1', 'row1_col2'], ['row2_col1', ''])
+    #   rows = []
+    #   csv.foreach { |row| rows << row }
+    #   rows # => [['row1_col1', 'row1_col2'], ['row2_col1', '']]
+    #
+    # @example Yield different groups of parameters on different invocations of the expected method. Simulating a situation where the CSV file at 'path/to/file.csv' has been modified between the two calls to +foreach+.
+    #   csv = mock()
+    #   csv.stubs(:foreach).with("path/to/file.csv").multiple_yields(['old_row1_col1', 'old_row1_col2'], ['old_row2_col1', '']).then.multiple_yields(['new_row1_col1', ''], ['new_row2_col1', 'new_row2_col2'])
+    #   rows_from_first_invocation = []
+    #   rows_from_second_invocation = []
+    #   csv.foreach { |row| rows_from_first_invocation << row } # first invocation
+    #   csv.foreach { |row| rows_from_second_invocation << row } # second invocation
+    #   rows_from_first_invocation # => [['old_row1_col1', 'old_row1_col2'], ['old_row2_col1', '']]
+    #   rows_from_second_invocation # => [['new_row1_col1', ''], ['new_row2_col1', 'new_row2_col2']]
+    def multiple_yields(*parameter_groups)
+      @yield_parameters.add(*parameter_groups)
+      self
+    end
+
     # Modifies expectation so that when the expected method is called, it returns the specified +value+.
+    #
+    # @return [Expectation] the same expectation, thereby allowing invocations of other {Expectation} methods to be chained.
+    # @see #then
+    #
+    # @overload def returns(value)
+    #   @param [Object] value value to return on invocation of expected method.
+    # @overload def returns(*values)
+    #   @param [*Array] values values to return on consecutive invocations of expected method.
+    #
+    # @example Return the same value on every invocation.
     #   object = mock()
     #   object.stubs(:stubbed_method).returns('result')
     #   object.stubbed_method # => 'result'
     #   object.stubbed_method # => 'result'
-    # If multiple +values+ are given, these are returned in turn on consecutive calls to the method.
+    #
+    # @example Return a different value on consecutive invocations.
     #   object = mock()
     #   object.stubs(:stubbed_method).returns(1, 2)
     #   object.stubbed_method # => 1
     #   object.stubbed_method # => 2
-    # May be called multiple times on the same expectation. Also see Expectation#then.
+    #
+    # @example Alternative way to return a different value on consecutive invocations.
     #   object = mock()
     #   object.stubs(:expected_method).returns(1, 2).then.returns(3)
     #   object.expected_method # => 1
     #   object.expected_method # => 2
     #   object.expected_method # => 3
-    # May be called in conjunction with Expectation#raises on the same expectation.
+    #
+    # @example May be called in conjunction with {#raises} on the same expectation.
     #   object = mock()
     #   object.stubs(:expected_method).returns(1, 2).then.raises(Exception)
     #   object.expected_method # => 1
     #   object.expected_method # => 2
     #   object.expected_method # => raises exception of class Exception1
-    # Note that in Ruby a method returning multiple values is exactly equivalent to a method returning an Array of those values.
+    #
+    # @example Note that in Ruby a method returning multiple values is exactly equivalent to a method returning an +Array+ of those values.
     #   object = mock()
     #   object.stubs(:expected_method).returns([1, 2])
     #   x, y = object.expected_method
@@ -288,22 +375,36 @@ module Mocha # :nodoc:
       self
     end
 
-    # :call-seq: raises(exception = RuntimeError, message = nil) -> expectation
+    # Modifies expectation so that when the expected method is called, it raises the specified +exception+ with the specified +message+ i.e. calls +Kernel#raise(exception, message)+.
+    #
+    # @param [Class,Exception,String,#exception] exception exception to be raised or message to be passed to RuntimeError.
+    # @param [String] message exception message.
+    # @return [Expectation] the same expectation, thereby allowing invocations of other {Expectation} methods to be chained.
     #
-    # Modifies expectation so that when the expected method is called, it raises the specified +exception+ with the specified +message+ i.e. calls Kernel#raise(exception, message).
+    # @see Kernel#raise
+    # @see #then
+    #
+    # @overload def raises
+    # @overload def raises(exception)
+    # @overload def raises(exception, message)
+    #
+    # @example Raise specified exception if expected method is invoked.
     #   object = stub()
     #   object.stubs(:expected_method).raises(Exception, 'message')
     #   object.expected_method # => raises exception of class Exception and with message 'message'
-    # Note that if you have a custom exception class with extra constructor parameters, you can pass in an instance of the exception (just as you can for Kernel#raise).
+    #
+    # @example Raise custom exception with extra constructor parameters by passing in an instance of the exception.
     #   object = stub()
     #   object.stubs(:expected_method).raises(MyException.new('message', 1, 2, 3))
     #   object.expected_method # => raises the specified instance of MyException
-    # May be called multiple times on the same expectation. Also see Expectation#then.
+    #
+    # @example Raise different exceptions on consecutive invocations of the expected method.
     #   object = stub()
     #   object.stubs(:expected_method).raises(Exception1).then.raises(Exception2)
     #   object.expected_method # => raises exception of class Exception1
     #   object.expected_method # => raises exception of class Exception2
-    # May be called in conjunction with Expectation#returns on the same expectation.
+    #
+    # @example Raise an exception on first invocation of expected method and then return values on subsequent invocations.
     #   object = stub()
     #   object.stubs(:expected_method).raises(Exception).then.returns(2, 3)
     #   object.expected_method # => raises exception of class Exception1
@@ -314,22 +415,35 @@ module Mocha # :nodoc:
       self
     end
 
-    # :call-seq: throws(tag, object = nil) -> expectation
+    # Modifies expectation so that when the expected method is called, it throws the specified +tag+ with the specific return value +object+ i.e. calls +Kernel#throw(tag, object)+.
+    #
+    # @param [Symbol,String] tag tag to throw to transfer control to the active catch block.
+    # @param [Object] object return value for the catch block.
+    # @return [Expectation] the same expectation, thereby allowing invocations of other {Expectation} methods to be chained.
+    #
+    # @see Kernel#throw
+    # @see #then
     #
-    # Modifies expectation so that when the expected method is called, it throws the specified +tag+ with the specific return value +object+ i.e. calls Kernel#throw(tag, object).
+    # @overload def throw(tag)
+    # @overload def throw(tag, object)
+    #
+    # @example Throw tag when expected method is invoked.
     #   object = stub()
     #   object.stubs(:expected_method).throws(:done)
     #   object.expected_method # => throws tag :done
-    # Note you can also pass in an optional return value +object+ (just as you can for Kernel#throw).
+    #
+    # @example Throw tag with return value +object+ c.f. +Kernel#throw+.
     #   object = stub()
     #   object.stubs(:expected_method).throws(:done, 'result')
     #   object.expected_method # => throws tag :done and causes catch block to return 'result'
-    # May be called multiple times on the same expectation. Also see Expectation#then.
+    #
+    # @example Throw different tags on consecutive invocations of the expected method.
     #   object = stub()
     #   object.stubs(:expected_method).throws(:done).then.throws(:continue)
     #   object.expected_method # => throws :done
     #   object.expected_method # => throws :continue
-    # May be called in conjunction with Expectation#returns on the same expectation.
+    #
+    # @example Throw tag on first invocation of expected method and then return values for subsequent invocations.
     #   object = stub()
     #   object.stubs(:expected_method).throws(:done).then.returns(2, 3)
     #   object.expected_method # => throws :done
@@ -340,10 +454,19 @@ module Mocha # :nodoc:
       self
     end
 
-    # :call-seq: then() -> expectation
-    #            then(state_machine.is(state)) -> expectation
+    # @overload def then
+    #   Used as syntactic sugar to improve readability. It has no effect on state of the expectation.
+    # @overload def then(state)
+    #   Used to change the +state_machine+ to the specified state when the expected invocation occurs.
+    #   @param [StateMachine::State] state state_machine.is(state_name) provides a mechanism to change the +state_machine+ into the state specified by +state_name+ when the expected method is invoked.
+    #
+    #   @see API#states
+    #   @see StateMachine
+    #   @see #when
+    #
+    # @return [Expectation] the same expectation, thereby allowing invocations of other {Expectation} methods to be chained.
     #
-    # <tt>then()</tt> is used as syntactic sugar to improve readability. It has no effect on state of the expectation.
+    # @example Using {#then} as syntactic sugar when specifying values to be returned and exceptions to be raised on consecutive invocations of the expected method.
     #   object = mock()
     #   object.stubs(:expected_method).returns(1, 2).then.raises(Exception).then.returns(4)
     #   object.expected_method # => 1
@@ -351,9 +474,7 @@ module Mocha # :nodoc:
     #   object.expected_method # => raises exception of class Exception
     #   object.expected_method # => 4
     #
-    # <tt>then(state_machine.is(state))</tt> is used to change the +state_machine+ to the specified +state+ when the invocation occurs.
-    #
-    # See also API#states, StateMachine and Expectation#when.
+    # @example Using {#then} to change the +state+ of a +state_machine+ on the invocation of an expected method.
     #   power = states('power').starts_as('off')
     #
     #   radio = mock('radio')
@@ -363,19 +484,21 @@ module Mocha # :nodoc:
     #   radio.expects(:select_channel).with('BBC World Service').when(power.is('on'))
     #   radio.expects(:adjust_volume).with(-5).when(power.is('on'))
     #   radio.expects(:switch_off).then(power.is('off'))
-    def then(*parameters)
-      if parameters.length == 1
-        state = parameters.first
-        add_side_effect(ChangeStateSideEffect.new(state))
-      end
+    def then(state = nil)
+      add_side_effect(ChangeStateSideEffect.new(state)) if state
       self
     end
 
-    # :call-seq: when(state_machine.is(state)) -> exception
+    # Constrains the expectation to occur only when the +state_machine+ is in the state specified by +state_predicate+.
+    #
+    # @param [StateMachine::StatePredicate] state_predicate +state_machine.is(state_name)+ provides a mechanism to determine whether the +state_machine+ is in the state specified by +state_predicate+ when the expected method is invoked.
+    # @return [Expectation] the same expectation, thereby allowing invocations of other {Expectation} methods to be chained.
     #
-    # Constrains the expectation to occur only when the +state_machine+ is in the named +state+.
+    # @see API#states
+    # @see StateMachine
+    # @see #then
     #
-    # See also API#states, StateMachine#starts_as and Expectation#then.
+    # @example Using {#when} to only allow invocation of methods when "power" state machine is in the "on" state.
     #   power = states('power').starts_as('off')
     #
     #   radio = mock('radio')
@@ -390,120 +513,136 @@ module Mocha # :nodoc:
       self
     end
 
-    # :call-seq: in_sequence(*sequences) -> expectation
+    # Constrains the expectation so that it must be invoked at the current point in the +sequence+.
     #
-    # Constrains this expectation so that it must be invoked at the current point in the sequence.
+    # To expect a sequence of invocations, write the expectations in order and add the +in_sequence(sequence)+ clause to each one.
     #
-    # To expect a sequence of invocations, write the expectations in order and add the in_sequence(sequence) clause to each one.
+    # Expectations in a +sequence+ can have any invocation count.
     #
-    # Expectations in a sequence can have any invocation count.
+    # If an expectation in a sequence is stubbed, rather than expected, it can be skipped in the +sequence+.
     #
-    # If an expectation in a sequence is stubbed, rather than expected, it can be skipped in the sequence.
+    # An expected method can appear in multiple sequences.
     #
-    # See also API#sequence.
+    # @param [Sequence] sequence sequence in which expected method should appear.
+    # @param [*Array<Sequence>] sequences more sequences in which expected method should appear.
+    # @return [Expectation] the same expectation, thereby allowing invocations of other {Expectation} methods to be chained.
+    #
+    # @see API#sequence
+    #
+    # @example Ensure methods are invoked in a specified order.
     #   breakfast = sequence('breakfast')
     #
     #   egg = mock('egg')
     #   egg.expects(:crack).in_sequence(breakfast)
     #   egg.expects(:fry).in_sequence(breakfast)
     #   egg.expects(:eat).in_sequence(breakfast)
-    def in_sequence(*sequences)
-      sequences.each { |sequence| add_in_sequence_ordering_constraint(sequence) }
+    def in_sequence(sequence, *sequences)
+      sequences.unshift(sequence).each { |seq| add_in_sequence_ordering_constraint(seq) }
       self
     end
 
-    # :stopdoc:
-
+    # @private
     attr_reader :backtrace
 
+    # @private
     def initialize(mock, expected_method_name, backtrace = nil)
       @mock = mock
       @method_matcher = MethodMatcher.new(expected_method_name.to_sym)
       @parameters_matcher = ParametersMatcher.new
+      @block_matcher = BlockMatchers::OptionalBlock.new
       @ordering_constraints = []
       @side_effects = []
-      @cardinality, @invocation_count = Cardinality.exactly(1), 0
+      @cardinality = Cardinality.new.exactly(1)
       @return_values = ReturnValues.new
       @yield_parameters = YieldParameters.new
       @backtrace = backtrace || caller
     end
 
+    # @private
     def add_ordering_constraint(ordering_constraint)
       @ordering_constraints << ordering_constraint
     end
 
+    # @private
     def add_in_sequence_ordering_constraint(sequence)
       sequence.constrain_as_next_in_sequence(self)
     end
 
+    # @private
     def add_side_effect(side_effect)
       @side_effects << side_effect
     end
 
+    # @private
     def perform_side_effects
-      @side_effects.each { |side_effect| side_effect.perform }
+      @side_effects.each(&:perform)
     end
 
+    # @private
     def in_correct_order?
-      @ordering_constraints.all? { |ordering_constraint| ordering_constraint.allows_invocation_now? }
+      @ordering_constraints.all?(&:allows_invocation_now?)
     end
 
+    # @private
     def matches_method?(method_name)
       @method_matcher.match?(method_name)
     end
 
-    def match?(actual_method_name, *actual_parameters)
-      @method_matcher.match?(actual_method_name) && @parameters_matcher.match?(actual_parameters) && in_correct_order?
+    # @private
+    def match?(invocation)
+      @method_matcher.match?(invocation.method_name) && @parameters_matcher.match?(invocation.arguments) && @block_matcher.match?(invocation.block) && in_correct_order?
     end
 
+    # @private
     def invocations_allowed?
-      @cardinality.invocations_allowed?(@invocation_count)
+      @cardinality.invocations_allowed?
     end
 
+    # @private
     def satisfied?
-      @cardinality.satisfied?(@invocation_count)
+      @cardinality.satisfied?
     end
 
-    def invoke
-      @invocation_count += 1
-      perform_side_effects()
-      if block_given? then
-        @yield_parameters.next_invocation.each do |yield_parameters|
-          yield(*yield_parameters)
-        end
-      end
-      @return_values.next
+    # @private
+    def invoke(invocation)
+      perform_side_effects
+      @cardinality << invocation
+      invocation.call(@yield_parameters, @return_values)
     end
 
+    # @private
     def verified?(assertion_counter = nil)
       assertion_counter.increment if assertion_counter && @cardinality.needs_verifying?
-      @cardinality.verified?(@invocation_count)
+      @cardinality.verified?
     end
 
+    # @private
     def used?
-      @cardinality.used?(@invocation_count)
+      @cardinality.used?
+    end
+
+    # @private
+    def inspect
+      address = __id__ * 2
+      address += 0x100000000 if address < 0
+      "#<Expectation:0x#{format('%x', address)} #{mocha_inspect} >"
     end
 
+    # @private
     def mocha_inspect
-      message = "#{@cardinality.mocha_inspect}, "
-      message << case @invocation_count
-        when 0 then "not yet invoked"
-        when 1 then "invoked once"
-        when 2 then "invoked twice"
-        else "invoked #{@invocation_count} times"
+      message = "#{@cardinality.anticipated_times}, #{@cardinality.invoked_times}: #{method_signature}"
+      message << "; #{@ordering_constraints.map(&:mocha_inspect).join('; ')}" unless @ordering_constraints.empty?
+      if Mocha.configuration.display_matching_invocations_on_failure?
+        message << @cardinality.actual_invocations
       end
-      message << ": "
-      message << method_signature
-      message << "; #{@ordering_constraints.map { |oc| oc.mocha_inspect }.join("; ")}" unless @ordering_constraints.empty?
       message
     end
 
+    # @private
     def method_signature
-      "#{@mock.mocha_inspect}.#{@method_matcher.mocha_inspect}#{@parameters_matcher.mocha_inspect}"
+      signature = "#{@mock.mocha_inspect}.#{@method_matcher.mocha_inspect}#{@parameters_matcher.mocha_inspect}"
+      signature << " #{@block_matcher.mocha_inspect}" if @block_matcher.mocha_inspect
+      signature
     end
-
-    # :startdoc:
-
   end
-
 end