From f2273821b099f6d8185386c0043400bcfef0b884 Mon Sep 17 00:00:00 2001
From: sanish-bruno <sanish@usebruno.com>
Date: Wed, 15 Oct 2025 17:25:22 +0530
Subject: [PATCH 1/2] add: tests for grpc requests

feat: add common selectors to locator.ts

fix: add dataTestId prop

update locator
---
 .../src/components/Accordion/index.js         |   4 +-
 .../components/RequestPane/GrpcBody/index.js  |   3 +
 .../GrpcQueryUrl/MethodDropdown/index.js      |   2 +-
 .../RequestPane/GrpcQueryUrl/index.js         |  20 +-
 .../GrpcResponsePane/GrpcQueryResult/index.js |  10 +-
 .../ResponsePane/GrpcResponsePane/index.js    |   2 +-
 .../bruno-app/src/components/Tab/index.js     |   3 +-
 .../collection/HelloService/BidiHello.bru     |  31 +++
 .../HelloService/LotOfGreetings.bru           |  31 +++
 .../collection/HelloService/LotOfReplies.bru  |  22 ++
 .../collection/HelloService/SayHello.bru      |  22 ++
 .../collection/HelloService/folder.bru        |   8 +
 tests/grpc/make-request/collection/bruno.json |  33 +++
 .../make-request/collection/collection.bru    |   0
 .../collection/environments/Env.bru           |   3 +
 .../init-user-data/collection-security.json   |  10 +
 .../init-user-data/preferences.json           |  12 ++
 tests/grpc/make-request/make-request.spec.ts  | 202 ++++++++++++++++++
 tests/utils/page/locators.ts                  |  34 +++
 19 files changed, 433 insertions(+), 19 deletions(-)
 create mode 100644 tests/grpc/make-request/collection/HelloService/BidiHello.bru
 create mode 100644 tests/grpc/make-request/collection/HelloService/LotOfGreetings.bru
 create mode 100644 tests/grpc/make-request/collection/HelloService/LotOfReplies.bru
 create mode 100644 tests/grpc/make-request/collection/HelloService/SayHello.bru
 create mode 100644 tests/grpc/make-request/collection/HelloService/folder.bru
 create mode 100644 tests/grpc/make-request/collection/bruno.json
 create mode 100644 tests/grpc/make-request/collection/collection.bru
 create mode 100644 tests/grpc/make-request/collection/environments/Env.bru
 create mode 100644 tests/grpc/make-request/init-user-data/collection-security.json
 create mode 100644 tests/grpc/make-request/init-user-data/preferences.json
 create mode 100644 tests/grpc/make-request/make-request.spec.ts

diff --git a/packages/bruno-app/src/components/Accordion/index.js b/packages/bruno-app/src/components/Accordion/index.js
index ed73921d76..e87e4bf9fe 100644
--- a/packages/bruno-app/src/components/Accordion/index.js
+++ b/packages/bruno-app/src/components/Accordion/index.js
@@ -4,7 +4,7 @@ import { AccordionItem, AccordionHeader, AccordionContent } from './styledWrappe
 
 const AccordionContext = createContext();
 
