Merge pull request #329 from bhunut-adobe/v2

Resolved directory_okta test errors.  It passes all the tests now.
#328 #322

Author: adobeDan

tests/connector/directory_okta_test.py

@@ -250,17 +250,12 @@ def __init__(self, status_code, data):
                 self.links = {}
 
         self.mock_response = MockResponse
-        self.orig_directory_init = OktaDirectoryConnector.__init__
-        OktaDirectoryConnector.__init__ = mock.Mock(return_value=None)
-        directory = OktaDirectoryConnector({})
+        directory = OktaDirectoryConnector({'host': 'okta-test.com', 'api_token': 'abcdefghijklmnopqrstuvwxyz'})
         directory.logger = mock.create_autospec(logging.Logger)
         directory.groups_client = okta.UserGroupsClient('example.com', 'xyz')
         directory.user_identity_type = 'enterpriseID'
         self.directory = directory
 
-    def tearDown(self):
-        OktaDirectoryConnector.__init__ = self.orig_directory_init
-
     @mock.patch('user_sync.connector.directory_okta.OktaDirectoryConnector.find_group')
     @mock.patch('okta.framework.ApiClient.requests')
     def test_success_extended_attribute_key(self, mock_requests, mock_find_group):
@@ -281,7 +276,6 @@ def test_success_extended_attribute_key(self, mock_requests, mock_find_group):
         mock_find_group.return_value = mockID
 
         directory = self.directory
-        directory.options = {'all_users_filter': 'user.status == "ACTIVE"', 'group_filter_format': '{group}'}
         extended_attributes = ['firstName', 'lastName', 'login', 'email', 'countryCode', 'additionalTest']
         iterGroupResponse = directory.iter_group_members("testGroup",directory.options['all_users_filter'], extended_attributes)
         temp_var = list(iterGroupResponse)
@@ -308,7 +302,6 @@ def test_success_extended_attribute_value(self, mock_requests, mock_find_group):
         mock_find_group.return_value = mockID
 
         directory = self.directory
-        directory.options = {'all_users_filter': 'user.status == "ACTIVE"', 'group_filter_format': '{group}'}
         extended_attributes = ['firstName', 'lastName', 'login', 'email', 'countryCode', 'additionalTest']
         iterGroupResponse = directory.iter_group_members("testGroup", directory.options['all_users_filter'],
                                                          extended_attributes)
@@ -336,7 +329,6 @@ def test_non_existence_extended_attribute_key(self, mock_requests, mock_find_gro
         mock_find_group.return_value = mockID
 
         directory = self.directory
-        directory.options = {'all_users_filter': 'user.status == "ACTIVE"', 'group_filter_format': '{group}'}
         extended_attributes = ['firstName', 'lastName', 'login', 'email', 'countryCode', 'badattribute']
         iterGroupResponse = directory.iter_group_members("testGroup", directory.options['all_users_filter'],
                                                          extended_attributes)
@@ -364,7 +356,6 @@ def test_non_existence_extended_attribute_value(self, mock_requests, mock_find_g
         mock_find_group.return_value = mockID
 
         directory = self.directory
-        directory.options = {'all_users_filter': 'user.status == "ACTIVE"', 'group_filter_format': '{group}'}
         extended_attributes = ['firstName', 'lastName', 'login', 'email', 'countryCode', 'badattribute']
         iterGroupResponse = directory.iter_group_members("testGroup", directory.options['all_users_filter'],
                                                          extended_attributes)
@@ -391,7 +382,6 @@ def test_invalid_missing_profile_user(self, mock_requests, mock_find_group):
         mock_find_group.return_value = mockID
 
         directory = self.directory
-        directory.options = {'all_users_filter': 'user.status == "ACTIVE"', 'group_filter_format': '{group}'}
         extended_attributes = ['firstName', 'lastName', 'login', 'email', 'countryCode', 'badattribute']
         iterGroupResponse = directory.iter_group_members("testGroup", directory.options['all_users_filter'],
                                                          extended_attributes)