fix: 🐛 the right error for wrong location

Inist-CNRS · Jan 5, 2022 · 1337817 · 1337817
1 parent 22e1005
commit 1337817
Show file tree

Hide file tree

Showing 4 changed files with 80 additions and 7 deletions.
diff --git a/packages/analytics/src/combine.js b/packages/analytics/src/combine.js
@@ -147,7 +147,9 @@ export default function combine(data, feed) {
             return feed.send(data);
         })
         .catch((e) => {
-            this.store.close();
+            if (this.store) {
+                this.store.close();
+            }
             feed.stop(e);
         });
 }
diff --git a/packages/analytics/src/expand.js b/packages/analytics/src/expand.js
@@ -183,7 +183,9 @@ export default async function expand(data, feed) {
         }
         return feed.end();
     } catch (e) {
-        this.store.close();
+        if (this.store) {
+            this.store.close();
+        }
         return feed.stop(e);
     }
 }
diff --git a/packages/analytics/test/combine.js b/packages/analytics/test/combine.js
@@ -340,4 +340,40 @@ describe('no combine', () => {
                 done(new Error('Error is the right behavior'));
             });
     });
+    test('with wrong location', (done) => {
+        ezs.use(statements);
+        const input = [
+            { a: 1, b: 'a' },
+            { a: 2, b: 'b' },
+            { a: 3, b: 'c' },
+            { a: 4, b: 'd' },
+            { a: 5, b: 'e' },
+            { a: 6, b: 'f' },
+        ];
+        const script = `
+            [use]
+            plugin = analytics
+
+            [replace]
+            path = value
+            value = fix({id:'a', value:'aa'},{id:'b', value:'bb'},{id:'c', value:'cc'},{id:'d', value:'dd'},{id:'e', value:'ee'},{id:'f', value:'ff'})
+
+            [exploding]
+            [value]
+        `;
+
+        from(input)
+            .pipe(ezs('combine', { path: 'b', script, location: '/no/where' }))
+            .pipe(ezs.catch())
+            .on('error', (e) => {
+                expect(e.message).toEqual(expect.stringContaining('EACCES: permission denied'));
+                done();
+            })
+            .on('data', () => {
+                done(new Error('Error is the right behavior'));
+            })
+            .on('end', () => {
+                done(new Error('Error is the right behavior'));
+        });
+    });
 });
diff --git a/packages/analytics/test/expand.js b/packages/analytics/test/expand.js
@@ -211,7 +211,7 @@ test('with error script', (done) => {
         .pipe(ezs.catch())
         .on('error', (e) => {
             fs.unlinkSync(filename);
-            expect(e).toEqual(expect.not.stringContaining('permission denied'));
+            expect(e.message).toEqual(expect.stringContaining('permission denied'));
             done();
         })
         .on('end', () => {
@@ -233,7 +233,7 @@ test('with no script', (done) => {
         .pipe(ezs('expand', { path: 'b' }))
         .pipe(ezs.catch())
         .on('error', (e) => {
-            expect(e).toEqual(expect.not.stringContaining('Invalid parmeter'));
+            expect(e.message).toEqual(expect.stringContaining('Invalid parmeter'));
             done();
         })
         .on('data', () => {
@@ -243,6 +243,39 @@ test('with no script', (done) => {
             done(new Error('Error is the right behavior'));
         });
 });
+test('with wrong location ', (done) => {
+    ezs.use(statements);
+    const input = [
+        { a: 1, b: 'a' },
+        { a: 2, b: 'b' },
+        { a: 3, b: 'c' },
+        { a: 4, b: 'd' },
+        { a: 5, b: 'e' },
+        { a: 6, b: 'f' },
+    ];
+    const script = `
+            [use]
+            plugin = analytics
+
+            [assign]
+            path = value
+            value = get('value').toUpper()
+        `;
+    from(input)
+        .pipe(ezs('expand', { path: 'b', script, location: '/no/where' }))
+        .pipe(ezs.catch())
+        .on('error', (e) => {
+            expect(e.message).toEqual(expect.stringContaining('EACCES: permission denied'));
+            done();
+        })
+        .on('data', () => {
+            done(new Error('Error is the right behavior'));
+        })
+        .on('end', () => {
+            done(new Error('Error is the right behavior'));
+        });
+});
+
 test('with no path', (done) => {
     ezs.use(statements);
     const input = [
@@ -387,7 +420,7 @@ test('with a script that loses the identifier', (done) => {
         .pipe(ezs('expand', { path: 'b', script }))
         .pipe(ezs.catch())
         .on('error', (e) => {
-            expect(e).toEqual(expect.not.stringContaining('key cannot be `null`'));
+            expect(e.message).toEqual(expect.stringContaining('key cannot be `null`'));
             done();
         })
         .on('end', () => {
@@ -421,7 +454,7 @@ test('with a script that break the identifier #1', (done) => {
         })
         .on('error', (e) => {
             expect(output.length).toEqual(0);
-            expect(e).toEqual(expect.not.stringContaining('id was corrupted'));
+            expect(e.message).toEqual(expect.stringContaining('id was corrupted'));
             done();
         })
         .on('end', () => {
@@ -458,7 +491,7 @@ test('with a script that break the identifier #2', (done) => {
         })
         .on('error', (e) => {
             expect(output.length).toEqual(1);
-            expect(e).toEqual(expect.not.stringContaining('id was corrupted'));
+            expect(e.message).toEqual(expect.stringContaining('id was corrupted'));
             done();
         })
         .on('end', () => {