Added flexible ordering requirements

Author: ryanplusplus

mock.lua

@@ -17,6 +17,7 @@ ExpectedCall = {}
 function ExpectedCall:new(f, args)
   local o = {
     _f = f,
+    _ordered = false,
     _args = args,
     _return = {}
   }
@@ -49,6 +50,14 @@ function ExpectedCall:getReturnValues(...)
   return table.unpack(self._return)
 end
 
+function ExpectedCall:fixOrder()
+  self._ordered = true
+end
+
+function ExpectedCall:hasFixedOrder()
+  return self._ordered
+end
+
 MockExpectation = {}
 
 function MockExpectation:new(m)
@@ -92,6 +101,8 @@ function MockExpectation:when(thunk)
           return table.remove(self._calls, i):getReturnValues()
         end
       end
+
+      if call:hasFixedOrder() then break end
     end
 
     if not validFunctionFound then
@@ -115,7 +126,8 @@ function MockExpectation:after(thunk)
 end
 
 function MockExpectation:andThen(other)
-  -- Need to handle ordering
+  self._calls[#self._calls]:fixOrder()
+
   for _, call in ipairs(other._calls) do
     table.insert(self._calls, call)
   end
@@ -124,7 +136,6 @@ function MockExpectation:andThen(other)
 end
 
 function MockExpectation:andAlso(other)
-  -- Need to handle ordering
   for _, call in ipairs(other._calls) do
     table.insert(self._calls, call)
   end

spec/mock_spec.lua

@@ -287,8 +287,8 @@ describe('The mock library', function()
     mock(f1):shouldBeCalled():
     andAlso(mock(f2):shouldBeCalled()):
     when(function()
-      f1()
       f2()
+      f1()
     end)
 
     mock(f1):shouldBeCalledWith(1):
@@ -299,5 +299,26 @@ describe('The mock library', function()
     end)
   end)
 
-  -- ordering
+  it('should not allow calls to happen out of order when andThen is used', function()
+    local f1 = mock:mockFunction('f1')
+    local f2 = mock:mockFunction('f2')
+
+    shouldFailWith('unexpected function "f2" called', function()
+      mock(f1):shouldBeCalled():
+      andThen(mock(f2):shouldBeCalled()):
+      when(function()
+        f2()
+        f1()
+      end)
+    end)
+
+    shouldFailWith('unexpected arguments provided to function "f1"', function()
+      mock(f1):shouldBeCalledWith(1):
+      andThen(mock(f2):shouldBeCalled(2)):
+      when(function()
+        f1(2)
+        f1(1)
+      end)
+    end)
+  end)
 end)