From d9ce867c97accf84ba467333605b55487d030269 Mon Sep 17 00:00:00 2001
From: Andrew Carbonetto <andrew.carbonetto@improving.com>
Date: Tue, 10 Sep 2024 17:33:01 -0700
Subject: [PATCH] Merge conflicts

Signed-off-by: Andrew Carbonetto <andrew.carbonetto@improving.com>
---
 node/tests/GlideClient.test.ts | 36 ++++++++++++++++------------------
 1 file changed, 17 insertions(+), 19 deletions(-)

diff --git a/node/tests/GlideClient.test.ts b/node/tests/GlideClient.test.ts
index cb85fdeb98..890f709497 100644
--- a/node/tests/GlideClient.test.ts
+++ b/node/tests/GlideClient.test.ts
@@ -217,25 +217,23 @@ describe("GlideClient", () => {
     );
 
     it.each([
-        {protocol: ProtocolVersion.RESP2, decoder: Decoder.String},
-        {protocol: ProtocolVersion.RESP2, decoder: Decoder.Bytes},
-        {protocol: ProtocolVersion.RESP3, decoder: Decoder.String},
-        {protocol: ProtocolVersion.RESP3, decoder: Decoder.Bytes},
-    ])(
-        `can send transactions_%p`,
-        async ({protocol, decoder}) => {
-            client = await GlideClient.createClient(
-                getClientConfigurationOption(cluster.getAddresses(), protocol),
-            );
-            const transaction = new Transaction();
-            const expectedRes = await transactionTest(
-                transaction,
-                cluster.getVersion(),
-                decoder,
-            );
-            transaction.select(0);
-            const result = await client.exec(transaction, decoder);
-            expectedRes.push(["select(0)", "OK"]);
+        { protocol: ProtocolVersion.RESP2, decoder: Decoder.String },
+        { protocol: ProtocolVersion.RESP2, decoder: Decoder.Bytes },
+        { protocol: ProtocolVersion.RESP3, decoder: Decoder.String },
+        { protocol: ProtocolVersion.RESP3, decoder: Decoder.Bytes },
+    ])(`can send transactions_%p`, async ({ protocol, decoder }) => {
+        client = await GlideClient.createClient(
+            getClientConfigurationOption(cluster.getAddresses(), protocol),
+        );
+        const transaction = new Transaction();
+        const expectedRes = await transactionTest(
+            transaction,
+            cluster.getVersion(),
+            decoder,
+        );
+        transaction.select(0);
+        const result = await client.exec(transaction, decoder);
+        expectedRes.push(["select(0)", "OK"]);
 
         validateTransactionResponse(result, expectedRes);
         client.close();