Allow for table contents to be matched. Closes #5.

Author: ryanplusplus

rockspecs/mach-git-0.rockspec

@@ -24,5 +24,6 @@ build = {
     ['mach.format_call_status'] = 'mach/format_call_status.lua',
     ['mach.format_arguments'] = 'mach/format_arguments.lua',
     ['mach.deep_compare_matcher'] = 'mach/deep_compare_matcher.lua',
+    ['mach.match'] = 'mach/match.lua',
   }
 }

spec/mach_spec.lua

@@ -629,4 +629,18 @@ describe('The mach library', function()
       end)
     end)
   end)
+
+  it('should allow the contents of tables arguments to be matched with the default matcher', function()
+    f:should_be_called_with(mach.match({ a = 1, b = 2 })):when(function()
+      f({ a = 1, b = 2 })
+    end)
+  end)
+
+  it('should not allow table contents to be different when using the default matcher', function()
+    should_fail(function()
+      f:should_be_called_with(mach.match({ a = 1, b = 2 })):when(function()
+        f({ a = 11, b = 22 })
+      end)
+    end)
+  end)
 end)

src/mach.lua

@@ -1,6 +1,8 @@
 local ExpectedCall = require 'mach.ExpectedCall'
 local Expectation = require 'mach.Expectation'
 local unexpected_call_error = require 'mach.unexpected_call_error'
+local default_matcher = require 'mach.deep_compare_matcher'
+local mach_match = require 'mach.match'
 
 local mach = {}
 
@@ -90,4 +92,8 @@ function mach.mock_object(o, name)
   return mocked
 end
 
+function mach.match(value)
+  return setmetatable({ value = value, matcher = default_matcher }, mach_match)
+end
+
 return setmetatable(mach, { __call = function(_, ...) return Expectation(...) end })

src/mach/ExpectedCall.lua

@@ -1,3 +1,5 @@
+local mach_match = require 'mach.match'
+
 local expected_call = {}
 expected_call.__index = expected_call
 
@@ -40,7 +42,11 @@ function expected_call:args_match(args)
   if #self._args ~= #args then return false end
 
   for k in ipairs(self._args) do
-    if self._args[k] ~= args[k] then return false end
+    if getmetatable(self._args[k]) == mach_match then
+      if not self._args[k].matcher(self._args[k].value, args[k]) then return false end
+    elseif self._args[k] ~= args[k] then
+      return false
+    end
   end
 
   return true