Merge branch 'develop' into fix-rc-73-paginate-fetchAll

Author: jenow

src/kuzzle.js

@@ -884,16 +884,19 @@ Kuzzle.prototype.dataCollectionFactory = function(index, collection) {
     collection = arguments[0];
     index = this.defaultIndex;
   }
-  else if (arguments.length === 2 && typeof collection === 'object') {
-    headers = collection;
-    collection = index;
-    index = this.defaultIndex;
-  }
 
   if (!index) {
     throw new Error('Unable to create a new data collection object: no index specified');
   }
 
+  if (typeof index !== 'string') {
+    throw new Error('Invalid "index" argument: string expected, got ' + typeof index);
+  }
+
+  if (typeof collection !== 'string') {
+    throw new Error('Invalid "collection" argument: string expected, got ' + typeof collection);
+  }
+
   if (!this.collections[index]) {
     this.collections[index] = {};
   }

test/kuzzle/methods.test.js

@@ -178,6 +178,23 @@ describe('Kuzzle methods', function () {
       kuzzle = new Kuzzle('foo');
     });
 
+    it('should throw an error if arguments are not strings', () => {
+      kuzzle.defaultIndex = 'foobar';
+      should(function () { kuzzle.dataCollectionFactory(undefined); }).throw(/string expected/);
+      should(function () { kuzzle.dataCollectionFactory('foo', undefined); }).throw(/string expected/);
+      should(function () { kuzzle.dataCollectionFactory(null); }).throw(/string expected/);
+      should(function () { kuzzle.dataCollectionFactory('foo', null); }).throw(/string expected/);
+      should(function () { kuzzle.dataCollectionFactory(123); }).throw(/string expected/);
+      should(function () { kuzzle.dataCollectionFactory(123, 'foo'); }).throw(/string expected/);
+      should(function () { kuzzle.dataCollectionFactory('foo', 123); }).throw(/string expected/);
+      should(function () { kuzzle.dataCollectionFactory({foo: 'bar'}); }).throw(/string expected/);
+      should(function () { kuzzle.dataCollectionFactory({foo: 'bar'}, 'foo'); }).throw(/string expected/);
+      should(function () { kuzzle.dataCollectionFactory('foo', {foo: 'bar'}); }).throw(/string expected/);
+      should(function () { kuzzle.dataCollectionFactory(['bar']); }).throw(/string expected/);
+      should(function () { kuzzle.dataCollectionFactory('foo', ['bar']); }).throw(/string expected/);
+      should(function () { kuzzle.dataCollectionFactory(['bar'], 'foo'); }).throw(/string expected/);
+    });
+
     it('should throw an error if the kuzzle instance has been invalidated', function () {
       kuzzle.disconnect();
       should(function () { kuzzle.dataCollectionFactory('foo'); }).throw(Error);
@@ -204,10 +221,6 @@ describe('Kuzzle methods', function () {
       collection = kuzzle.dataCollectionFactory('foo');
       should(collection).be.instanceof(KuzzleDataCollection);
       should(collection.index).be.eql(defaultIndex);
-
-      collection = kuzzle.dataCollectionFactory('foo', {some: 'headers'});
-      should(collection).be.instanceof(KuzzleDataCollection);
-      should(collection.index).be.eql(defaultIndex);
     });
 
     it('should throw an error if no index is provided and no default index has been set', function (done) {