Merge branch 'develop' into newControllerStructure

Author: scottinet

test/kuzzle/constructor.test.js

@@ -212,23 +212,9 @@ describe('Kuzzle constructor', () => {
     });
 
     it('should throw an error if no URL is provided', () => {
-      try {
+      should(() => {
         new Kuzzle();
-        should.fail('success', 'failure', 'Constructor should fail with no URL provided', '');
-      }
-      catch (e) {
-        // done
-      }
-    });
-
-    it('should throw an error if no index is provied', () => {
-      try {
-        new Kuzzle('foo');
-        should.fail('success', 'failure', 'Constructor should fail with no Index provided', '');
-      }
-      catch (e) {
-        // done
-      }
+      }).throw();
     });
 
     describe('#connect', function () {

test/kuzzle/listenersManagement.test.js

@@ -35,23 +35,15 @@ describe('Listeners management', () => {
     });
 
     it('should throw an error if trying to adding a listener to an unknown event', function () {
-      try {
+      should(() => {
         kuzzle.addListener('foo', function () {});
-        should.fail('success', 'failure', 'Should have failed to add a listener to unknown event "foo"', '');
-      }
-      catch (e) {
-        // done
-      }
+      }).throw();
     });
 
     it('should throw an error when providing a non-function listener argument', function () {
-      try {
+      should(() => {
         kuzzle.addListener('connected', 'bar');
-        should.fail('success', 'failure', 'Should have failed to add a string listener', '');
-      }
-      catch (e) {
-        // done
-      }
+      }).throw();
     });
   });