From 98c53cf44315e468de6930f4c76b5ae65502e3d3 Mon Sep 17 00:00:00 2001 From: lohit Date: Mon, 29 Jul 2024 11:04:29 +0530 Subject: [PATCH] update natural to sequential (#2717) --- packages/bruno-electron/src/ipc/network/index.js | 6 +++--- packages/bruno-electron/src/ipc/network/prepare-request.js | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/bruno-electron/src/ipc/network/index.js b/packages/bruno-electron/src/ipc/network/index.js index c384ba71e..9659f45b4 100644 --- a/packages/bruno-electron/src/ipc/network/index.js +++ b/packages/bruno-electron/src/ipc/network/index.js @@ -408,7 +408,7 @@ const registerNetworkIpc = (mainWindow) => { } // run post-response script - const responseScript = compact(scriptingConfig.flow === 'natural' ? [ + const responseScript = compact(scriptingConfig.flow === 'sequential' ? [ get(collectionRoot, 'request.script.res'), get(request, 'script.res') ] : [ get(request, 'script.res'), get(collectionRoot, 'request.script.res') @@ -596,7 +596,7 @@ const registerNetworkIpc = (mainWindow) => { // run tests const testScript = item.draft ? get(item.draft, 'request.tests') : get(item, 'request.tests'); - const testFile = compact(scriptingConfig.flow === 'natural' ? [ + const testFile = compact(scriptingConfig.flow === 'sequential' ? [ get(collectionRoot, 'request.tests'), testScript, ] : [ testScript, get(collectionRoot, 'request.tests') @@ -1036,7 +1036,7 @@ const registerNetworkIpc = (mainWindow) => { // run tests const testScript = item.draft ? get(item.draft, 'request.tests') : get(item, 'request.tests'); - const testFile = compact(scriptingConfig.flow === 'natural' ? [ + const testFile = compact(scriptingConfig.flow === 'sequential' ? [ get(collectionRoot, 'request.tests'), testScript ] : [ testScript, get(collectionRoot, 'request.tests') diff --git a/packages/bruno-electron/src/ipc/network/prepare-request.js b/packages/bruno-electron/src/ipc/network/prepare-request.js index bada3f9b0..7777253a7 100644 --- a/packages/bruno-electron/src/ipc/network/prepare-request.js +++ b/packages/bruno-electron/src/ipc/network/prepare-request.js @@ -147,7 +147,7 @@ const mergeFolderLevelScripts = (request, requestTreePath, scriptFlow) => { } if (folderCombinedPostResScript.length) { - if (scriptFlow === 'natural') { + if (scriptFlow === 'sequential') { request.script.res = compact([...folderCombinedPostResScript, request?.script?.res || '']).join(os.EOL); } else { request.script.res = compact([request?.script?.res || '', ...folderCombinedPostResScript.reverse()]).join(os.EOL); @@ -155,7 +155,7 @@ const mergeFolderLevelScripts = (request, requestTreePath, scriptFlow) => { } if (folderCombinedTests.length) { - if (scriptFlow === 'natural') { + if (scriptFlow === 'sequential') { request.tests = compact([...folderCombinedTests, request?.tests || '']).join(os.EOL); } else { request.tests = compact([request?.tests || '', ...folderCombinedTests.reverse()]).join(os.EOL); @@ -309,7 +309,7 @@ const prepareRequest = (item, collection) => { } }); - // scriptFlow is either "sandwich" or "natural" + // scriptFlow is either "sandwich" or "sequential" const scriptFlow = collection.brunoConfig?.scripts?.flow ?? 'sandwich'; const requestTreePath = getTreePathFromCollectionToItem(collection, item); if (requestTreePath && requestTreePath.length > 0) {