feat(tests): add tests & fix merge;

AlexvZyl · Jun 15, 2024 · e61d2a5 · e61d2a5
1 parent 21c2ca9
commit e61d2a5
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/lua/nordic/tests/utils.lua b/lua/nordic/tests/utils.lua
@@ -9,6 +9,16 @@ assert_eq(U.is_none('NONE'), true, 'U.is_none("NONE") should return true')
 assert_eq(U.is_none('none'), true, 'U.is_none("none") should return true')
 assert_eq(U.is_none('nil'), false, 'U.is_none("nil") should return false')
 
+-- merge
+assert_eq(U.merge({}, {}), {}, 'M.merge({}, {}) should return an empty table')
+
+assert_eq(U.merge(nil, nil), {}, 'M.merge(nil, nil) should return an empty table')
+
+assert_eq(U.merge(nil, {a = 1}), {a = 1}, 'M.merge(nil, {a = 1}) should return {a = 1}')
+assert_eq(U.merge({a = 1}, nil), {a = 1}, 'M.merge({a = 1}, nil) should return {a = 1}')
+
+assert_eq(U.merge({a = 1, b = 3}, {b = 2, c = 4}), {a = 1, b = 2, c = 4}, 'M.merge({a = 1, b = 3}, {b = 2, c = 4}) should return {a = 1, b = 2, c = 4}')
+
 -- hex_to_rgb
 assert_eq({ U.hex_to_rgb('#191D24') }, {25, 29, 36}, 'M.hex_to_rgb("#191D24") should return 25, 29, 36')
 

diff --git a/lua/nordic/utils.lua b/lua/nordic/utils.lua
@@ -22,9 +22,9 @@ end
 function M.merge(table1, table2)
     if table1 == table2 == nil then return {} end
     if table1 == nil then
-        return table2
+        return table2 or {}
     elseif table2 == nil then
-        return table1
+        return table1 or {}
     end
     return vim.tbl_deep_extend('force', table1, table2)
 end