Fix unit tests

arhea · Sep 18, 2018 · 3050336 · 3050336
1 parent 8001bda
commit 3050336
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 12 deletions.
diff --git a/lib/docker.js b/lib/docker.js
@@ -40,7 +40,7 @@ class DockerClient {
 
     options = options || {};
 
-    return self._validate(options, schemas.auth.options).then((params) => {
+    return self._validate(options, schemas.auth).then((params) => {
       return self.modem.post({
         url: '/auth',
         body: params,

diff --git a/test/images/inspect.js b/test/images/inspect.js
@@ -1,5 +1,6 @@
 'use strict';
 
+const Code    = require('code');
 const Lab     = require('lab');
 const harness = require('../harness');
 
@@ -13,9 +14,14 @@ lab.experiment('images - inspect', () => {
       .get('/images/hello-world/json')
       .reply(200, {});
 
-    const req = harness.client.images().inspect('hello-world');
-
-    harness.handleSuccess(scope, 200, req, done);
+    harness.client.images().inspect('hello-world').then(() => {
+      Code.expect(scope.isDone()).to.equal(true);
+    }, () => {
+      Code.fail('should be a 200 response');
+    }).finally(() => {
+      harness.clean();
+      done();
+    });
 
   });
 

diff --git a/test/images/list.js b/test/images/list.js
@@ -1,5 +1,6 @@
 'use strict';
 
+const Code    = require('code');
 const Lab     = require('lab');
 const harness = require('../harness');
 
@@ -11,11 +12,17 @@ lab.experiment('images - list', () => {
 
     const scope = harness.mock()
       .get('/images/json')
+      .query({all: false, digest: false})
       .reply(200, {});
 
-    const req = harness.client.images().list();
-
-    harness.handleSuccess(scope, 200, req, done);
+    harness.client.images().list().then(() => {
+      Code.expect(scope.isDone()).to.equal(true);
+    }, () => {
+      Code.fail('should be a 200 response');
+    }).finally(() => {
+      harness.clean();
+      done();
+    });
 
   });
 

diff --git a/test/images/search.js b/test/images/search.js
@@ -1,5 +1,6 @@
 'use strict';
 
+const Code    = require('code');
 const Lab     = require('lab');
 const harness = require('../harness');
 
@@ -11,15 +12,18 @@ lab.experiment('images - search', () => {
 
     const scope = harness.mock()
       .get('/images/search')
-      .query({ term: 'hello-world' })
+      .query({term: 'hello-world'})
       .reply(200, {});
 
-    const req = harness.client.images().search({
-      term: 'hello-world'
+    harness.client.images().search({term: 'hello-world'}).then(() => {
+      Code.expect(scope.isDone()).to.equal(true);
+    }, () => {
+      Code.fail('should be a 200 response');
+    }).finally(() => {
+      harness.clean();
+      done();
     });
 
-    harness.handleSuccess(scope, 200, req, done);
-
   });
 
 });