From 37f914d1cc6f18e0890cf2aad33ef44b549bd1c7 Mon Sep 17 00:00:00 2001 From: Scott Dutton Date: Mon, 19 Oct 2020 03:11:01 +0100 Subject: [PATCH] Possible solution for Global variables (#1289) fix for #1164 This takes enviroments called "Global" or "global" and appends them after the current scripts. Seems to work, but proabbly a cleaner way to acheive Co-authored-by: Liyas Thomas --- components/environments/index.vue | 4 +++- pages/index.vue | 20 +++++++++++++++++--- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/components/environments/index.vue b/components/environments/index.vue index 53823c52d..7886ad351 100644 --- a/components/environments/index.vue +++ b/components/environments/index.vue @@ -34,7 +34,9 @@ :environmentIndex="index" :environment="environment" @edit-environment="editEnvironment(environment, index)" - @select-environment="$emit('use-environment', environment)" + @select-environment=" + $emit('use-environment', { environment: environment, environments: environments }) + " /> diff --git a/pages/index.vue b/pages/index.vue index 0b0e2b37d..791c44a68 100644 --- a/pages/index.vue +++ b/pages/index.vue @@ -1829,14 +1829,28 @@ export default { }, }, methods: { - useSelectedEnvironment(environment) { + useSelectedEnvironment(args) { + let environment = args.environment + let environments = args.environments let preRequestScriptString = "" for (let variable of environment.variables) { - preRequestScriptString = - preRequestScriptString + `pw.env.set('${variable.key}', '${variable.value}');\n` + preRequestScriptString += `pw.env.set('${variable.key}', '${variable.value}');\n` + } + for (let env of environments) { + if (env.name === environment.name) { + continue + } + + if (env.name === "Globals" || env.name === "globals") { + preRequestScriptString += this.useSelectedEnvironment({ + environment: env, + environments: environments, + }) + } } this.preRequestScript = preRequestScriptString this.showPreRequestScript = true + return preRequestScriptString }, checkCollections() { const checkCollectionAvailability =