From 809ad978eb89746db4055246fc65c2a8f9dcd51c Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 4 Jan 2023 14:18:44 +0100
Subject: [PATCH] Paparazzi: Apply fix from
 https://github.com/chrisbanes/paparazzi/pull/2

---
 gradle/libs.versions.toml                             |  6 ++++--
 .../element/android/x/tests/uitests/ScreenshotTest.kt | 11 +----------
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 6eea87843f..3018c2d8f4 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -39,7 +39,7 @@ test_junitext = "1.1.3"
 test_barista = "4.2.0"
 test_hamcrest = "2.2"
 test_orchestrator = "1.4.1"
-test_paparazzi = "1.1.0"
+test_paparazzi = "1.1.0-sdk33-alpha02"
 test_parameter_injector = "1.8"
 
 #other
@@ -156,4 +156,6 @@ dependencygraph = { id = "com.savvasdalkitsis.module-dependency-graph", version.
 dependencycheck = { id = "org.owasp.dependencycheck", version.ref = "dependencycheck" }
 stem = { id = "com.likethesalad.stem", version.ref = "stem" }
 stemlibrary = { id = "com.likethesalad.stem-library", version.ref = "stem" }
-paparazzi = { id = "app.cash.paparazzi", version.ref = "test_paparazzi" }
+## TODO Revert to official artifact once SDK 33 support is available
+# paparazzi = { id = "app.cash.paparazzi", version.ref = "test_paparazzi" }
+paparazzi = { id = "dev.chrisbanes.paparazzi", version.ref = "test_paparazzi" }
diff --git a/tests/uitests/src/test/java/io/element/android/x/tests/uitests/ScreenshotTest.kt b/tests/uitests/src/test/java/io/element/android/x/tests/uitests/ScreenshotTest.kt
index 111f50081b..f807be4c43 100644
--- a/tests/uitests/src/test/java/io/element/android/x/tests/uitests/ScreenshotTest.kt
+++ b/tests/uitests/src/test/java/io/element/android/x/tests/uitests/ScreenshotTest.kt
@@ -18,7 +18,6 @@
 package io.element.android.x.tests.uitests
 
 import android.content.res.Configuration
-import android.os.Build
 import android.os.LocaleList
 import androidx.activity.OnBackPressedDispatcher
 import androidx.activity.OnBackPressedDispatcherOwner
@@ -33,10 +32,7 @@ import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.platform.LocalInspectionMode
 import androidx.compose.ui.platform.LocalLifecycleOwner
 import androidx.compose.ui.unit.Density
-import app.cash.paparazzi.DeviceConfig
 import app.cash.paparazzi.Paparazzi
-import app.cash.paparazzi.androidHome
-import app.cash.paparazzi.detectEnvironment
 import com.airbnb.android.showkase.models.Showkase
 import com.google.testing.junit.testparameterinjector.TestParameter
 import com.google.testing.junit.testparameterinjector.TestParameterInjector
@@ -71,11 +67,6 @@ class ScreenshotTest {
 
     @get:Rule
     val paparazzi = Paparazzi(
-        // Apply trick from https://github.com/cashapp/paparazzi/issues/489#issuecomment-1195674603
-        environment = detectEnvironment().copy(
-            platformDir = "${androidHome()}/platforms/android-32",
-            compileSdkVersion = Build.VERSION_CODES.S_V2 /* 32 */
-        ),
         maxPercentDifference = 0.0,
     )
 
@@ -85,7 +76,7 @@ class ScreenshotTest {
         @TestParameter baseDeviceConfig: BaseDeviceConfig,
         @TestParameter(value = ["1.0"/*, "1.5"*/]) fontScale: Float,
         @TestParameter(value = ["light", "dark"]) theme: String,
-        @TestParameter(value = ["en", /*"fr", "de", "ru"*/]) localeStr: String,
+        @TestParameter(value = ["en" /*"fr", "de", "ru"*/]) localeStr: String,
     ) {
         paparazzi.unsafeUpdateConfig(
             deviceConfig = baseDeviceConfig.deviceConfig.copy(