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 =