-const Accordion = ({ children, defaultIndex }) => {
+const Accordion = ({ children, defaultIndex, dataTestId }) => {
   const [openIndex, setOpenIndex] = useState(defaultIndex);
 
   const toggleItem = (index) => {
@@ -13,7 +13,7 @@ const Accordion = ({ children, defaultIndex }) => {
 
   return (
     <AccordionContext.Provider value={{ openIndex, toggleItem }}>
-      <div>{children}</div>
+      <div data-testid={dataTestId}>{children}</div>
     </AccordionContext.Provider>
   );
 };
diff --git a/packages/bruno-app/src/components/RequestPane/GrpcBody/index.js b/packages/bruno-app/src/components/RequestPane/GrpcBody/index.js
index 0e1eb8d0b1..690bc32e82 100644
--- a/packages/bruno-app/src/components/RequestPane/GrpcBody/index.js
+++ b/packages/bruno-app/src/components/RequestPane/GrpcBody/index.js
@@ -186,6 +186,7 @@ const SingleGrpcMessage = ({ message, item, collection, index, methodType, isCol
                 onClick={onSend}
                 disabled={!isConnectionActive}
                 className={`p-1 rounded ${isConnectionActive ? 'hover:bg-zinc-200 dark:hover:bg-zinc-600' : 'opacity-50 cursor-not-allowed'} transition-colors`}
+                data-testid={`grpc-send-message-${index}`}
               >
                 <IconSend
                   size={16}
@@ -299,6 +300,7 @@ const GrpcBody = ({ item, collection, handleRun }) => {
       <div
         ref={messagesContainerRef}
         id="grpc-messages-container"
+        data-testid="grpc-messages-container"
         className={`flex-1 ${body.grpc.length === 1 || !canClientSendMultipleMessages ? 'h-full' : 'overflow-y-auto'} ${canClientSendMultipleMessages && 'pb-16'}`}
       >
         {body.grpc
@@ -325,6 +327,7 @@ const GrpcBody = ({ item, collection, handleRun }) => {
             <button
               onClick={addNewMessage}
               className="add-message-btn flex items-center justify-center gap-2 py-2 px-4 rounded-md border border-neutral-200 dark:border-neutral-800 bg-neutral-100 dark:bg-neutral-700 hover:bg-neutral-200 dark:hover:bg-neutral-600 transition-colors shadow-md"
+              data-testid="grpc-add-message-button"
             >
               <IconPlus size={16} strokeWidth={1.5} className="text-neutral-700 dark:text-neutral-300" />
               <span className="font-medium text-sm text-neutral-700 dark:text-neutral-300">Add Message</span>
diff --git a/packages/bruno-app/src/components/RequestPane/GrpcQueryUrl/MethodDropdown/index.js b/packages/bruno-app/src/components/RequestPane/GrpcQueryUrl/MethodDropdown/index.js
index 8c7845ed75..18814db396 100644
--- a/packages/bruno-app/src/components/RequestPane/GrpcQueryUrl/MethodDropdown/index.js
+++ b/packages/bruno-app/src/components/RequestPane/GrpcQueryUrl/MethodDropdown/index.js
@@ -73,7 +73,7 @@ const MethodDropdown = ({
 
   const MethodsDropdownIcon = forwardRef((props, ref) => {
     return (
-      <div ref={ref} className="flex items-center justify-center ml-2 cursor-pointer select-none">
+      <div ref={ref} className="flex items-center justify-center ml-2 cursor-pointer select-none" data-testid="grpc-method-dropdown-trigger">
         {selectedGrpcMethod && <div className="mr-2">{getIconForMethodType(selectedGrpcMethod.type)}</div>}
         <span className="text-xs">
           {selectedGrpcMethod ? (
diff --git a/packages/bruno-app/src/components/RequestPane/GrpcQueryUrl/index.js b/packages/bruno-app/src/components/RequestPane/GrpcQueryUrl/index.js
index c8b7cd09bb..fb1911e3b3 100644
--- a/packages/bruno-app/src/components/RequestPane/GrpcQueryUrl/index.js
+++ b/packages/bruno-app/src/components/RequestPane/GrpcQueryUrl/index.js
@@ -389,19 +389,21 @@ const GrpcQueryUrl = ({ item, collection, handleRun }) => {
 
           {isConnectionActive && isStreamingMethod && (
             <div className="connection-controls relative flex items-center h-full gap-3">
-              <div className="infotip" onClick={handleCancelConnection}>
+              <div className="infotip" onClick={handleCancelConnection} data-testid="grpc-cancel-connection-button">
                 <IconX color={theme.requestTabs.icon.color} strokeWidth={1.5} size={22} className="cursor-pointer" />
                 <span className="infotip-text text-xs">Cancel</span>
               </div>
 
-            {isClientStreamingMethod && <div onClick={handleEndConnection}>
-                <IconCheck
-                  color={theme.colors.text.green}
-                  strokeWidth={2}
-                  size={22}
-                  className="cursor-pointer"
-                />
-              </div>}
+              {isClientStreamingMethod && (
+                <div onClick={handleEndConnection} data-testid="grpc-end-connection-button">
+                  <IconCheck
+                    color={theme.colors.text.green}
+                    strokeWidth={2}
+                    size={22}
+                    className="cursor-pointer"
+                  />
+                </div>
+              )}
             </div>
           )}
 
diff --git a/packages/bruno-app/src/components/ResponsePane/GrpcResponsePane/GrpcQueryResult/index.js b/packages/bruno-app/src/components/ResponsePane/GrpcResponsePane/GrpcQueryResult/index.js
index c6ceeff611..6d6c646e36 100644
--- a/packages/bruno-app/src/components/ResponsePane/GrpcResponsePane/GrpcQueryResult/index.js
+++ b/packages/bruno-app/src/components/ResponsePane/GrpcResponsePane/GrpcQueryResult/index.js
@@ -61,13 +61,13 @@ const GrpcQueryResult = ({ item, collection }) => {
   }
 
   return (
-    <StyledWrapper className="w-full h-full relative flex flex-col mt-2">
+    <StyledWrapper className="w-full h-full relative flex flex-col mt-2" data-testid="grpc-response-content">
       {hasError && showErrorMessage && <GrpcError error={errorMessage} onClose={() => setShowErrorMessage(false)} />}
       {hasResponses && (
-        <div className={`overflow-y-auto ${responsesList.length === 1 ? 'flex-1' : ''}`}>
+        <div className={`overflow-y-auto ${responsesList.length === 1 ? 'flex-1' : ''}`} data-testid="grpc-responses-container">
           {responsesList.length === 1 ? (
             // Single message - render directly without accordion
-            <div className="h-full">
+            <div className="h-full" data-testid="grpc-single-response">
               <CodeEditor
                 collection={collection}
                 font={get(preferences, 'font.codeFont', 'default')}
@@ -80,13 +80,13 @@ const GrpcQueryResult = ({ item, collection }) => {
             </div>
           ) : (
             // Multiple messages - use accordion
-            <Accordion defaultIndex={0}>
+            <Accordion defaultIndex={0} dataTestId="grpc-responses-accordion">
               {reversedResponsesList.map((response, index) => {
                 // Calculate the original response number (for display purposes)
                 const originalIndex = responsesList.length - index - 1;
 
                 return (
-                  <Accordion.Item key={originalIndex} index={index}>
+                  <Accordion.Item key={originalIndex} index={index} data-testid={`grpc-response-item-${originalIndex}`}>
                     <Accordion.Header index={index} style={{ padding: '8px 12px', minHeight: '40px' }}>
                       <div className="flex justify-between w-full">
                         <div className="font-medium">
diff --git a/packages/bruno-app/src/components/ResponsePane/GrpcResponsePane/index.js b/packages/bruno-app/src/components/ResponsePane/GrpcResponsePane/index.js
index 81ab5bc1ee..b0dd18c097 100644
--- a/packages/bruno-app/src/components/ResponsePane/GrpcResponsePane/index.js
+++ b/packages/bruno-app/src/components/ResponsePane/GrpcResponsePane/index.js
@@ -108,7 +108,7 @@ const GrpcResponsePane = ({ item, collection }) => {
 
   return (
     <StyledWrapper className="flex flex-col h-full relative">
-      <div className="flex flex-wrap items-center pl-3 pr-4 tabs" role="tablist">
+      <div className="flex flex-wrap items-center pl-3 pr-4 tabs" role="tablist" data-testid="grpc-response-tabs">
         {tabConfig.map((tab) => (
           <Tab
             key={tab.name}
diff --git a/packages/bruno-app/src/components/Tab/index.js b/packages/bruno-app/src/components/Tab/index.js
index dd74c92610..4253a57f7e 100644
--- a/packages/bruno-app/src/components/Tab/index.js
+++ b/packages/bruno-app/src/components/Tab/index.js
@@ -11,10 +11,11 @@ const Tab = ({ name, label, isActive, onClick, count = 0, className = '', ...pro
       className={tabClassName} 
       role="tab" 
       onClick={() => onClick(name)}
+      data-testid={`tab-${name}`}
       {...props}
     >
       {label}
-      {count > 0 && <sup className="ml-1 font-medium">{count}</sup>}
+      {count > 0 && <sup className="ml-1 font-medium" data-testid={`tab-${name}-count`}>{count}</sup>}
     </div>
   );
 };
diff --git a/tests/grpc/make-request/collection/HelloService/BidiHello.bru b/tests/grpc/make-request/collection/HelloService/BidiHello.bru
new file mode 100644
index 0000000000..77b0daf539
--- /dev/null
+++ b/tests/grpc/make-request/collection/HelloService/BidiHello.bru
@@ -0,0 +1,31 @@
+meta {
+  name: BidiHello
+  type: grpc
+  seq: 4
+}
+
+grpc {
+  url: {{host}}
+  method: /hello.HelloService/BidiHello
+  body: grpc
+  auth: inherit
+  methodType: bidi-streaming
+}
+
+body:grpc {
+  name: message 1
+  content: '''
+    {
+      "greeting": "cuius"
+    }
+  '''
+}
+
+body:grpc {
+  name: message 2
+  content: '''
+    {
+      "greeting": "adfectus"
+    }
+  '''
+}
diff --git a/tests/grpc/make-request/collection/HelloService/LotOfGreetings.bru b/tests/grpc/make-request/collection/HelloService/LotOfGreetings.bru
new file mode 100644
index 0000000000..473d6e28d7
--- /dev/null
+++ b/tests/grpc/make-request/collection/HelloService/LotOfGreetings.bru
@@ -0,0 +1,31 @@
+meta {
+  name: LotOfGreetings
+  type: grpc
+  seq: 3
+}
+
+grpc {
+  url: {{host}}
+  method: /hello.HelloService/LotsOfGreetings
+  body: grpc
+  auth: inherit
+  methodType: client-streaming
+}
+
+body:grpc {
+  name: message 1
+  content: '''
+    {
+      "greeting": "sortitus"
+    }
+  '''
+}
+
+body:grpc {
+  name: message 2
+  content: '''
+    {
+      "greeting": "porro"
+    }
+  '''
+}
diff --git a/tests/grpc/make-request/collection/HelloService/LotOfReplies.bru b/tests/grpc/make-request/collection/HelloService/LotOfReplies.bru
new file mode 100644
index 0000000000..c0556bb7e8
--- /dev/null
+++ b/tests/grpc/make-request/collection/HelloService/LotOfReplies.bru
@@ -0,0 +1,22 @@
+meta {
+  name: LotOfReplies
+  type: grpc
+  seq: 2
+}
+
+grpc {
+  url: {{host}}
+  method: /hello.HelloService/LotsOfReplies
+  body: grpc
+  auth: inherit
+  methodType: server-streaming
+}
+
+body:grpc {
+  name: message 1
+  content: '''
+    {
+      "greeting": "suadeo"
+    }
+  '''
+}
diff --git a/tests/grpc/make-request/collection/HelloService/SayHello.bru b/tests/grpc/make-request/collection/HelloService/SayHello.bru
new file mode 100644
index 0000000000..8b6ee12ad7
--- /dev/null
+++ b/tests/grpc/make-request/collection/HelloService/SayHello.bru
@@ -0,0 +1,22 @@
+meta {
+  name: SayHello
+  type: grpc
+  seq: 1
+}
+
+grpc {
+  url: {{host}}
+  method: /hello.HelloService/SayHello
+  body: grpc
+  auth: inherit
+  methodType: unary
+}
+
+body:grpc {
+  name: message 1
+  content: '''
+    {
+      "greeting": "amoveo"
+    }
+  '''
+}
diff --git a/tests/grpc/make-request/collection/HelloService/folder.bru b/tests/grpc/make-request/collection/HelloService/folder.bru
new file mode 100644
index 0000000000..f69c645289
--- /dev/null
+++ b/tests/grpc/make-request/collection/HelloService/folder.bru
@@ -0,0 +1,8 @@
+meta {
+  name: HelloService
+  seq: 2
+}
+
+auth {
+  mode: inherit
+}
diff --git a/tests/grpc/make-request/collection/bruno.json b/tests/grpc/make-request/collection/bruno.json
new file mode 100644
index 0000000000..50c4d912e3
--- /dev/null
+++ b/tests/grpc/make-request/collection/bruno.json
@@ -0,0 +1,33 @@
+{
+  "version": "1",
+  "name": "Grpcbin",
+  "type": "collection",
+  "ignore": [
+    "node_modules",
+    ".git"
+  ],
+  "size": 0.001827239990234375,
+  "filesCount": 10,
+  "protobuf": {
+    "protoFiles": [
+      {
+        "path": "../protos/services/product.proto",
+        "type": "file"
+      },
+      {
+        "path": "../protos/services/order.proto",
+        "type": "file"
+      }
+    ],
+    "importPaths": [
+      {
+        "path": "../protos/types",
+        "enabled": false
+      },
+      {
+        "path": ".",
+        "enabled": true
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/tests/grpc/make-request/collection/collection.bru b/tests/grpc/make-request/collection/collection.bru
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/grpc/make-request/collection/environments/Env.bru b/tests/grpc/make-request/collection/environments/Env.bru
new file mode 100644
index 0000000000..c5dbd6b76a
--- /dev/null
+++ b/tests/grpc/make-request/collection/environments/Env.bru
@@ -0,0 +1,3 @@
+vars {
+  host: grpc://grpcb.in:9000
+}
diff --git a/tests/grpc/make-request/init-user-data/collection-security.json b/tests/grpc/make-request/init-user-data/collection-security.json
new file mode 100644
index 0000000000..711cc88b46
--- /dev/null
+++ b/tests/grpc/make-request/init-user-data/collection-security.json
@@ -0,0 +1,10 @@
+{
+  "collections": [
+    {
+      "path": "{{projectRoot}}/tests/grpc/make-request/collection",
+      "securityConfig": {
+        "jsSandboxMode": "safe"
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/tests/grpc/make-request/init-user-data/preferences.json b/tests/grpc/make-request/init-user-data/preferences.json
new file mode 100644
index 0000000000..c2ca3fd4a7
--- /dev/null
+++ b/tests/grpc/make-request/init-user-data/preferences.json
@@ -0,0 +1,12 @@
+{
+    "maximized": true,
+    "lastOpenedCollections": [
+        "{{projectRoot}}/tests/grpc/make-request/collection"
+    ],
+    "preferences": {
+        "beta": {
+            "grpc": true,
+            "nodevm": false
+        }
+    }
+}
\ No newline at end of file
diff --git a/tests/grpc/make-request/make-request.spec.ts b/tests/grpc/make-request/make-request.spec.ts
new file mode 100644
index 0000000000..3aa6306189
--- /dev/null
+++ b/tests/grpc/make-request/make-request.spec.ts
@@ -0,0 +1,202 @@
+import { test, expect } from '../../../playwright';
+import { buildGrpcCommonLocators } from '../../utils/page/locators';
+
+test.describe('make grpc requests', () => {
+  const setupGrpcTest = async (page) => {
+    const locators = buildGrpcCommonLocators(page);
+
+    await test.step('navigate to gRPC collection', async () => {
+      await locators.sidebar.collection('Grpcbin').click();
+      await locators.sidebar.folder('HelloService').click();
+    });
+
+    await test.step('select environment', async () => {
+      await locators.environment.selector().click();
+      await locators.environment.collectionTab().click();
+      await locators.environment.envOption('Env').click();
+    });
+  };
+
+  test('make unary request', async ({ pageWithUserData: page }) => {
+    await setupGrpcTest(page);
+    const locators = buildGrpcCommonLocators(page);
+
+    await test.step('select unary method', async () => {
+      await locators.sidebar.request('SayHello').click();
+      await expect(locators.method.dropdownTrigger()).toContainText('HelloService/SayHello');
+    });
+
+    await test.step('verify gRPC unary request is opened successfully', async () => {
+      await expect(locators.method.indicator()).toContainText('gRPC');
+      await expect(locators.request.queryUrlContainer().locator('.CodeMirror')).toBeVisible();
+      await expect(locators.request.sendButton()).toBeVisible();
+      await expect(locators.request.messagesContainer()).toBeVisible();
+    });
+
+    await test.step('send request', async () => {
+      await locators.request.sendButton().click();
+      await expect(locators.response.statusCode()).toBeVisible({ timeout: 2000 });
+      await expect(locators.response.statusText()).toBeVisible({ timeout: 2000 });
+      await expect(locators.response.statusCode()).toHaveText(/0/);
+      await expect(locators.response.statusText()).toHaveText(/OK/);
+    });
+
+    await test.step('verify response message count', async () => {
+      await expect(locators.response.tabCount()).toHaveText('1');
+    });
+
+    await test.step('verify response items are rendered', async () => {
+      await expect(locators.response.content()).toBeVisible();
+      await expect(locators.response.container()).toBeVisible();
+      await expect(locators.response.singleResponse()).toBeVisible();
+    });
+
+    /* TODO: Reflection fetching incorrectly marks requests as modified, causing save indicators to appear. This save step prevents test timeouts by clearing the modified state. This is a temporary workaround until the reflection fetching issue is resolved. */
+    await test.step('save request via shortcut', async () => {
+      await page.keyboard.press('Meta+s');
+    });
+  });
+
+  test('make server streaming request', async ({ pageWithUserData: page }) => {
+    await setupGrpcTest(page);
+    const locators = buildGrpcCommonLocators(page);
+
+    await test.step('select server streaming method', async () => {
+      await locators.sidebar.request('LotOfReplies').click();
+      await expect(locators.method.dropdownTrigger()).toContainText('HelloService/LotsOfReplies');
+    });
+
+    await test.step('verify gRPC server streaming request is opened successfully', async () => {
+      await expect(locators.method.indicator()).toContainText('gRPC');
+      await expect(locators.request.queryUrlContainer().locator('.CodeMirror')).toBeVisible();
+      await expect(locators.request.messagesContainer()).toBeVisible();
+      await expect(locators.request.sendButton()).toBeVisible();
+    });
+
+    await test.step('send request', async () => {
+      await locators.request.sendButton().click();
+      await expect(locators.response.statusCode()).toBeVisible({ timeout: 2000 });
+      await expect(locators.response.statusText()).toBeVisible({ timeout: 2000 });
+      await expect(locators.response.statusCode()).toHaveText(/0/);
+      await expect(locators.response.statusText()).toHaveText(/OK/);
+    });
+
+    await test.step('verify response message count', async () => {
+      await expect(locators.response.tabCount()).toHaveText('10');
+    });
+
+    await test.step('verify response items are rendered', async () => {
+      await expect(locators.response.content()).toBeVisible();
+      await expect(locators.response.container()).toBeVisible();
+      await expect(locators.response.accordion()).toBeVisible();
+      await expect(locators.response.responseItems()).toHaveCount(10);
+    });
+
+    /* TODO: Reflection fetching incorrectly marks requests as modified, causing save indicators to appear. This save step prevents test timeouts by clearing the modified state. This is a temporary workaround until the reflection fetching issue is resolved. */
+    await test.step('save request via shortcut', async () => {
+      await page.keyboard.press('Meta+s');
+    });
+  });
+
+  test('make client streaming request', async ({ pageWithUserData: page }) => {
+    await setupGrpcTest(page);
+    const locators = buildGrpcCommonLocators(page);
+
+    await test.step('select client streaming method', async () => {
+      await locators.sidebar.request('LotOfGreetings').click();
+      await expect(locators.method.dropdownTrigger()).toContainText('HelloService/LotsOfGreetings');
+    });
+
+    await test.step('verify gRPC client streaming request is opened successfully', async () => {
+      await expect(locators.request.queryUrlContainer().locator('.CodeMirror')).toBeVisible();
+      await expect(locators.request.messagesContainer()).toBeVisible();
+      await expect(locators.request.addMessageButton()).toBeVisible();
+      await expect(locators.request.sendMessage(0)).toBeVisible();
+      await expect(locators.request.sendButton()).toBeVisible();
+    });
+
+    await test.step('start client streaming connection', async () => {
+      await locators.request.sendButton().click();
+      await expect(locators.request.endConnectionButton()).toBeVisible();
+    });
+
+    await test.step('send individual message', async () => {
+      await locators.request.sendMessage(0).click();
+    });
+
+    await test.step('end client streaming connection', async () => {
+      await locators.request.endConnectionButton().click();
+      await expect(locators.response.statusCode()).toBeVisible({ timeout: 2000 });
+      await expect(locators.response.statusText()).toBeVisible({ timeout: 2000 });
+      await expect(locators.response.statusCode()).toHaveText(/0/);
+      await expect(locators.response.statusText()).toHaveText(/OK/);
+    });
+
+    await test.step('verify response message count', async () => {
+      await expect(locators.response.tabCount()).toHaveText('1');
+    });
+
+    await test.step('verify response items are rendered', async () => {
+      await expect(locators.response.content()).toBeVisible();
+      await expect(locators.response.container()).toBeVisible();
+      await expect(locators.response.singleResponse()).toBeVisible();
+    });
+
+    /* TODO: Reflection fetching incorrectly marks requests as modified, causing save indicators to appear. This save step prevents test timeouts by clearing the modified state. This is a temporary workaround until the reflection fetching issue is resolved. */
+    await test.step('save request via shortcut', async () => {
+      await page.keyboard.press('Meta+s');
+    });
+  });
+
+  test('make bidi streaming request', async ({ pageWithUserData: page }) => {
+    await setupGrpcTest(page);
+    const locators = buildGrpcCommonLocators(page);
+
+    await test.step('select bidirectional streaming method', async () => {
+      await locators.sidebar.request('BidiHello').click();
+      await expect(locators.method.dropdownTrigger()).toContainText('HelloService/BidiHello');
+    });
+
+    await test.step('verify gRPC bidi streaming request is opened successfully', async () => {
+      await expect(locators.request.queryUrlContainer().locator('.CodeMirror')).toBeVisible();
+      await expect(locators.request.messagesContainer()).toBeVisible();
+      await expect(locators.request.addMessageButton()).toBeVisible();
+      await expect(locators.request.sendMessage(0)).toBeVisible();
+      await expect(locators.request.sendButton()).toBeVisible();
+    });
+
+    await test.step('start bidirectional streaming connection', async () => {
+      await locators.request.sendButton().click();
+      await expect(locators.request.endConnectionButton()).toBeVisible();
+    });
+
+    await test.step('send individual message', async () => {
+      await locators.request.sendMessage(0).click();
+      await locators.request.sendMessage(1).click();
+    });
+
+    await test.step('end bidirectional streaming connection', async () => {
+      await locators.request.endConnectionButton().click();
+      await expect(locators.response.statusCode()).toBeVisible({ timeout: 2000 });
+      await expect(locators.response.statusText()).toBeVisible({ timeout: 2000 });
+      await expect(locators.response.statusCode()).toHaveText(/0/);
+      await expect(locators.response.statusText()).toHaveText(/OK/);
+    });
+
+    await test.step('verify response message count', async () => {
+      await expect(locators.response.tabCount()).toHaveText('2');
+    });
+
+    await test.step('verify response items are rendered', async () => {
+      await expect(locators.response.content()).toBeVisible();
+      await expect(locators.response.container()).toBeVisible();
+      await expect(locators.response.accordion()).toBeVisible();
+      await expect(locators.response.responseItems()).toHaveCount(2);
+    });
+
+    /* TODO: Reflection fetching incorrectly marks requests as modified, causing save indicators to appear. This save step prevents test timeouts by clearing the modified state. This is a temporary workaround until the reflection fetching issue is resolved. */
+    await test.step('save request via shortcut', async () => {
+      await page.keyboard.press('Meta+s');
+    });
+  });
+});
diff --git a/tests/utils/page/locators.ts b/tests/utils/page/locators.ts
index cf9d200ca2..85f383e53e 100644
--- a/tests/utils/page/locators.ts
+++ b/tests/utils/page/locators.ts
@@ -41,6 +41,12 @@ export const buildCommonLocators = (page: Page) => ({
   modal: {
     title: (title: string) => page.locator('.bruno-modal-header-title').filter({ hasText: title }),
     button: (name: string) => page.getByRole('button', { name: name, exact: true })
+  },
+  environment: {
+    selector: () => page.getByTestId('environment-selector-trigger'),
+    collectionTab: () => page.getByTestId('env-tab-collection'),
+    globalTab: () => page.getByTestId('env-tab-global'),
+    envOption: (name: string) => page.locator('.dropdown-item').getByText(name, { exact: true })
   }
 });
 
@@ -65,3 +71,31 @@ export const buildWebsocketCommonLocators = (page: Page) => ({
     clearResponse: () => page.getByRole('button', { name: 'Clear Response' })
   }
 });
+
+export const buildGrpcCommonLocators = (page: Page) => ({
+  ...buildCommonLocators(page),
+  method: {
+    dropdownTrigger: () => page.getByTestId('grpc-method-dropdown-trigger'),
+    indicator: () => page.getByTestId('grpc-method-indicator')
+  },
+  request: {
+    queryUrlContainer: () => page.getByTestId('grpc-query-url-container'),
+    sendButton: () => page.getByTestId('grpc-send-request-button'),
+    messagesContainer: () => page.getByTestId('grpc-messages-container'),
+    addMessageButton: () => page.getByTestId('grpc-add-message-button'),
+    sendMessage: (index: number) => page.getByTestId(`grpc-send-message-${index}`),
+    endConnectionButton: () => page.getByTestId('grpc-end-connection-button'),
+    cancelConnectionButton: () => page.getByTestId('grpc-cancel-connection-button')
+  },
+  response: {
+    statusCode: () => page.getByTestId('grpc-response-status-code'),
+    statusText: () => page.getByTestId('grpc-response-status-text'),
+    content: () => page.getByTestId('grpc-response-content'),
+    container: () => page.getByTestId('grpc-responses-container'),
+    singleResponse: () => page.getByTestId('grpc-single-response'),
+    accordion: () => page.getByTestId('grpc-responses-accordion'),
+    responseItem: (index: number) => page.getByTestId(`grpc-response-item-${index}`),
+    responseItems: () => page.locator('[data-testid^="grpc-response-item-"]'),
+    tabCount: () => page.getByTestId('tab-response-count')
+  }
+});

From 2ef1a1948b6710771d8a17fa6af51d4e9deb9652 Mon Sep 17 00:00:00 2001
From: Bijin Bruno <bijin@usebruno.com>
Date: Thu, 13 Nov 2025 18:23:34 +0530
Subject: [PATCH 2/2] chore: minor folder structure refactor

---
 .../collection/HelloService/BidiHello.bru       |  0
 .../collection/HelloService/LotOfGreetings.bru  |  0
 .../collection/HelloService/LotOfReplies.bru    |  0
 .../collection/HelloService/SayHello.bru        |  0
 .../collection/HelloService/folder.bru          |  0
 .../{ => fixtures}/collection/bruno.json        |  0
 .../{ => fixtures}/collection/collection.bru    |  0
 .../collection/environments/Env.bru             |  0
 .../init-user-data/collection-security.json     |  2 +-
 .../init-user-data/preferences.json             | 17 ++++++++---------
 .../metadata/init-user-data/preferences.json    |  2 +-
 .../init-user-data/preferences.json             |  5 +----
 12 files changed, 11 insertions(+), 15 deletions(-)
 rename tests/grpc/make-request/{ => fixtures}/collection/HelloService/BidiHello.bru (100%)
 rename tests/grpc/make-request/{ => fixtures}/collection/HelloService/LotOfGreetings.bru (100%)
 rename tests/grpc/make-request/{ => fixtures}/collection/HelloService/LotOfReplies.bru (100%)
 rename tests/grpc/make-request/{ => fixtures}/collection/HelloService/SayHello.bru (100%)
 rename tests/grpc/make-request/{ => fixtures}/collection/HelloService/folder.bru (100%)
 rename tests/grpc/make-request/{ => fixtures}/collection/bruno.json (100%)
 rename tests/grpc/make-request/{ => fixtures}/collection/collection.bru (100%)
 rename tests/grpc/make-request/{ => fixtures}/collection/environments/Env.bru (100%)

diff --git a/tests/grpc/make-request/collection/HelloService/BidiHello.bru b/tests/grpc/make-request/fixtures/collection/HelloService/BidiHello.bru
similarity index 100%
rename from tests/grpc/make-request/collection/HelloService/BidiHello.bru
rename to tests/grpc/make-request/fixtures/collection/HelloService/BidiHello.bru
diff --git a/tests/grpc/make-request/collection/HelloService/LotOfGreetings.bru b/tests/grpc/make-request/fixtures/collection/HelloService/LotOfGreetings.bru
similarity index 100%
rename from tests/grpc/make-request/collection/HelloService/LotOfGreetings.bru
rename to tests/grpc/make-request/fixtures/collection/HelloService/LotOfGreetings.bru
diff --git a/tests/grpc/make-request/collection/HelloService/LotOfReplies.bru b/tests/grpc/make-request/fixtures/collection/HelloService/LotOfReplies.bru
similarity index 100%
rename from tests/grpc/make-request/collection/HelloService/LotOfReplies.bru
rename to tests/grpc/make-request/fixtures/collection/HelloService/LotOfReplies.bru
diff --git a/tests/grpc/make-request/collection/HelloService/SayHello.bru b/tests/grpc/make-request/fixtures/collection/HelloService/SayHello.bru
similarity index 100%
rename from tests/grpc/make-request/collection/HelloService/SayHello.bru
rename to tests/grpc/make-request/fixtures/collection/HelloService/SayHello.bru
diff --git a/tests/grpc/make-request/collection/HelloService/folder.bru b/tests/grpc/make-request/fixtures/collection/HelloService/folder.bru
similarity index 100%
rename from tests/grpc/make-request/collection/HelloService/folder.bru
rename to tests/grpc/make-request/fixtures/collection/HelloService/folder.bru
diff --git a/tests/grpc/make-request/collection/bruno.json b/tests/grpc/make-request/fixtures/collection/bruno.json
similarity index 100%
rename from tests/grpc/make-request/collection/bruno.json
rename to tests/grpc/make-request/fixtures/collection/bruno.json
diff --git a/tests/grpc/make-request/collection/collection.bru b/tests/grpc/make-request/fixtures/collection/collection.bru
similarity index 100%
rename from tests/grpc/make-request/collection/collection.bru
rename to tests/grpc/make-request/fixtures/collection/collection.bru
diff --git a/tests/grpc/make-request/collection/environments/Env.bru b/tests/grpc/make-request/fixtures/collection/environments/Env.bru
similarity index 100%
rename from tests/grpc/make-request/collection/environments/Env.bru
rename to tests/grpc/make-request/fixtures/collection/environments/Env.bru
diff --git a/tests/grpc/make-request/init-user-data/collection-security.json b/tests/grpc/make-request/init-user-data/collection-security.json
index 711cc88b46..f91f9e1afb 100644
--- a/tests/grpc/make-request/init-user-data/collection-security.json
+++ b/tests/grpc/make-request/init-user-data/collection-security.json
@@ -1,7 +1,7 @@
 {
   "collections": [
     {
-      "path": "{{projectRoot}}/tests/grpc/make-request/collection",
+      "path": "{{projectRoot}}/tests/grpc/make-request/fixtures/collection",
       "securityConfig": {
         "jsSandboxMode": "safe"
       }
diff --git a/tests/grpc/make-request/init-user-data/preferences.json b/tests/grpc/make-request/init-user-data/preferences.json
index c2ca3fd4a7..a87c220ad0 100644
--- a/tests/grpc/make-request/init-user-data/preferences.json
+++ b/tests/grpc/make-request/init-user-data/preferences.json
@@ -1,12 +1,11 @@
 {
-    "maximized": true,
-    "lastOpenedCollections": [
-        "{{projectRoot}}/tests/grpc/make-request/collection"
-    ],
-    "preferences": {
-        "beta": {
-            "grpc": true,
-            "nodevm": false
-        }
+  "maximized": false,
+  "lastOpenedCollections": [
+    "{{projectRoot}}/tests/grpc/make-request/fixtures/collection"
+  ],
+  "preferences": {
+    "beta": {
+      "nodevm": false
     }
+  }
 }
\ No newline at end of file
diff --git a/tests/grpc/metadata/init-user-data/preferences.json b/tests/grpc/metadata/init-user-data/preferences.json
index f0405920e9..ed17e31c5b 100644
--- a/tests/grpc/metadata/init-user-data/preferences.json
+++ b/tests/grpc/metadata/init-user-data/preferences.json
@@ -1,5 +1,5 @@
 {
-  "maximized": true,
+  "maximized": false,
   "lastOpenedCollections": [
     "{{projectRoot}}/tests/grpc/metadata/fixtures/collection"
   ],
diff --git a/tests/grpc/method-search/init-user-data/preferences.json b/tests/grpc/method-search/init-user-data/preferences.json
index b2bb8145b9..baa9643f1d 100644
--- a/tests/grpc/method-search/init-user-data/preferences.json
+++ b/tests/grpc/method-search/init-user-data/preferences.json
@@ -2,8 +2,5 @@
   "maximized": false,
   "lastOpenedCollections": [
       "{{projectRoot}}/tests/grpc/method-search/fixtures/grpc-collection"
-  ],
-  "beta": {
-      "grpc": true
-  }
+  ]
 }
\ No newline at end of file