Updated to handle unexpected calls outside of a mach thunk and to handle printing table in args

Author: ryanplusplus

spec/mach_spec.lua

@@ -1,5 +1,5 @@
 describe('The mach library', function()
-  mock = require 'mach'
+  local mock = require 'mach'
 
   local function shouldFail(test)
     if pcall(test) then
@@ -456,4 +456,18 @@ describe('The mach library', function()
       mock(f):shouldBeCalled():mayBeCalledWith(4)
     end)
   end)
+
+  it('should handle unexpected alls outside of an expectation', function()
+    shouldFailWith('unexpected function call f(1, 2, 3)', function()
+      mock.mockFunction('f')(1, 2, 3)
+    end)
+  end)
+
+  it('should handle table arguments in error messages', function()
+    local a = {}
+
+    shouldFailWith('unexpected function call f(' .. tostring(a) ..')', function()
+      mock.mockFunction('f')(a)
+    end)
+  end)
 end)

src/mach.lua

@@ -1,14 +1,19 @@
 local ExpectedCall = require 'mach.expected-call'
 local Expectation = require 'mach.expectation'
+local UnexpectedCallError = require 'mach.unexpected-call-error'
 
 local Mock = {}
 
-local subscriber
+function unexpectedCall(m, name, args)
+  UnexpectedCallError(name, args, 2)
+end
+
+local subscriber = unexpectedCall
 
 function handleMockCalls(callback, thunk)
   subscriber = callback
   thunk()
-  subscriber = nil
+  subscriber = unexpectedCall
 end
 
 function mockCalled(m, name, args)

src/mach/expectation.lua

@@ -1,4 +1,6 @@
-ExpectedCall = require 'mach.expected-call'
+local ExpectedCall = require 'mach.expected-call'
+local UnexpectedCallError = require 'mach.unexpected-call-error'
+local UnexpectedArgsError = require 'mach.unexpected-args-error'
 
 local expectation = {}
 expectation.__index = expectation
@@ -52,9 +54,9 @@ function expectation:when(thunk)
     end
 
     if not validFunctionFound then
-      error('unexpected function call ' .. name .. '(' .. table.concat(args, ', ') .. ')', 2)
+      UnexpectedCallError(name, args, 2)
     else
-      error('unexpected arguments (' .. table.concat(args, ', ') .. ') provided to function ' .. name, 2)
+      UnexpectedArgsError(name, args, 2)
     end
   end