Ma/oasis 1484 (#92)

* filter out undefined values

* cleaned into one function, fixed tests

* generalize tests

Author: mauerbac

lib/optimizely/index.js

@@ -128,7 +128,7 @@ Optimizely.prototype.activate = function(experimentKey, userId, attributes) {
     var experimentId = projectConfig.getExperimentId(this.configObj, experimentKey);
 
     // remove null values from attributes
-    attributes = this.__filterAttributes(attributes);
+    attributes = this.__filterEmptyValues(attributes);
 
     var impressionEventOptions = {
       attributes: attributes,
@@ -200,8 +200,8 @@ Optimizely.prototype.track = function(eventKey, userId, attributes, eventTags) {
     }
 
     // remove null values from attributes and eventTags
-    attributes = this.__filterAttributes(attributes);
-    eventTags = this.__filterEventTags(eventTags);
+    attributes = this.__filterEmptyValues(attributes);
+    eventTags = this.__filterEmptyValues(eventTags);
 
     var conversionEventOptions = {
       attributes: attributes,
@@ -400,31 +400,17 @@ Optimizely.prototype.__dispatchEvent = function (eventToDispatch, callback) {
 }
 
 /**
- * Filters out attributes with null values
- * @param  attributes
- * @returns {Object} attributes
+ * Filters out attributes/eventTags with null or undefined values
+ * @param  map
+ * @returns {Object} map
  */
-Optimizely.prototype.__filterAttributes = function (attributes) {
-    for (var key in attributes) {
-      if (attributes.hasOwnProperty(key) && attributes[key] === null) {
-        delete attributes[key]
+Optimizely.prototype.__filterEmptyValues = function (map) {
+    for (var key in map) {
+      if (map.hasOwnProperty(key) && (map[key] === null || map[key] === undefined)) {
+        delete map[key]
       }
     }
-    return attributes;
-}
-
-/**
- * Filters out eventTags with null values
- * @param  eventTags
- * @returns {Object} eventTags
- */
-Optimizely.prototype.__filterEventTags = function (eventTags) {
-    for (var key in eventTags) {
-      if (eventTags.hasOwnProperty(key) && eventTags[key] === null) {
-        delete eventTags[key]
-      }
-    }
-    return eventTags;
+    return map;
 }
 
 module.exports = Optimizely;

lib/optimizely/tests.js

@@ -1889,31 +1889,29 @@ describe('lib/optimizely', function() {
       });
     });
 
-    describe('__filterAttributes', function() {
-      it('should filter out a null value attribute', function() {
-        var attributes = {'test': null};
-        var filteredAttributes = optlyInstance.__filterAttributes(attributes);
-        assert.deepEqual(filteredAttributes, {});
+    describe('should filter out null values', function() {
+      it('should filter out a null value', function() {
+        var dict = {'test': null};
+        var filteredValue = optlyInstance.__filterEmptyValues(dict);
+        assert.deepEqual(filteredValue, {});
       });
 
-      it('should filter out a null value attribute, leave a non null one', function() {
-        var attributes = {'test': null, 'test2': 'not_null'};
-        var filteredAttributes = optlyInstance.__filterAttributes(attributes);
-        assert.deepEqual(filteredAttributes, {'test2': 'not_null'});
+      it('should filter out a undefined value', function() {
+        var dict = {'test': undefined};
+        var filteredValue = optlyInstance.__filterEmptyValues(dict);
+        assert.deepEqual(filteredValue, {});
       });
-    });
 
-    describe('__filterEventTags', function() {
-      it('should filter out a null value eventTag', function() {
-        var eventTags = {'test': null};
-        var filteredEventTags = optlyInstance.__filterEventTags(eventTags);
-        assert.deepEqual(filteredEventTags, {});
+      it('should filter out a null value, leave a non null one', function() {
+        var dict = {'test': null, 'test2': 'not_null'};
+        var filteredValue = optlyInstance.__filterEmptyValues(dict);
+        assert.deepEqual(filteredValue, {'test2': 'not_null'});
       });
 
-      it('should filter out a null value attribute, leave a non null one', function() {
-        var eventTags = {'test': null, 'test2': 'not_null'};
-        var filteredEventTags = optlyInstance.__filterEventTags(eventTags);
-        assert.deepEqual(filteredEventTags, {'test2': 'not_null'});
+      it('should not filter out a non empty value', function() {
+        var dict = {'test': 'hello'};
+        var filteredValue = optlyInstance.__filterEmptyValues(dict);
+        assert.deepEqual(filteredValue, {'test': 'hello'});
       });
     });