From e503f8c094352f5020a2a99881cdb38f68213dac Mon Sep 17 00:00:00 2001
From: maccyber <jonas.enge@gmail.com>
Date: Sat, 5 Nov 2016 14:20:21 +0100
Subject: [PATCH] Fixed tests

---
 lib/dockerhub-callback.js       | 15 +++++++------
 lib/run-script.js               |  7 ++-----
 test/test-dockerhub-callback.js |  2 +-
 test/test-hook-action.js        | 37 +++++++++++++++++++++++++++++++++
 4 files changed, 47 insertions(+), 14 deletions(-)

diff --git a/lib/dockerhub-callback.js b/lib/dockerhub-callback.js
index f3c5bca..8149dc1 100644
--- a/lib/dockerhub-callback.js
+++ b/lib/dockerhub-callback.js
@@ -24,15 +24,14 @@ module.exports = (options, callback) => {
   http(httpOptions, (err, response, body) => {
     if (err) {
       return callback(err)
-    } else if (response.statusCode !== 200) {
-      return callback(`Callback URL returned: ${body}`)
+    } else {
+      const message = {
+        code: response.statusCode,
+        response: body,
+        text: `Callback sent to ${options.callbackUrl}`
+      }
+      return callback(null, message)
     }
-    const message = {
-      code: response.statusCode,
-      response: body,
-      text: `Callback successfully sent to ${options.callbackUrl}`
-    }
-    return callback(null, message)
   })
 }
 
diff --git a/lib/run-script.js b/lib/run-script.js
index 94f4577..67fd65e 100644
--- a/lib/run-script.js
+++ b/lib/run-script.js
@@ -22,10 +22,7 @@ module.exports = (options, callback) => {
       options.state = 'error'
     }
     const result = err || stderr || stdout
-    if (result) {
-      options.description = result.substring(0, 200)
-      return callback(null, { options: options, result: result })
-    }
-    return callback(null, true)
+    options.description = result.substring(0, 200)
+    return callback(null, { options: options, result: result })
   })
 }
diff --git a/test/test-dockerhub-callback.js b/test/test-dockerhub-callback.js
index 2237b2f..aafc05c 100644
--- a/test/test-dockerhub-callback.js
+++ b/test/test-dockerhub-callback.js
@@ -37,7 +37,7 @@ tap.test('dockerhubCallback', (t) => {
     if (err) {
       throw err
     }
-    t.equal(data.text, `Callback successfully sent to ${options.callbackUrl}`, 'dockerhubCallback ok')
+    t.equal(data.text, `Callback sent to ${options.callbackUrl}`, 'dockerhubCallback ok')
     t.equal(data.response.test, 'ok', 'dockerhubCallback response ok')
     t.end()
   })
diff --git a/test/test-hook-action.js b/test/test-hook-action.js
index c2f2a83..84dcc4c 100644
--- a/test/test-hook-action.js
+++ b/test/test-hook-action.js
@@ -29,3 +29,40 @@ tap.test('hookAction missing options.script', (t) => {
   })
 })
 
+tap.test('hookAction script do not exist', (t) => {
+  const options = {
+    callbackUrl: 'wrongurl',
+    script: 'dengalevandrer'
+  }
+  hookAction(options, (err) => {
+    t.match(err, 'does not exist', 'runScript script do not exist ok')
+    t.end()
+  })
+})
+
+tap.test('hookAction dockerhubCallback fail', (t) => {
+  const options = {
+    callbackUrl: 'wrongurl',
+    script: 'hello.sh'
+  }
+  hookAction(options, (err) => {
+    t.equal(err.message, `Invalid URI "${options.callbackUrl}"`, 'Wrong URL ok')
+    t.end()
+  })
+})
+
+tap.test('hookAction ok', (t) => {
+  const options = {
+    callbackUrl: 'https://maccyber.io/api/test',
+    script: 'hello.sh'
+  }
+  hookAction(options, (err, data) => {
+    if (err) {
+      throw err
+    }
+    t.equal(data.callback, `Callback sent to ${options.callbackUrl}`, 'hookAction dockerhubCallback ok')
+    t.equal(data.script, 'Running dummy script\n', 'hookAction script ok')
+    t.end()
+  })
+})
+