Merge pull request #12963 from woocommerce/fix/ignored-ordersuitest

Fix ignored OrdersUITest
woocommerce · Nov 25, 2024 · e5d79d7 · e5d79d7
2 parents d3bda7b + e3a3235
commit e5d79d7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/...ce/src/androidTest/kotlin/com/woocommerce/android/e2e/screens/orders/SingleOrderScreen.kt b/...ce/src/androidTest/kotlin/com/woocommerce/android/e2e/screens/orders/SingleOrderScreen.kt
@@ -6,6 +6,7 @@ import androidx.test.espresso.matcher.ViewMatchers
 import androidx.test.espresso.matcher.ViewMatchers.hasDescendant
 import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
 import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.espresso.matcher.ViewMatchers.withParentIndex
 import androidx.test.espresso.matcher.ViewMatchers.withText
 import com.woocommerce.android.R
 import com.woocommerce.android.e2e.helpers.util.NestedScrollViewExtension
@@ -43,7 +44,7 @@ class SingleOrderScreen : Screen(R.id.orderStatus_subtitle) {
     }
 
     fun assertOrderId(orderId: Int): SingleOrderScreen {
-        Espresso.onView(withId(R.id.toolbar))
+        Espresso.onView(Matchers.allOf(withId(R.id.toolbar), withParentIndex(0)))
             .check(ViewAssertions.matches(hasDescendant(withText("Order #$orderId"))))
             .check(ViewAssertions.matches(isDisplayed()))
         return this

diff --git a/WooCommerce/src/androidTest/kotlin/com/woocommerce/android/e2e/tests/ui/OrdersUITest.kt b/WooCommerce/src/androidTest/kotlin/com/woocommerce/android/e2e/tests/ui/OrdersUITest.kt
@@ -20,7 +20,6 @@ import dagger.hilt.android.testing.HiltAndroidRule
 import dagger.hilt.android.testing.HiltAndroidTest
 import org.json.JSONObject
 import org.junit.Before
-import org.junit.Ignore
 import org.junit.Rule
 import org.junit.Test
 
@@ -55,7 +54,6 @@ class OrdersUITest : TestBase() {
 
     @Retry(numberOfTimes = 1)
     @Test
-    @Ignore
     fun e2eCreateOrderTest() {
         val note = "Just a placeholder text"
         val ordersJSONArray = MocksReader().readOrderToArray()