Merge branch 'main' into feat/take-partial-screenshots

Author: TheKohan

.github/workflows/test-e2e.yaml

@@ -88,9 +88,9 @@ jobs:
           maestro --help
           maestro --version
 
-      - name: Set up bartekpacia/scripts (for install_android_sdk script)
+      - name: Set up mobile-dev-inc/bartek-scripts (for install_android_sdk script)
         run: |
-          git clone https://github.com/bartekpacia/scripts.git $HOME/scripts
+          git clone https://github.com/mobile-dev-inc/bartek-scripts.git $HOME/scripts
           echo "$HOME/scripts/bin" >> $GITHUB_PATH
 
       - name: Set up android-wait-for-emulator script

CHANGELOG.md

@@ -2,6 +2,9 @@
 
 ## Unreleased
 
+## 1.39.0
+
+Released on 2024-10-15
 
 Features:
 - Feature: add `--shard-split` and `--shard-all` options to `maestro test` ([#1955](https://github.com/mobile-dev-inc/maestro/pull/1955) by [Tarek Belkahia](https://github.com/tokou))

e2e/workspaces/wikipedia/android-advanced-flow.yaml

@@ -10,3 +10,4 @@ tags:
 - runScript: scripts/getSearchQuery.js
 - inputText: ${output.result}
 - assertVisible: ${output.result}
+- runFlow: subflows/launch-clearstate-android.yaml

e2e/workspaces/wikipedia/ios-advanced-flow.yaml

@@ -20,3 +20,4 @@ tags:
 - eraseText
 - inputText: qwerty
 - assertVisible: ${output.result}
+- runFlow: subflows/launch-clearstate-ios.yaml

e2e/workspaces/wikipedia/subflows/launch-clearstate-android.yaml

@@ -0,0 +1,6 @@
+appId: org.wikipedia
+---
+- launchApp:
+    clearState: true
+- assertVisible: "Continue"
+- assertVisible: "Skip"

e2e/workspaces/wikipedia/subflows/launch-clearstate-ios.yaml

@@ -0,0 +1,6 @@
+appId: org.wikimedia.wikipedia
+---
+- launchApp:
+    clearState: true
+- assertVisible: "Next"
+- assertVisible: "Skip"

gradle.properties

@@ -2,7 +2,7 @@ android.useAndroidX=true
 android.enableJetifier=true
 kotlin.code.style=official
 GROUP=dev.mobile
-VERSION_NAME=1.38.1
+VERSION_NAME=1.39.0
 POM_DESCRIPTION=Maestro is a server-driven platform-agnostic library that allows to drive tests for both iOS and Android using the same implementation through an intuitive API.
 POM_URL=https://github.com/mobile-dev-inc/maestro
 POM_SCM_URL=https://github.com/mobile-dev-inc/maestro

gradle/libs.versions.toml

@@ -36,6 +36,7 @@ junit = "5.10.2"
 kotlin = "1.8.22"
 kotlinResult = "1.1.18"
 ktor = "2.3.6"
+mockk = "1.12.0"
 mozillaRhino = "1.7.14"
 picocli = "4.6.3"
 selenium = "4.13.0"
@@ -100,6 +101,7 @@ ktor-server-core = { module = "io.ktor:ktor-server-core", version.ref = "ktor" }
 ktor-server-cors = { module = "io.ktor:ktor-server-cors", version.ref = "ktor" }
 ktor-server-netty = { module = "io.ktor:ktor-server-netty", version.ref = "ktor" }
 ktor-server-status-pages = { module = "io.ktor:ktor-server-status-pages", version.ref = "ktor" }
+mockk = { module = "io.mockk:mockk", version.ref = "mockk" }
 mozilla-rhino = { module = "org.mozilla:rhino", version.ref = "mozillaRhino" }
 picocli = { module = "info.picocli:picocli", version.ref = "picocli" }
 picocli-codegen = { module = "info.picocli:picocli-codegen", version.ref = "picocli" }

maestro-ai/src/main/java/maestro/ai/DemoApp.kt

@@ -52,7 +52,7 @@ fun main(args: Array<String>) = DemoApp().main(args)
 class DemoApp : CliktCommand() {
     private val inputFiles: List<Path> by argument(help = "screenshots to use").path(mustExist = true).multiple()
 
-    private val model: String by option(help = "LLM to use").default("gpt-4o-2024-08-06")
+    private val model: String by option(help = "LLM to use").default("gpt-4o")
 
     private val showOnlyFails: Boolean by option(help = "Show only failed tests").flag()
 

maestro-ai/src/main/java/maestro/ai/openai/Client.kt

@@ -22,7 +22,7 @@ private const val API_URL = "https://api.openai.com/v1/chat/completions"
 private val logger = LoggerFactory.getLogger(OpenAI::class.java)
 
 class OpenAI(
-    defaultModel: String = "gpt-4o-2024-08-06",
+    defaultModel: String = "gpt-4o",
     httpClient: HttpClient = defaultHttpClient,
     private val apiKey: String,
     private val defaultTemperature: Float = 0.2f,