From b76ddcd007ae7371f89cbde155079e93bd3de277 Mon Sep 17 00:00:00 2001
From: Anoop M D <anoop.md1421@gmail.com>
Date: Wed, 1 Feb 2023 18:02:10 +0530
Subject: [PATCH] feat: scripting and testing support in graphql has arrived

---
 .../RequestPane/GraphQLRequestPane/index.js        | 14 ++++++++++++++
 .../ReduxStore/slices/collections/actions.js       |  2 +-
 packages/bruno-electron/src/ipc/network/index.js   |  2 +-
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/packages/bruno-app/src/components/RequestPane/GraphQLRequestPane/index.js b/packages/bruno-app/src/components/RequestPane/GraphQLRequestPane/index.js
index a0ffb77db..1ad4f994a 100644
--- a/packages/bruno-app/src/components/RequestPane/GraphQLRequestPane/index.js
+++ b/packages/bruno-app/src/components/RequestPane/GraphQLRequestPane/index.js
@@ -8,6 +8,8 @@ import { updateRequestPaneTab } from 'providers/ReduxStore/slices/tabs';
 import QueryEditor from 'components/RequestPane/QueryEditor';
 import GraphQLVariables from 'components/RequestPane/GraphQLVariables';
 import RequestHeaders from 'components/RequestPane/RequestHeaders';
+import Script from 'components/RequestPane/Script';
+import Tests from 'components/RequestPane/Tests';
 import { useTheme } from 'providers/Theme';
 import { updateRequestGraphqlQuery } from 'providers/ReduxStore/slices/collections';
 import { sendRequest, saveRequest } from 'providers/ReduxStore/slices/collections/actions';
@@ -89,6 +91,12 @@ const GraphQLRequestPane = ({ item, collection, leftPaneWidth, onSchemaLoad, tog
       case 'headers': {
         return <RequestHeaders item={item} collection={collection} />;
       }
+      case 'script': {
+        return <Script item={item} collection={collection} />;
+      }
+      case 'tests': {
+        return <Tests item={item} collection={collection} />;
+      }
       default: {
         return <div className="mt-4">404 | Not found</div>;
       }
@@ -122,6 +130,12 @@ const GraphQLRequestPane = ({ item, collection, leftPaneWidth, onSchemaLoad, tog
         <div className={getTabClassname('headers')} role="tab" onClick={() => selectTab('headers')}>
           Headers
         </div>
+        <div className={getTabClassname('script')} role="tab" onClick={() => selectTab('script')}>
+          Script
+        </div>
+        <div className={getTabClassname('tests')} role="tab" onClick={() => selectTab('tests')}>
+          Tests
+        </div>
         <div className="flex flex-grow justify-end items-center" style={{fontSize: 13}}>
           <div className='flex items-center cursor-pointer hover:underline' onClick={loadGqlSchema}>
             {isSchemaLoading ? (
diff --git a/packages/bruno-app/src/providers/ReduxStore/slices/collections/actions.js b/packages/bruno-app/src/providers/ReduxStore/slices/collections/actions.js
index 594153754..3e589fba5 100644
--- a/packages/bruno-app/src/providers/ReduxStore/slices/collections/actions.js
+++ b/packages/bruno-app/src/providers/ReduxStore/slices/collections/actions.js
@@ -161,7 +161,7 @@ export const runCollectionFolder = (collectionUid, folderUid, recursive) => (dis
     }));
 
     ipcRenderer
-      .invoke('renderer:run-collection-folder', folder, collectionCopy, environment, recursive)
+      .invoke('renderer:run-collection-folder', folder, collectionCopy, environment, collectionCopy.collectionVariables, recursive)
       .then(resolve)
       .catch((err) => {
         toast.error(get(err, 'error.message') || 'Something went wrong!');
diff --git a/packages/bruno-electron/src/ipc/network/index.js b/packages/bruno-electron/src/ipc/network/index.js
index 92700ab2b..35cfd2068 100644
--- a/packages/bruno-electron/src/ipc/network/index.js
+++ b/packages/bruno-electron/src/ipc/network/index.js
@@ -220,7 +220,7 @@ const registerNetworkIpc = (mainWindow, watcher, lastOpenedCollections) => {
     }
   });
 
-  ipcMain.handle('renderer:run-collection-folder', async (event, folder, collection, environment, recursive) => {
+  ipcMain.handle('renderer:run-collection-folder', async (event, folder, collection, environment, collectionVariables, recursive) => {
     const collectionUid = collection.uid;
     const collectionPath = collection.pathname;
     const folderUid = folder ? folder.uid : null;