add tests for objectsEqual

aws-amplify · Feb 21, 2021 · 6a22b59 · 6a22b59
1 parent 5b4d42a
commit 6a22b59
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 6 deletions.
diff --git a/packages/datastore/__tests__/outbox.test.ts b/packages/datastore/__tests__/outbox.test.ts
@@ -31,7 +31,6 @@ describe('Outbox tests', () => {
 	let modelId: string;
 
 	beforeAll(async () => {
-		// jest.resetModules();
 		jest.resetAllMocks();
 
 		await initializeOutbox();

diff --git a/packages/datastore/__tests__/util.test.ts b/packages/datastore/__tests__/util.test.ts
@@ -1,4 +1,5 @@
 import {
+	objectsEqual,
 	isAWSDate,
 	isAWSDateTime,
 	isAWSEmail,
@@ -11,6 +12,36 @@ import {
 } from '../src/util';
 
 describe('datastore util', () => {
+	test('objectsEqual', () => {
+		expect(objectsEqual({}, {})).toEqual(true);
+		expect(objectsEqual([], [])).toEqual(true);
+		expect(objectsEqual([], {})).toEqual(false);
+		expect(objectsEqual([1, 2, 3], [1, 2, 3])).toEqual(true);
+		expect(objectsEqual([1, 2, 3], [1, 2, 3, 4])).toEqual(false);
+		expect(objectsEqual({ a: 1 }, { a: 1 })).toEqual(true);
+		expect(objectsEqual({ a: 1 }, { a: 2 })).toEqual(false);
+		expect(
+			objectsEqual({ a: [{ b: 2 }, { c: 3 }] }, { a: [{ b: 2 }, { c: 3 }] })
+		).toEqual(true);
+		expect(
+			objectsEqual({ a: [{ b: 2 }, { c: 3 }] }, { a: [{ b: 2 }, { c: 4 }] })
+		).toEqual(false);
+		expect(objectsEqual(new Set([1, 2, 3]), new Set([1, 2, 3]))).toEqual(true);
+		expect(objectsEqual(new Set([1, 2, 3]), new Set([1, 2, 3, 4]))).toEqual(
+			false
+		);
+
+		const map1 = new Map();
+		map1.set('a', 1);
+
+		const map2 = new Map();
+		map2.set('a', 1);
+
+		expect(objectsEqual(map1, map2)).toEqual(true);
+		map2.set('b', 2);
+		expect(objectsEqual(map1, map2)).toEqual(false);
+	});
+
 	test('isAWSDate', () => {
 		const valid = [
 			'2020-01-01',

diff --git a/packages/datastore/package.json b/packages/datastore/package.json
@@ -68,7 +68,7 @@
 						"es2015",
 						"dom",
 						"esnext.asynciterable",
-						"es2017.object"
+						"es2019.object"
 					],
 					"allowJs": true,
 					"esModuleInterop": true,

diff --git a/packages/datastore/src/util.ts b/packages/datastore/src/util.ts
@@ -440,15 +440,19 @@ export function objectsEqual(objA: object, objB: object): boolean {
 	let a = objA;
 	let b = objB;
 
+	if (Array.isArray(a) && !Array.isArray(b)) {
+		return false;
+	}
+
 	if (a instanceof Set && b instanceof Set) {
 		a = [...a];
 		b = [...b];
 	}
 
-	// if (a instanceof Map && b instanceof Map) {
-	// 	a = Object.fromEntries(a);
-	// 	b = Object.fromEntries(b);
-	// }
+	if (a instanceof Map && b instanceof Map) {
+		a = Object.fromEntries(a);
+		b = Object.fromEntries(b);
+	}
 
 	const aKeys = Object.keys(a);
 	const bKeys = Object.keys(b);