fixed some tests

Author: jenow

test/Auth/methods.test.js

@@ -5,7 +5,7 @@ const
 	User = require('../../src/security/User.js'),
 	Security = require('../../src/security/Security.js');
 
-describe.only('Kuzzle Auth controller', function () {
+describe('Kuzzle Auth controller', function () {
 	let
 		auth,
 		kuzzle;

test/kuzzle/login.test.js

@@ -263,46 +263,6 @@ describe('Kuzzle methods', function () {
     });
   });
 
-  describe('#getMyRights', function() {
-    it('should trigger callback with an error', function (done) {
-      var
-        cberror = {message: 'i am an error'},
-        spy = sandbox.stub(kuzzle, 'query').yields(cberror),
-        args;
-
-      kuzzle.getMyRights(function (err) {
-        should(err).be.exactly(cberror);
-        args = spy.firstCall.args;
-
-        should(spy).be.calledOnce();
-
-        should(args[0].controller).be.exactly('auth');
-        should(args[0].action).be.exactly('getMyRights');
-        should(args[2]).be.exactly(null);
-        done();
-      });
-    });
-
-    it('should call query with right arguments', function (done) {
-      var
-        doc = {_id: '42'},
-        spy = sandbox.stub(kuzzle, 'query').yields(null, {result: {hits: [doc]}}),
-        args;
-
-      kuzzle.getMyRights(function (err, res) {
-        should(res).be.an.Array().and.containEql(doc);
-        args = spy.firstCall.args;
-
-        should(spy).be.calledOnce();
-
-        should(args[0].controller).be.exactly('auth');
-        should(args[0].action).be.exactly('getMyRights');
-        should(args[2]).be.exactly(null);
-        done();
-      });
-    });
-  });
-
   describe('#getServerInfo', function () {
     var expectedQuery = {
       controller: 'server',

test/kuzzle/methods.test.js

@@ -25,7 +25,8 @@ describe('Kuzzle query management', function () {
       });
 
       kuzzle = new Kuzzle('foo');
-    });
+			kuzzle.network.query.resolves({result:{}});
+		});
 
     it('should generate a valid request object with no "options" argument and no callback', function () {
       kuzzle.query(queryArgs, queryBody);
@@ -56,9 +57,7 @@ describe('Kuzzle query management', function () {
     });
 
     it('should manage arguments properly if no options are provided', function () {
-      var cb = sinon.stub();
-
-      kuzzle.query(queryArgs, queryBody, cb);
+      kuzzle.query(queryArgs, queryBody);
       should(kuzzle.network.query).be.calledOnce();
       should(kuzzle.network.query).be.calledWith({
         action: 'action',
@@ -68,13 +67,11 @@ describe('Kuzzle query management', function () {
         index: 'index',
         volatile: { sdkInstanceId: kuzzle.network.id, sdkVersion: kuzzle.sdkVersion },
         requestId: sinon.match(/^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i)
-      }, null, sinon.match(function(f) {return f === cb;}));
+      });
     });
 
     it('should manage arguments properly if empty query and no options are provided', function () {
-      var cb = sinon.stub();
-
-      kuzzle.query(queryArgs, cb);
+      kuzzle.query(queryArgs);
       should(kuzzle.network.query).be.calledOnce();
       should(kuzzle.network.query).be.calledWith({
         action: 'action',
@@ -83,7 +80,7 @@ describe('Kuzzle query management', function () {
         index: 'index',
         volatile: { sdkInstanceId: kuzzle.network.id, sdkVersion: kuzzle.sdkVersion },
         requestId: sinon.match(/^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i)
-      }, null, sinon.match(function(f) {return f === cb;}));
+      });
     });
 
     it('should not define optional members if none was provided', function () {
@@ -92,10 +89,10 @@ describe('Kuzzle query management', function () {
       should(kuzzle.network.query).be.calledWithMatch({index: undefined});
     });
 
-    it('should invoke the callback with an error if no query is provided', function () {
-      should(function () { kuzzle.query(queryArgs, ['foo', 'bar']); }).throw(Error);
-      should(function () { kuzzle.query(queryArgs); }).throw(Error);
-      should(function () { kuzzle.query(queryArgs, 'foobar'); }).throw(Error);
+    it('should reject if no query is provided', function () {
+      should(kuzzle.query(queryArgs, ['foo', 'bar'])).be.rejected();
+      should(kuzzle.query(queryArgs)).be.rejected();
+      should(kuzzle.query(queryArgs, 'foobar')).be.rejected();
     });
 
     it('should handle options "volatile" properly', function () {

test/kuzzle/query.test.js

@@ -16,7 +16,6 @@ function KuzzleMock () {
   this.security = new Security(this);
   this.setJwt = sinon.stub();
   this.unsetJwt = sinon.stub();
-  this.emit = sinon.stub();
 
   this.callbackRequired = function (errorMessagePrefix, callback) {
     if (!callback || typeof callback !== 'function') {