Merge pull request #2 from aintgoin2goa/map

add nested array to map

Author: sayjava

src/engine/matchers/map.test.ts

@@ -3,19 +3,19 @@ import matcher from './map';
 test('return true if expected keys are empty', () => {
     const result = matcher({}, { name: 'apple client' });
 
-    expect(result).toMatchInlineSnapshot(`true`);
+    expect(result).toBe(true);
 });
 
 test("don't match missing keys", () => {
     const result = matcher({ job: 'manager' }, { name: 'apple client' });
 
-    expect(result).toBeFalsy();
+    expect(result).toBe(false);
 });
 
 test('match values', () => {
     const result = matcher({ job: 'manager' }, { name: 'apple client', job: 'manager' });
 
-    expect(result).toMatchInlineSnapshot(`true`);
+    expect(result).toBe(true);
 });
 
 test("don't match unequal values", () => {
@@ -24,7 +24,7 @@ test("don't match unequal values", () => {
         { name: 'apple client', job: 'manager', role: 'mentor', id: 1 },
     );
 
-    expect(result).toMatchInlineSnapshot(`false`);
+    expect(result).toBe(false);
 });
 
 test('match regex values', () => {
@@ -33,7 +33,7 @@ test('match regex values', () => {
         { name: 'apple client', job: 'manager', role: 'mentor', id: 1 },
     );
 
-    expect(result).toMatchInlineSnapshot(`true`);
+    expect(result).toBe(true);
 });
 
 test("don't match regex values", () => {
@@ -42,5 +42,31 @@ test("don't match regex values", () => {
         { name: 'apple client', job: 'manager', role: 'mentor', id: 1 },
     );
 
-    expect(result).toMatchInlineSnapshot(`false`);
+    expect(result).toBe(false);
+});
+
+describe('Nested data', () => {
+    type AnyObject = { [key: string]: any };
+    type TestCase = [testName: string, expected: AnyObject, actual: AnyObject, expectedResult: boolean];
+    const testCases: TestCase[] = [
+        [
+            'match nested arrays',
+            { jobs: ['manager', 'salesperson', 'dogcatcher'] },
+            { jobs: ['manager', 'salesperson', 'dogcatcher'], name: 'Roni' },
+            true,
+        ],
+        [
+            "don't match nested arrays",
+            { jobs: ['manager', 'salesperson', 'dogcatcher'] },
+            { jobs: ['manager', 'salesperson'], name: 'Roni' },
+            false,
+        ],
+        ["don't match nested arrays to strings", { jobs: 'manager' }, { jobs: ['manager'], name: 'Roni' }, false],
+        ["don't match string to nested arrays", { jobs: ['manager'] }, { jobs: 'manager', name: 'Roni' }, false],
+    ];
+
+    test.each(testCases)('%s', (_: string, expected, actual, expectedResult) => {
+        const result = matcher(expected, actual);
+        expect(result).toEqual(expectedResult);
+    });
 });

src/engine/matchers/map.ts

@@ -11,7 +11,7 @@ export const matchKeys = (expected: { [key: string]: any }, actual: { [key: stri
     return true;
 };
 
-export default (expected: { [key: string]: any }, actual: { [key: string]: any }): boolean => {
+const map = (expected: { [key: string]: any }, actual: { [key: string]: any }): boolean => {
     if (Object.keys(expected).length === 0) {
         return true;
     }
@@ -33,6 +33,9 @@ export default (expected: { [key: string]: any }, actual: { [key: string]: any }
 
             // Match Values
             const nonMatchingValue = Object.entries(expected).some(([key, expValue]) => {
+                if (typeof expValue === 'object' || typeof actual[key] === 'object') {
+                    return !map(expValue, actual[key]);
+                }
                 return !stringMatcher(actual[key], expValue);
             });
 
@@ -42,3 +45,5 @@ export default (expected: { [key: string]: any }, actual: { [key: string]: any }
         return e;
     }
 };
+
+export default map;