Merge branch 'master' into sohail/activatenullvalues

Author: mikeproeng37

packages/optimizely-sdk/lib/optimizely/index.js

@@ -308,7 +308,8 @@ Optimizely.prototype.getVariation = function(experimentKey, userId, attributes)
 
       var experiment = this.configObj.experimentKeyMap[experimentKey];
       if (fns.isEmpty(experiment)) {
-        throw new Error(sprintf(ERROR_MESSAGES.INVALID_EXPERIMENT_KEY, MODULE_NAME, experimentKey));
+        this.logger.log(LOG_LEVEL.DEBUG, sprintf(ERROR_MESSAGES.INVALID_EXPERIMENT_KEY, MODULE_NAME, experimentKey));
+        return null;
       }
 
       return this.decisionService.getVariation(experimentKey, userId, attributes);

packages/optimizely-sdk/lib/optimizely/index.tests.js

@@ -808,15 +808,11 @@ describe('lib/optimizely', function() {
         assert.strictEqual(logMessage2, sprintf(LOG_MESSAGES.NOT_ACTIVATING_USER, 'OPTIMIZELY', 'null', 'testExperiment'));
       });
 
-      it('should throw an error for invalid experiment key', function() {
+      it('should log an error for invalid experiment key', function() {
         assert.isNull(optlyInstance.activate('invalidExperimentKey', 'testUser'));
 
         sinon.assert.notCalled(eventDispatcher.dispatchEvent);
 
-        sinon.assert.calledOnce(errorHandler.handleError);
-        var errorMessage = errorHandler.handleError.lastCall.args[0].message;
-        assert.strictEqual(errorMessage, sprintf(ERROR_MESSAGES.INVALID_EXPERIMENT_KEY, 'OPTIMIZELY', 'invalidExperimentKey'));
-
         sinon.assert.calledTwice(createdLogger.log);
         var logMessage1 = createdLogger.log.args[0][1];
         assert.strictEqual(logMessage1, sprintf(ERROR_MESSAGES.INVALID_EXPERIMENT_KEY, 'OPTIMIZELY', 'invalidExperimentKey'));
@@ -1632,15 +1628,10 @@ describe('lib/optimizely', function() {
         assert.strictEqual(logMessage, sprintf(ERROR_MESSAGES.INVALID_INPUT_FORMAT, 'OPTIMIZELY', 'user_id'));
       });
 
-      it('should throw an error for invalid experiment key', function() {
+      it('should log an error for invalid experiment key', function() {
         var getVariationWithError = optlyInstance.getVariation('invalidExperimentKey', 'testUser');
-
         assert.isNull(getVariationWithError);
 
-        sinon.assert.calledOnce(errorHandler.handleError);
-        var errorMessage = errorHandler.handleError.lastCall.args[0].message;
-        assert.strictEqual(errorMessage, sprintf(ERROR_MESSAGES.INVALID_EXPERIMENT_KEY, 'OPTIMIZELY', 'invalidExperimentKey'));
-
         sinon.assert.calledOnce(createdLogger.log);
         var logMessage = createdLogger.log.args[0][1];
         assert.strictEqual(logMessage, sprintf(ERROR_MESSAGES.INVALID_EXPERIMENT_KEY, 'OPTIMIZELY', 'invalidExperimentKey'));

packages/optimizely-sdk/lib/utils/enums/index.js

@@ -38,7 +38,7 @@ exports.ERROR_MESSAGES = {
   INVALID_EVENT_DISPATCHER: '%s: Provided "eventDispatcher" is in an invalid format.',
   INVALID_EVENT_KEY: '%s: Event key %s is not in datafile.',
   INVALID_EVENT_TAGS: '%s: Provided event tags are in an invalid format.',
-  INVALID_EXPERIMENT_KEY: '%s: Experiment key %s is not in datafile.',
+  INVALID_EXPERIMENT_KEY: '%s: Experiment key %s is not in datafile. It is either invalid, paused, or archived.',
   INVALID_EXPERIMENT_ID: '%s: Experiment ID %s is not in datafile.',
   INVALID_GROUP_ID: '%s: Group ID %s is not in datafile.',
   INVALID_LOGGER: '%s: Provided "logger" is in an invalid format.',