Lua 5.1 compatibility; fixed accidental globals

Author: ryanplusplus

publish-to-lit.lua

@@ -5,7 +5,7 @@ local f = io.open('build/mach.lua', 'w')
 f:write([==[
 --[[lit-meta
   name = 'ryanplusplus/mach'
-  version = '1.0.4'
+  version = '1.0.5'
   description = 'Simple mocking framework for Lua inspired by CppUMock and designed for readability.'
   tags = { 'testing' }
   license = 'MIT'

spec/mach_spec.lua

@@ -682,11 +682,11 @@ describe('The mach library', function()
       'Incomplete calls:\n' ..
       '\tf(<mach.match(3)>)'
 
-      should_fail_with_exactly(expected_failure, function()
-        f:should_be_called_with(mach.match(3)):when(function()
-          f(4)
-        end)
+    should_fail_with_exactly(expected_failure, function()
+      f:should_be_called_with(mach.match(3)):when(function()
+        f(4)
       end)
+    end)
   end)
 
   it('should allow custom matchers to be used', function()

src/mach.lua

@@ -8,25 +8,31 @@ local mach = {}
 
 mach.any = require 'mach.any'
 
-function unexpected_call(m, name, args)
+table.pack = table.pack or function(...)
+  return { n = select('#',...); ... }
+end
+
+table.unpack = table.unpack or unpack
+
+local function unexpected_call(m, name, args)
   unexpected_call_error(name, args, {}, {}, 2)
 end
 
 local subscriber = unexpected_call
 
-function handle_mock_calls(callback, thunk)
+local function handle_mock_calls(callback, thunk)
   subscriber = callback
   thunk()
   subscriber = unexpected_call
 end
 
-function mock_called(m, name, args)
+local function mock_called(m, name, args)
   return subscriber(m, name, args)
 end
 
-function create_expectation(_, method)
+local function create_expectation(_, method)
   return function(self, ...)
-    local expectation = Expectation(self)
+    local expectation = Expectation(handle_mock_calls, self)
     return expectation[method](expectation, ...)
   end
 end
@@ -62,7 +68,7 @@ function mach.mock_method(name)
   return m
 end
 
-function is_callable(x)
+local function is_callable(x)
   local is_function = type(x) == 'function'
   local has_call_metamethod = type((debug.getmetatable(x) or {}).__call) == 'function'
   return is_function or has_call_metamethod
@@ -98,4 +104,4 @@ function mach.match(value, matcher)
   return setmetatable({ value = value, matcher = matcher or default_matcher }, mach_match)
 end
 
-return setmetatable(mach, { __call = function(_, ...) return Expectation(...) end })
+return mach

src/mach/Expectation.lua

@@ -8,12 +8,13 @@ local not_all_calls_occurred_error = require 'mach.not_all_calls_occurred_error'
 local expectation = {}
 expectation.__index = expectation
 
-local function create(m)
+local function create(handle_mock_calls, m)
   local o = {
     _m = m,
     _call_specified = false,
     _calls = {},
-    _completed_calls = {}
+    _completed_calls = {},
+    _handle_mock_calls = handle_mock_calls
   }
 
   setmetatable(o, expectation)
@@ -93,7 +94,7 @@ function expectation:when(thunk)
     end
   end
 
-  handle_mock_calls(called, thunk)
+  self._handle_mock_calls(called, thunk)
 
   for _, call in pairs(self._calls) do
     if call:is_required() then