test(marshalls): fix baseMarshall unit tests (lirantal#28)

jackingpanda · Apr 19, 2018 · 578cba5 · 578cba5
1 parent d41f0b6
commit 578cba5
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 20 deletions.
diff --git a/__tests__/marshalls.base.test.js b/__tests__/marshalls.base.test.js
@@ -22,18 +22,18 @@ test('checkPackage returns validation data if it was a success', async () => {
     }
   }
 
-  testMarshall.checkPackage('express', ctx, {})
-  .then(data => {
-    expect(data).toEqual('validation-result')
-  })
+  const result = await testMarshall.checkPackage('express', ctx, {})
+  expect(result).toEqual('validation-result')
 })
 
 test('checkPackage sets the error property if the validaiton failed', async () => {
   const testMarshall = new TestMarshall({
     packageRepoUtils: null
   })
 
-  const pkg = 'trojan'
+  const pkg = {
+    packageString: 'trojan'
+  }
   const ctx = {
     marshalls: {
       [TEST_MARSHALL_NAME]: {
@@ -43,10 +43,8 @@ test('checkPackage sets the error property if the validaiton failed', async () =
   }
 
   testMarshall.init(ctx)
-  testMarshall.checkPackage(pkg, ctx, {})
-    .then(data => {
-      expect(ctx.marshalls[TEST_MARSHALL_NAME].errors[0].pkg).toEqual(pkg)
-    })
+  await testMarshall.checkPackage(pkg, ctx, {})
+  expect(ctx.marshalls[TEST_MARSHALL_NAME].errors[0].pkg).toEqual(pkg.packageString)
 })
 
 test('base marshall implemented isEnabled', async () => {

diff --git a/lib/marshalls/baseMarshall.js b/lib/marshalls/baseMarshall.js
@@ -26,19 +26,19 @@ class BaseMarshall {
 
   checkPackage (pkg, ctx, task) {
     return this.validate(pkg)
-    .then(data => {
-      task.output = `querying ${pkg.packageString}...`
-      ctx.marshalls[this.name].data[pkg.packageString] = data
+      .then(data => {
+        task.output = `querying ${pkg.packageString}...`
+        ctx.marshalls[this.name].data[pkg.packageString] = data
 
-      // not explicitly required, but a task can return its results
-      return data
-    })
-    .catch(err => {
-      this.setError({
-        pkg: pkg.packageString,
-        message: err.message
+        // not explicitly required, but a task can return its results
+        return data
+      })
+      .catch(err => {
+        this.setError({
+          pkg: pkg.packageString,
+          message: err.message
+        })
       })
-    })
   }
 
   isEnabled (ctx) {