Fix environment variables for multi-flow runs (#2163)

* Add e2e-test for environment variables

* Apply environment variables to test suite runs (fixes #2101)

.github/workflows/test-e2e.yaml

@@ -56,6 +56,7 @@ jobs:
       ANDROID_HOME: /home/runner/androidsdk
       ANDROID_SDK_ROOT: /home/runner/androidsdk
       ANDROID_OS_IMAGE: system-images;android-28;google_apis;x86_64
+      MAESTRO_EXAMPLE: test-value
 
     steps:
       - name: Enable KVM group perms

e2e/workspaces/no-app/README.md

@@ -0,0 +1,5 @@
+# No App
+
+For tests that don't require an app to be launched.
+
+Tests of JavaScript or environment variables can be run here.

e2e/workspaces/no-app/environment-variables.yaml

@@ -0,0 +1,6 @@
+appId: com.example.notused
+tags:
+  - passing
+---
+# Relies on MAESTRO_EXAMPLE being set in the environment
+- assertTrue: ${MAESTRO_EXAMPLE == 'test-value'}

maestro-cli/src/main/java/maestro/cli/runner/TestSuiteInteractor.kt

@@ -88,7 +88,11 @@ class TestSuiteInteractor(
 
         // proceed to run all other Flows
         executionPlan.flowsToRun.forEach { flow ->
-            val (result, aiOutput) = runFlow(flow.toFile(), env, maestro, debugOutputPath)
+            val flowFile = flow.toFile()
+            val updatedEnv = env
+                .withInjectedShellEnvVars()
+                .withDefaultEnvVars(flowFile)
+            val (result, aiOutput) = runFlow(flowFile, updatedEnv, maestro, debugOutputPath)
             aiOutputs.add(aiOutput)
 
             if (result.status == FlowStatus.ERROR) {