[FSSDK-10934] Cherry picking commits from 5.x.x to master (#968)

Author: junaed-optimizely

lib/core/decision_service/index.tests.js

@@ -381,7 +381,7 @@ describe('lib/core/decision_service', function() {
           );
           assert.strictEqual(
             buildLogMessageFromArgs(mockLogger.log.args[4]),
-            'DECISION_SERVICE: Saved variation "control" of experiment "testExperiment" for user "decision_service_user".'
+            'DECISION_SERVICE: Saved user profile for user "decision_service_user".'
           );
         });
 
@@ -394,6 +394,7 @@ describe('lib/core/decision_service', function() {
             optimizely: {},
             userId: 'decision_service_user',
           });
+
           assert.strictEqual(
             'control',
             decisionServiceInstance.getVariation(configObj, experiment, user).result
@@ -402,11 +403,11 @@ describe('lib/core/decision_service', function() {
           sinon.assert.calledOnce(bucketerStub); // should still go through with bucketing
           assert.strictEqual(
             buildLogMessageFromArgs(mockLogger.log.args[0]),
-            'DECISION_SERVICE: User decision_service_user is not in the forced variation map.'
+            'DECISION_SERVICE: Error while looking up user profile for user ID "decision_service_user": I am an error.'
           );
           assert.strictEqual(
             buildLogMessageFromArgs(mockLogger.log.args[1]),
-            'DECISION_SERVICE: Error while looking up user profile for user ID "decision_service_user": I am an error.'
+            'DECISION_SERVICE: User decision_service_user is not in the forced variation map.'
           );
         });
 
@@ -1281,7 +1282,7 @@ describe('lib/core/decision_service', function() {
               reasons: [],
             };
             experiment = configObj.experimentIdMap['594098'];
-            getVariationStub = sandbox.stub(decisionServiceInstance, 'getVariation');
+            getVariationStub = sandbox.stub(decisionServiceInstance, 'resolveVariation');
             getVariationStub.returns(fakeDecisionResponse);
             getVariationStub.withArgs(configObj, experiment, user).returns(fakeDecisionResponseWithArgs);
           });
@@ -1497,12 +1498,11 @@ describe('lib/core/decision_service', function() {
               decisionSource: DECISION_SOURCES.FEATURE_TEST,
             };
             assert.deepEqual(decision, expectedDecision);
-            sinon.assert.calledWithExactly(
+            sinon.assert.calledWith(
               getVariationStub,
               configObj,
               experiment,
               user,
-              {}
             );
           });
         });
@@ -1515,7 +1515,7 @@ describe('lib/core/decision_service', function() {
               optimizely: {},
               userId: 'user1',
             });
-            getVariationStub = sandbox.stub(decisionServiceInstance, 'getVariation');
+            getVariationStub = sandbox.stub(decisionServiceInstance, 'resolveVariation');
             getVariationStub.returns(fakeDecisionResponse);
           });
 
@@ -1554,7 +1554,7 @@ describe('lib/core/decision_service', function() {
               result: 'var',
               reasons: [],
             };
-            getVariationStub = sandbox.stub(decisionServiceInstance, 'getVariation');
+            getVariationStub = sandbox.stub(decisionServiceInstance, 'resolveVariation');
             getVariationStub.returns(fakeDecisionResponseWithArgs);
             getVariationStub.withArgs(configObj, 'exp_with_group', user).returns(fakeDecisionResponseWithArgs);
           });
@@ -1611,7 +1611,7 @@ describe('lib/core/decision_service', function() {
               optimizely: {},
               userId: 'user1',
             });
-            getVariationStub = sandbox.stub(decisionServiceInstance, 'getVariation');
+            getVariationStub = sandbox.stub(decisionServiceInstance, 'resolveVariation');
             getVariationStub.returns(fakeDecisionResponse);
           });
 
@@ -1679,6 +1679,7 @@ describe('lib/core/decision_service', function() {
                 status: 'Not started',
                 key: '594031',
                 id: '594031',
+                isRollout: true,
                 variations: [
                   {
                     id: '594032',
@@ -1816,6 +1817,7 @@ describe('lib/core/decision_service', function() {
                 status: 'Not started',
                 key: '594037',
                 id: '594037',
+                isRollout: true,
                 variations: [
                   {
                     id: '594038',
@@ -2000,6 +2002,7 @@ describe('lib/core/decision_service', function() {
                 status: 'Not started',
                 key: '594037',
                 id: '594037',
+                isRollout: true,
                 variations: [
                   {
                     id: '594038',
@@ -2154,6 +2157,7 @@ describe('lib/core/decision_service', function() {
               layerId: '599055',
               forcedVariations: {},
               audienceIds: [],
+              isRollout: true,
               variations: [
                 {
                   key: '599057',