Merge pull request #2261 from tritao/fix-table-merge

Add tests for `table.merge`.

Author: samsinsane

tests/base/test_table.lua

@@ -95,3 +95,17 @@
 		test.istrue(t[4] == 5)
 		test.istrue(t[5] == 8)
 	end
+
+--
+-- table.merge() tests
+--
+
+function suite.merge()
+	t = { a = 1, b = 2 }
+	t2 = { c = 3, d = 4 }
+	test.isequal({ a = 1, b = 2, c = 3, d = 4 }, table.merge(t, t2))
+
+	t = { a = 1, b = 2 }
+	t2 = { c = 3, d = 4, e = { a = 5 } }
+	test.isequal({ a = 1, b = 2, c = 3, d = 4, e = { a = 5 } }, table.merge(t, t2))
+end

website/docs/table.join.md

@@ -19,3 +19,6 @@ A new array containing all of the values in order.
 
 Premake 5.0 or later.
 
+### See Also ###
+
+* [table.merge](table.merge.md)

website/docs/table.merge.md

@@ -18,3 +18,6 @@ A new table containing the key-value pairs from each input table, from first to
 
 Premake 5.0 or later.
 
+### See Also ###
+
+* [table.join](table.join.md)