packs/GoogleDrive: rename test files

Signed-off-by: Gal Nakash <gal@recolabs.ai>
demisto · Aug 20, 2023 · 98eadc4 · 98eadc4
1 parent 7a38f7e
commit 98eadc4
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 18 deletions.
diff --git a/Packs/GoogleDrive/Integrations/GoogleDrive/GoogleDrive.py b/Packs/GoogleDrive/Integrations/GoogleDrive/GoogleDrive.py
@@ -41,6 +41,7 @@
     'EXCEPTION_GENERIC': 'Exception handling a {} request: {}',
     'MODIFY_LABEL_SUCCESS': 'Modify label successfully assigned to {}.',
     'GET_LABEL_SUCCESS': 'Label successfully retrieved.',
+    'GET_LABELS_SUCCESS': 'Labels successfully retrieved.',
 }
 
 SCOPES: dict[str, list[str]] = {
@@ -152,7 +153,7 @@
     'GOOGLE_DRIVE_FILE_PERMISSION_HEADER': 'GoogleDrive.FilePermission',
     'FILE_PERMISSION': 'FilePermission',
 
-    'LABELS': 'DriveLabels'
+    'LABELS': 'GoogleDrive.Labels'
 
 }
 
@@ -1240,9 +1241,12 @@ def modify_label_command(client: 'GSuiteClient', args: dict[str, str]) -> Comman
                                   response,
                                   headerTransform=pascalToSpace,
                                   removeNull=False)
+    outputs_context = {
+        OUTPUT_PREFIX['LABELS']: response
+    }
 
     return CommandResults(
-        outputs=response,
+        outputs=outputs_context,
         readable_output=table_hr_md,
     )
 
@@ -1256,13 +1260,22 @@ def get_file_labels_command(client: 'GSuiteClient', args: dict[str, str]) -> Com
 
     response = client.http_request(url_suffix=url_suffix, method='GET', params=http_request_params)
 
+    outputs_context = {
+        OUTPUT_PREFIX['LABELS']: response,
+        OUTPUT_PREFIX['GOOGLE_DRIVE_FILE_HEADER']: {
+            OUTPUT_PREFIX['FILE']: {
+                'id': args.get('file_id'),
+            },
+        }
+    }
+
     table_hr_md = tableToMarkdown(HR_MESSAGES['GET_LABEL_SUCCESS'].format(args.get('file_id')),
-                                  response,
+                                  response['labels'],
                                   headerTransform=pascalToSpace,
                                   removeNull=False)
 
     return CommandResults(
-        outputs=response,
+        outputs=outputs_context,
         readable_output=table_hr_md,
     )
 
@@ -1280,11 +1293,13 @@ def get_labels_command(client: 'GSuiteClient', args: dict[str, str]) -> CommandR
         OUTPUT_PREFIX['LABELS']: response
     }
 
-    outputs: dict = {
-        OUTPUT_PREFIX['GOOGLE_DRIVE_DRIVE_HEADER']: outputs_context
-    }
+    table_hr_md = tableToMarkdown(HR_MESSAGES['GET_LABELS_SUCCESS'],
+                                  response['labels'],
+                                  headerTransform=pascalToSpace,
+                                  removeNull=False)
     return CommandResults(
-        outputs=outputs
+        readable_output=table_hr_md,
+        outputs=outputs_context
     )
 
 

diff --git a/Packs/GoogleDrive/Integrations/GoogleDrive/GoogleDrive_test.py b/Packs/GoogleDrive/Integrations/GoogleDrive/GoogleDrive_test.py
@@ -785,16 +785,14 @@ def test_list_labels(self, mocker_http_request, gsuite_client):
         """
         from GoogleDrive import get_labels_command
 
-        with open('test_data/list_labels_response.json.json', encoding='utf-8') as data:
+        with open('test_data/list_labels_response.json', encoding='utf-8') as data:
             mock_response = json.load(data)
         mocker_http_request.return_value = mock_response
 
         result = get_labels_command(gsuite_client, {})
 
-        assert 'GoogleDrive.Drive.DriveLabels' in result.outputs
-        assert len(result.outputs['GoogleDrive.Drive.DriveLabels']) == 1
-
-        assert result.raw_response == mock_response
+        assert 'GoogleDrive.Drive' in result.outputs
+        assert len(result.outputs['GoogleDrive.Drive']['DriveLabels']) == 1
 
 
     @patch(MOCKER_HTTP_METHOD)
@@ -813,15 +811,15 @@ def test_modify_labels_command(self, mocker_http_request, gsuite_client):
         """
         from GoogleDrive import modify_label_command
 
-        with open('test_data/modify_label_command_repsonse.json.json', encoding='utf-8') as data:
+        with open('test_data/modify_label_command_response.json', encoding='utf-8') as data:
             mock_response = json.load(data)
         mocker_http_request.return_value = mock_response
 
         args = {
             'field_id': 'test',
             'selection_label_id': 'test',
             'label_id': 'test',
-            'file_id' : 'test'
+            'file_id': 'test'
         }
         result = modify_label_command(gsuite_client, args)
 
@@ -832,7 +830,6 @@ def test_modify_labels_command(self, mocker_http_request, gsuite_client):
 
         assert HR_MESSAGES['MODIFY_LABEL_SUCCESS'].format(args.get('file_id')) in result.readable_output
 
-
     @patch(MOCKER_HTTP_METHOD)
     def test_file_permission_list_command_failure(self, mocker_http_request, gsuite_client):
         """
@@ -1001,8 +998,7 @@ def test_upload_file_with_parent_command_success(self, mocker, gsuite_client):
         args = {
             'parent': 'test_parent',
             'entry_id': 'test_entry_id',
-            'file_name': 'test_file_name',
-            'parent': 'test_parent'
+            'file_name': 'test_file_name'
 
         }
         file_upload_command(gsuite_client, args)

diff --git a/...t_data/modify_label_command_repsonse.json → ...t_data/modify_label_command_response.json b/...t_data/modify_label_command_repsonse.json → ...t_data/modify_label_command_response.json