Support for out of order calls with andAlso

Author: ryanplusplus

mock.lua

@@ -81,10 +81,24 @@ function MockExpectation:when(thunk)
 
   local function called(m, name, args)
     assert(#self._calls > 0, 'unexpected call')
-    assert(self._calls[1]:functionMatches(m), 'unexpected function "' .. name .. '" called', 2)
-    assert(self._calls[1]:argsMatch(args), 'unexpected arguments provided to function "' .. name .. '"')
 
-    return table.remove(self._calls, 1):getReturnValues()
+    local validFunctionFound = false
+
+    for i, call in ipairs(self._calls) do
+      if call:functionMatches(m) then
+        validFunctionFound = true
+
+        if call:argsMatch(args) then
+          return table.remove(self._calls, i):getReturnValues()
+        end
+      end
+    end
+
+    if not validFunctionFound then
+      error('unexpected function "' .. name .. '" called', 2)
+    else
+      error('unexpected arguments provided to function "' .. name .. '"', 2)
+    end
   end
 
   mockHandle(called, thunk)

spec/mock_spec.lua

@@ -280,5 +280,24 @@ describe('The mock library', function()
     end)
   end)
 
+  it('should allow calls to happen out of order when andAlso is used', function()
+    local f1 = mock:mockFunction('f1')
+    local f2 = mock:mockFunction('f2')
+
+    mock(f1):shouldBeCalled():
+    andAlso(mock(f2):shouldBeCalled()):
+    when(function()
+      f1()
+      f2()
+    end)
+
+    mock(f1):shouldBeCalledWith(1):
+    andAlso(mock(f1):shouldBeCalledWith(2)):
+    when(function()
+      f1(2)
+      f1(1)
+    end)
+  end)
+
   -- ordering
 end)