From 2bdcbeb95b40c6fe8ecfa1c65e4d3e7e74fce19c Mon Sep 17 00:00:00 2001
From: Don Turner <donturner@google.com>
Date: Thu, 28 Mar 2024 10:20:19 +0000
Subject: [PATCH] Remove workaround for
 https://issuetracker.google.com/327149166

Change-Id: I335f9f5da1ff3f2574acca8e3fcb27b949a07c7a
---
 .../nowinandroid/ui/NiaAppScreenSizesScreenshotTests.kt     | 6 ++----
 gradle/libs.versions.toml                                   | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/app/src/testDemo/kotlin/com/google/samples/apps/nowinandroid/ui/NiaAppScreenSizesScreenshotTests.kt b/app/src/testDemo/kotlin/com/google/samples/apps/nowinandroid/ui/NiaAppScreenSizesScreenshotTests.kt
index 8b99b0847..517e32e95 100644
--- a/app/src/testDemo/kotlin/com/google/samples/apps/nowinandroid/ui/NiaAppScreenSizesScreenshotTests.kt
+++ b/app/src/testDemo/kotlin/com/google/samples/apps/nowinandroid/ui/NiaAppScreenSizesScreenshotTests.kt
@@ -25,6 +25,7 @@ import androidx.compose.ui.test.DeviceConfigurationOverride
 import androidx.compose.ui.test.ForcedSize
 import androidx.compose.ui.test.junit4.createAndroidComposeRule
 import androidx.compose.ui.test.onNodeWithTag
+import androidx.compose.ui.test.onRoot
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.DpSize
 import androidx.compose.ui.unit.dp
@@ -139,9 +140,6 @@ class NiaAppScreenSizesScreenshotTests {
     }
 
     private fun testNiaAppScreenshotWithSize(width: Dp, height: Dp, screenshotName: String) {
-        // TODO: Remove this when https://issuetracker.google.com/issues/327149166 is fixed
-        val appTestTag = "APP"
-
         composeTestRule.setContent {
             CompositionLocalProvider(
                 LocalInspectionMode provides true,
@@ -164,7 +162,7 @@ class NiaAppScreenSizesScreenshotTests {
             }
         }
 
-        composeTestRule.onNodeWithTag(appTestTag)
+        composeTestRule.onRoot()
             .captureRoboImage(
                 "src/testDemo/screenshots/$screenshotName.png",
                 roborazziOptions = DefaultRoborazziOptions,
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index e60f8bcd2..4c4ff333a 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -9,7 +9,7 @@ androidxAppCompat = "1.6.1"
 androidxBrowser = "1.6.0"
 androidxComposeBom = "2024.02.00"
 androidxComposeCompiler = "1.5.8"
-androidxComposeUiTest = "1.7.0-alpha03"
+androidxComposeUiTest = "1.7.0-alpha05"
 androidxComposeRuntimeTracing = "1.0.0-beta01"
 androidxCore = "1.12.0"
 androidxCoreSplashscreen = "1.0.1"