From 580d681e0a5c0f158b4fc063676e013e7787bcd9 Mon Sep 17 00:00:00 2001
From: Anoop M D <anoop.md1421@gmail.com>
Date: Tue, 7 Feb 2023 02:58:44 +0530
Subject: [PATCH] fix: fixing issues in bru cli

---
 packages/bruno-cli/src/commands/run.js        |  4 +++-
 .../src/runner/run-single-request.js          | 20 +++++++++----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/packages/bruno-cli/src/commands/run.js b/packages/bruno-cli/src/commands/run.js
index 62ae74ad5..92404ea1f 100644
--- a/packages/bruno-cli/src/commands/run.js
+++ b/packages/bruno-cli/src/commands/run.js
@@ -32,7 +32,9 @@ const handler = async function (argv) {
 
     const _isFile = await isFile(filename);
     if(_isFile) {
-      runSingleRequest(filename, collectionPath, collectionVariables);
+      console.log(chalk.yellow('Running Request \n'));
+      await runSingleRequest(filename, collectionPath, collectionVariables);
+      console.log(chalk.green('\nDone!'));
     }
   } catch (err) {
     console.error(err);
diff --git a/packages/bruno-cli/src/runner/run-single-request.js b/packages/bruno-cli/src/runner/run-single-request.js
index 8a70c4237..5b3362915 100644
--- a/packages/bruno-cli/src/runner/run-single-request.js
+++ b/packages/bruno-cli/src/runner/run-single-request.js
@@ -55,19 +55,18 @@ const runSingleRequest = async function (filename, collectionPath, collectionVar
 
     const envVars = getEnvVars({});
 
-    if(request.script && request.script.length) {
-      let script = request.script + '\n if (typeof onRequest === "function") {onRequest(__brunoRequest);}';
+    const requestScriptFile = get(bruJson, 'request.script.req');
+    if(requestScriptFile && requestScriptFile.length) {
       const scriptRuntime = new ScriptRuntime();
-      const result = scriptRuntime.runRequestScript(script, request, envVars, collectionVariables, collectionPath);
+      const result = scriptRuntime.runRequestScript(requestScriptFile, request, envVars, collectionVariables, collectionPath);
     }
 
     const response = await axios(request);
 
-    const scriptFile = get(bruJson, 'request.script');
-    if(scriptFile && scriptFile.length) {
-      let script = scriptFile + '\n if (typeof onResponse === "function") {onResponse(__brunoResponse);}';
+    const responseScriptFile = get(bruJson, 'request.script.req');
+    if(responseScriptFile && responseScriptFile.length) {
       const scriptRuntime = new ScriptRuntime();
-      const result = scriptRuntime.runResponseScript(script, response, envVars, collectionVariables, collectionPath);
+      const result = scriptRuntime.runResponseScript(responseScriptFile, response, envVars, collectionVariables, collectionPath);
     }
 
     let testResults = [];
@@ -78,19 +77,18 @@ const runSingleRequest = async function (filename, collectionPath, collectionVar
       testResults = get(result, 'results', []);
     }
 
-    console.log(JSON.stringify(bruJson, null, 2));
-
     console.log(chalk.green(stripExtension(filename)) + chalk.dim(` (${response.status} ${response.statusText})`));
     if(testResults && testResults.length) {
       each(testResults, (testResult) => {
         if(testResult.status === 'pass') {
-          console.log(chalk.green(`   ✔️ `) + chalk.dim(testResult.description));
+          console.log(chalk.green(`   ✓ `) + chalk.dim(testResult.description));
         } else {
-          console.log(chalk.red(`   ✘ `) + chalk.red(testResult.description));
+          console.log(chalk.red(`   ✕ `) + chalk.red(testResult.description));
         }
       });
     }
   } catch (err) {
+    console.log(err.response);
     Promise.reject(err);
   }
 };