Merge remote-tracking branch 'remotes/optimizely/master' into Feature…

…Flag&Rollouts-newAPIs # Conflicts: # tests/DecisionServiceTests/DecisionServiceTest.php
optimizely · Nov 15, 2017 · efeaa82 · efeaa82
2 parents 377dae7 + afa7a55
commit efeaa82
Showing 1 changed file with 24 additions and 11 deletions.
diff --git a/tests/DecisionServiceTests/DecisionServiceTest.php b/tests/DecisionServiceTests/DecisionServiceTest.php
@@ -618,7 +618,7 @@ public function testGetVariationForFeatureExperimentGivenNullExperimentIds()
 
         $this->assertSame(
             null,
-            $this->decisionService->getVariationForFeatureExperiment($feature_flag, 'user1', [])      
+            $this->decisionService->getVariationForFeatureExperiment($feature_flag, 'user1', [])
         );
     }
 
@@ -642,7 +642,7 @@ public function testGetVariationForFeatureExperimentGivenExperimentNotInDataFile
         );
 
         $this->assertSame(
-             null,
+            null,
             $this->decisionService->getVariationForFeatureExperiment($feature_flag, 'user1', [])
         );
     }
@@ -759,10 +759,11 @@ public function testGetVariationForFeatureWhenTheUserIsBucketedIntoFeatureExperi
         $expected_experiment_id = $feature_flag->getExperimentIds()[0];
         $expected_experiment = $this->config->getExperimentFromId($expected_experiment_id);
         $expected_variation = $expected_experiment->getVariations()[0];
-        $expected_decision = [
-        'experiment' => $expected_experiment,
-        'variation' => $expected_variation
-        ];
+        $expected_decision = new FeatureDecision(
+            $expected_experiment->getId(),
+            $expected_variation->getId(),
+            FeatureDecision::DECISION_SOURCE_EXPERIMENT
+        );
 
         $decisionServiceMock->expects($this->at(0))
         ->method('getVariationForFeatureExperiment')
@@ -788,7 +789,10 @@ public function testGetVariationForFeatureWhenBucketedToFeatureRollout()
         $experiment = $rollout->getExperiments()[0];
         $expected_variation = $experiment->getVariations()[0];
         $expected_decision = new FeatureDecision(
-            $experiment->getId(), $expected_variation->getId(), FeatureDecision::DECISION_SOURCE_ROLLOUT);
+            $experiment->getId(),
+            $expected_variation->getId(),
+            FeatureDecision::DECISION_SOURCE_ROLLOUT
+        );
 
 
         $decisionServiceMock
@@ -878,7 +882,7 @@ public function testGetVariationForFeatureRolloutWhenRolloutIsNotInDataFile()
         );
 
         $this->assertEquals(
-             null,
+            null,
             $this->decisionServiceMock->getVariationForFeatureRollout($feature_flag, 'user_1', [])
         );
     }
@@ -921,7 +925,10 @@ public function testGetVariationForFeatureRolloutWhenUserIsBucketedInTheTargetin
         $experiment = $rollout->getExperiments()[0];
         $expected_variation = $experiment->getVariations()[0];
         $expected_decision = new FeatureDecision(
-            $experiment->getId(), $expected_variation->getId(), FeatureDecision::DECISION_SOURCE_ROLLOUT);   
+            $experiment->getId(),
+            $expected_variation->getId(),
+            FeatureDecision::DECISION_SOURCE_ROLLOUT
+        );
 
         // Provide attributes such that user qualifies for audience
         $user_attributes = ["browser_type" => "chrome"];
@@ -959,7 +966,10 @@ public function testGetVariationForFeatureRolloutWhenUserIsNotBucketedInTheTarge
         $experiment2 = $rollout->getExperiments()[2];
         $expected_variation = $experiment2->getVariations()[0];
         $expected_decision = new FeatureDecision(
-            $experiment2->getId(), $expected_variation->getId(), FeatureDecision::DECISION_SOURCE_ROLLOUT); 
+            $experiment2->getId(),
+            $expected_variation->getId(),
+            FeatureDecision::DECISION_SOURCE_ROLLOUT
+        );
 
         // Provide attributes such that user qualifies for audience
         $user_attributes = ["browser_type" => "chrome"];
@@ -1064,7 +1074,10 @@ public function testGetVariationForFeatureRolloutWhenUserDoesNotQualifyForAnyTar
         $experiment2 = $rollout->getExperiments()[2];
         $expected_variation = $experiment2->getVariations()[0];
         $expected_decision = new FeatureDecision(
-            $experiment2->getId(), $expected_variation->getId(), FeatureDecision::DECISION_SOURCE_ROLLOUT);   
+            $experiment2->getId(),
+            $expected_variation->getId(),
+            FeatureDecision::DECISION_SOURCE_ROLLOUT
+        );
 
         // Provide null attributes so that user does not qualify for audience
         $user_attributes = [];