minor tests fix

afontainec · Feb 14, 2020 · 97c5ec3 · 97c5ec3
1 parent 135a3d6
commit 97c5ec3
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 6 deletions.
diff --git a/models/access.js b/models/access.js
@@ -76,10 +76,11 @@ const filterEveryElement = (search, key, validIds) => {
   validIds = validIds || [];
   const [, array] = search[key];
   const result = [];
+  console.log({ validIds });
+  console.log({ array });
   for (let i = 0; i < array.length; i++) {
     const element = array[i];
-    if (validIds.includes(element)) result.push(element);
-
+    if (validIds.includes(element.toString())) result.push(element);
   }
   return ['in', result];
 };

diff --git a/test/models/access/addAccessibleToSearch.js b/test/models/access/addAccessibleToSearch.js
@@ -39,7 +39,7 @@ describe('MODELS: Access addAccessibleToSearch', () => { // eslint-disable-line
 
   it('search has key defined and is not in array', (done) => { // eslint-disable-line
     let search = { place_id: 23 };
-    const access = [{ role: 'venueOwner', filter: 1 }, { role: 'venueOwner', filter: 2 }];
+    const access = [{ role: 'venueOwner', filter: '1' }, { role: 'venueOwner', filter: '2' }];
     const tableName = 'places';
     const key = 'place_id';
     const expected = { place_id: ['in', []] };
@@ -50,7 +50,7 @@ describe('MODELS: Access addAccessibleToSearch', () => { // eslint-disable-line
 
   it('search has key defined as [in, [...]]', (done) => { // eslint-disable-line
     let search = { place_id: ['in', [1, 2, 3]] };
-    const access = [{ role: 'venueOwner', filter: 1 }, { role: 'venueOwner', filter: 2 }];
+    const access = [{ role: 'venueOwner', filter: '1' }, { role: 'venueOwner', filter: '2' }];
     const tableName = 'places';
     const key = 'place_id';
     const expected = { place_id: ['in', [1, 2]] };

diff --git a/test/models/access/filterEveryElement.js b/test/models/access/filterEveryElement.js
@@ -51,15 +51,26 @@ describe('MODELS: ACCESS searchingInArray', () => { // eslint-disable-line
     done();
   });
 
-  it('Happy path ', (done) => { // eslint-disable-line
+  it('Happy path: search are ints ', (done) => { // eslint-disable-line
     const search = {
       key: ['in', [1, 2, 3]],
     };
-    const validIds = [1, 2, 4, 5, 6];
+    const validIds = ['1', '2', '4', '5', '6'];
     const expected = ['in', [1, 2]];
     const result = Access.filterEveryElement(search, 'key', validIds);
     assert.deepEqual(result, expected);
     done();
   });
 
+  it('Happy path: search are strings ', (done) => { // eslint-disable-line
+    const search = {
+      key: ['in', ['1', '2', '3']],
+    };
+    const validIds = ['1', '2', '4', '5', '6'];
+    const expected = ['in', ['1', '2']];
+    const result = Access.filterEveryElement(search, 'key', validIds);
+    assert.deepEqual(result, expected);
+    done();
+  });
+
 });