Revert "update: unit test fixes"

This reverts commit d2fc631.

Author: FarhanAnjum-opti

optimizely/optimizely.py

@@ -537,7 +537,7 @@ def activate(self, experiment_key: str, user_id: str, attributes: Optional[UserA
 
         variation_result = self.get_variation(experiment_key, user_id, attributes)
         variation_key = None
-        if variation_result and variation_result['variation']:
+        if variation_result:
             variation_key = variation_result['variation'].key
         if not variation_key:
             self.logger.info(f'Not activating user "{user_id}".')

tests/test_optimizely.py

@@ -1852,7 +1852,7 @@ def test_get_variation(self):
                 'optimizely.decision_service.DecisionService.get_variation',
                 return_value=variation_result,
         ), mock.patch('optimizely.notification_center.NotificationCenter.send_notifications') as mock_broadcast:
-            variation = self.optimizely.get_variation('test_experiment', 'test_user')['variation'].key
+            variation = self.optimizely.get_variation('test_experiment', 'test_user')
             self.assertEqual(
                 'variation', variation,
             )
@@ -1885,7 +1885,7 @@ def test_get_variation_lookup_and_save_is_called(self):
         ) as mock_load_user_profile, mock.patch(
             'optimizely.user_profile.UserProfileTracker.save_user_profile'
         ) as mock_save_user_profile:
-            variation = self.optimizely.get_variation('test_experiment', 'test_user')['variation'].key
+            variation = self.optimizely.get_variation('test_experiment', 'test_user')
             self.assertEqual(
                 'variation', variation,
             )
@@ -1917,7 +1917,7 @@ def test_get_variation_with_experiment_in_feature(self):
                 'optimizely.decision_service.DecisionService.get_variation',
                 return_value=variation_result,
         ), mock.patch('optimizely.notification_center.NotificationCenter.send_notifications') as mock_broadcast:
-            variation = opt_obj.get_variation('test_experiment', 'test_user')['variation'].key
+            variation = opt_obj.get_variation('test_experiment', 'test_user')
             self.assertEqual('variation', variation)
 
         self.assertEqual(mock_broadcast.call_count, 1)
@@ -1946,7 +1946,7 @@ def test_get_variation__returns_none(self):
                 None,
                 self.optimizely.get_variation(
                     'test_experiment', 'test_user', attributes={'test_attribute': 'test_value'},
-                )['variation'],
+                ),
             )
 
         self.assertEqual(mock_broadcast.call_count, 1)
@@ -5172,7 +5172,7 @@ def test_get_variation__forced_bucketing(self):
         )
         variation_key = self.optimizely.get_variation(
             'test_experiment', 'test_user', attributes={'test_attribute': 'test_value'}
-        )['variation'].key
+        )
         self.assertEqual('variation', variation_key)
 
     def test_get_variation__experiment_not_running__forced_bucketing(self):
@@ -5187,7 +5187,7 @@ def test_get_variation__experiment_not_running__forced_bucketing(self):
             )
             variation_key = self.optimizely.get_variation(
                 'test_experiment', 'test_user', attributes={'test_attribute': 'test_value'},
-            )['variation']
+            )
             self.assertIsNone(variation_key)
             mock_is_experiment_running.assert_called_once_with(
                 self.project_config.get_experiment_from_key('test_experiment')
@@ -5201,7 +5201,7 @@ def test_get_variation__whitelisted_user_forced_bucketing(self):
         self.assertEqual('group_exp_1_variation', forced_variation)
         variation_key = self.optimizely.get_variation(
             'group_exp_1', 'user_1', attributes={'test_attribute': 'test_value'}
-        )['variation'].key
+        )
         self.assertEqual('group_exp_1_variation', variation_key)
 
     def test_get_variation__user_profile__forced_bucketing(self):
@@ -5216,7 +5216,7 @@ def test_get_variation__user_profile__forced_bucketing(self):
             )
             variation_key = self.optimizely.get_variation(
                 'test_experiment', 'test_user', attributes={'test_attribute': 'test_value'},
-            )['variation'].key
+            )
             self.assertEqual('variation', variation_key)
 
     def test_get_variation__invalid_attributes__forced_bucketing(self):
@@ -5228,7 +5228,8 @@ def test_get_variation__invalid_attributes__forced_bucketing(self):
         )
         variation_key = self.optimizely.get_variation(
             'test_experiment', 'test_user', attributes={'test_attribute': 'test_value_invalid'},
-        )['variation'].key
+        )
+        variation_key = variation_key
         self.assertEqual('variation', variation_key)
 
     def test_set_forced_variation__invalid_object(self):