chore(luassert): bump to v1.9.0 (#413)

Author: stasjok

lua/luassert/assert.lua

@@ -42,7 +42,7 @@ local __state_meta = {
       local arguments = util.make_arglist(...)
       local val, retargs = assertion.callback(self, arguments, util.errorlevel())
 
-      if not val == self.mod then
+      if (not val) == self.mod then
         local message = assertion.positive_message
         if not self.mod then
           message = assertion.negative_message

lua/luassert/assertions.lua

@@ -238,7 +238,9 @@ local function error_matches(state, arguments, level)
   end
 
   -- err_actual must be (convertible to) a string
-  if util.hastostring(err_actual) then
+  if util.hastostring(err_actual) or
+     type(err_actual) == "number" or
+     type(err_actual) == "boolean" then
     err_actual = tostring(err_actual)
     retargs[1] = err_actual
   end

lua/luassert/formatters/init.lua

@@ -3,22 +3,28 @@ local assert = require('luassert.assert')
 local match = require('luassert.match')
 local util = require('luassert.util')
 
-local colors = setmetatable({
-  none = function(c) return c end
-},{ __index = function(self, key)
+local isatty, colors do
   local ok, term = pcall(require, 'term')
-  local isatty = io.type(io.stdout) == 'file' and ok and term.isatty(io.stdout)
-  if not ok or not isatty or not term.colors then
-    return function(c) return c end
+  isatty = io.type(io.stdout) == 'file' and ok and term.isatty(io.stdout)
+  if not isatty then
+    local isWindows = package.config:sub(1,1) == '\\'
+    if isWindows and os.getenv("ANSICON") then
+      isatty = true
+    end
   end
-  return function(c)
-    for token in key:gmatch("[^%.]+") do
-      c = term.colors[token](c)
+
+  colors = setmetatable({
+    none = function(c) return c end
+  },{ __index = function(self, key)
+    return function(c)
+      for token in key:gmatch("[^%.]+") do
+        c = term.colors[token](c)
+      end
+      return c
     end
-    return c
   end
+  })
 end
-})
 
 local function fmt_string(arg)
   if type(arg) == "string" then
@@ -122,7 +128,7 @@ local function fmt_table(arg, fmtargs)
   local tmax = assert:get_parameter("TableFormatLevel")
   local showrec = assert:get_parameter("TableFormatShowRecursion")
   local errchar = assert:get_parameter("TableErrorHighlightCharacter") or ""
-  local errcolor = assert:get_parameter("TableErrorHighlightColor") or "none"
+  local errcolor = assert:get_parameter("TableErrorHighlightColor")
   local crumbs = fmtargs and fmtargs.crumbs or {}
   local cache = {}
   local type_desc
@@ -246,4 +252,4 @@ assert:add_formatter(fmt_arglist)
 assert:set_parameter("TableFormatLevel", 3)
 assert:set_parameter("TableFormatShowRecursion", false)
 assert:set_parameter("TableErrorHighlightCharacter", "*")
-assert:set_parameter("TableErrorHighlightColor", "none")
+assert:set_parameter("TableErrorHighlightColor", isatty and "red" or "none")

lua/luassert/languages/en.lua

@@ -34,11 +34,11 @@ s:set("assertion.called_at_most.positive", "Expected to be called at most %s tim
 s:set("assertion.called_more_than.positive", "Expected to be called more than %s time(s), but was called %s time(s)")
 s:set("assertion.called_less_than.positive", "Expected to be called less than %s time(s), but was called %s time(s)")
 
-s:set("assertion.called_with.positive", "Function was not called with the arguments")
-s:set("assertion.called_with.negative", "Function was called with the arguments")
+s:set("assertion.called_with.positive", "Function was never called with matching arguments.\nCalled with (last call if any):\n%s\nExpected:\n%s")
+s:set("assertion.called_with.negative", "Function was called with matching arguments at least once.\nCalled with (last matching call):\n%s\nDid not expect:\n%s")
 
-s:set("assertion.returned_with.positive", "Function was not returned with the arguments")
-s:set("assertion.returned_with.negative", "Function was returned with the arguments")
+s:set("assertion.returned_with.positive", "Function never returned matching arguments.\nReturned (last call if any):\n%s\nExpected:\n%s")
+s:set("assertion.returned_with.negative", "Function returned matching arguments at least once.\nReturned (last matching call):\n%s\nDid not expect:\n%s")
 
 s:set("assertion.returned_arguments.positive", "Expected to be called with %s argument(s), but was called with %s")
 s:set("assertion.returned_arguments.negative", "Expected not to be called with %s argument(s), but was called with %s")

lua/luassert/util.lua

@@ -89,7 +89,7 @@ function util.deepcopy(t, deepmt, cache)
     copy[k] = (spy.is_spy(v) and v or util.deepcopy(v, deepmt, cache))
   end
   if deepmt then
-    debug.setmetatable(copy, util.deepcopy(debug.getmetatable(t, nil, cache)))
+    debug.setmetatable(copy, util.deepcopy(debug.getmetatable(t), false, cache))
   else
     debug.setmetatable(copy, debug.getmetatable(t))
   end
@@ -274,6 +274,7 @@ end
 function util.callable(object)
   return type(object) == "function" or type((debug.getmetatable(object) or {}).__call) == "function"
 end
+
 -----------------------------------------------
 -- Checks an element has tostring.
 -- The type must either be a string or have a metatable