Merge pull request #96 from kuzzleio/fix-develop-95-empty-mapping

fix #95: handle empty mappings

Author: David Bengsch

src/kuzzleDataMapping.js

@@ -111,6 +111,11 @@ KuzzleDataMapping.prototype.refresh = function (options, cb) {
     if (res.result[self.collection.index]) {
       if (res.result[self.collection.index].mappings[self.collection.collection]) {
         self.mapping = res.result[self.collection.index].mappings[self.collection.collection].properties;
+
+        // Mappings can be empty. The mapping property should never be "undefined"
+        if (self.mapping === undefined) {
+          self.mapping = {};
+        }
       } else {
         return cb ? cb(new Error('No mapping found for collection ' + self.collection.collection)) : false;
       }

test/kuzzleDataMapping/methods.test.js

@@ -236,6 +236,20 @@ describe('KuzzleDataMapping methods', function () {
         done();
       });
     });
+
+    it('should return an empty mapping if the stored mapping is empty', done => {
+      var mapping = new KuzzleDataMapping(dataCollection);
+
+      result = { result: {bar: { mappings: { foo: {}}}}};
+
+      mapping.refresh((err, res) => {
+        should(emitted).be.true();
+        should(err).be.null();
+        should(res).be.exactly(mapping);
+        should(res.mapping).be.empty().and.not.be.undefined();
+        done();
+      });
+    });
   });
 
   describe('#set', function () {