Merge pull request #10660 from woocommerce/test/fix-create-order-ui-test

[UI Test] - Re-enable Create Order test

Author: jostnes

WooCommerce/src/androidTest/kotlin/com/woocommerce/android/e2e/helpers/util/Screen.kt

@@ -23,6 +23,7 @@ import androidx.test.espresso.matcher.ViewMatchers.isAssignableFrom
 import androidx.test.espresso.matcher.ViewMatchers.isCompletelyDisplayed
 import androidx.test.espresso.matcher.ViewMatchers.isDescendantOfA
 import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
+import androidx.test.espresso.matcher.ViewMatchers.isEnabled
 import androidx.test.espresso.matcher.ViewMatchers.isNotChecked
 import androidx.test.espresso.matcher.ViewMatchers.withClassName
 import androidx.test.espresso.matcher.ViewMatchers.withId
@@ -96,6 +97,16 @@ open class Screen {
             }
         }
 
+        private fun isElementEnabled(element: Int): Boolean {
+            return try {
+                onView(withId(element))
+                    .check(matches(isEnabled()))
+                true
+            } catch (e: Throwable) {
+                false
+            }
+        }
+
         private fun isElementNotDisplayed(element: Int): Boolean {
             return try {
                 onView(withId(element))
@@ -307,6 +318,14 @@ open class Screen {
         idleFor(1000) // allow for transitions
     }
 
+    fun waitForElementToBeEnabled(elementID: Int) {
+        waitForConditionToBeTrue(
+            Supplier<Boolean> {
+                isElementEnabled(elementID)
+            }
+        )
+    }
+
     fun waitForElementToBeDisplayed(elementID: Int) {
         waitForConditionToBeTrue(
             Supplier<Boolean> {

WooCommerce/src/androidTest/kotlin/com/woocommerce/android/e2e/screens/orders/UnifiedOrderScreen.kt

@@ -14,12 +14,12 @@ import com.woocommerce.android.R
 import com.woocommerce.android.e2e.helpers.util.NestedScrollViewExtension
 import com.woocommerce.android.e2e.helpers.util.Screen
 import org.hamcrest.CoreMatchers.endsWith
-import org.hamcrest.Matchers
 import org.hamcrest.core.AllOf.allOf
 
 class UnifiedOrderScreen : Screen(R.id.order_creation_root) {
     fun createOrder(): SingleOrderScreen {
-        clickOn(R.id.menu_create)
+        waitForElementToBeEnabled(R.id.menu_create)
+        Espresso.onView(withId(R.id.menu_create)).perform(click())
         return SingleOrderScreen()
     }
 
@@ -60,18 +60,9 @@ class UnifiedOrderScreen : Screen(R.id.order_creation_root) {
         return this
     }
 
-    fun editCustomerNote(note: String): UnifiedOrderScreen {
-        waitForElementToBeDisplayedWithoutFailure(R.id.notes_section)
-        scrollTo(R.id.notes_section)
+    fun addCustomerNote(note: String): UnifiedOrderScreen {
+        Espresso.onView(withText(R.string.order_creation_add_customer_note)).perform(click())
 
-        val editNoteButton = Espresso.onView(
-            Matchers.allOf(
-                isDescendantOfA(withId(R.id.notes_section)),
-                withId(R.id.edit_button)
-            )
-        )
-
-        clickOn(editNoteButton)
         typeTextInto(R.id.customerOrderNote_editor, note)
         clickOn(R.id.menu_done)
         return this

WooCommerce/src/androidTest/kotlin/com/woocommerce/android/e2e/tests/ui/OrdersUITest.kt

@@ -18,7 +18,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
 
@@ -48,11 +47,9 @@ class OrdersUITest : TestBase() {
         TabNavComponent().gotoOrdersScreen()
     }
 
-    @Ignore
     @Test
     fun e2eCreateOrderTest() {
         val note = "Just a placeholder text"
-        val status = "Processing"
         val ordersJSONArray = MocksReader().readOrderToArray()
 
         for (orderJSON in ordersJSONArray.iterator()) {
@@ -63,12 +60,10 @@ class OrdersUITest : TestBase() {
             OrderListScreen()
                 .createFABTap()
                 .assertNewOrderScreen()
-                .updateOrderStatus(status)
+                .addCustomerNote(note)
                 .addProductTap()
                 .assertProductsSelectorScreen(composeTestRule)
                 .selectProduct(composeTestRule, orderData.productName)
-                .editCustomerNote(note)
-                .addShipping()
                 .createOrder()
                 .assertSingleOrderScreenWithProduct(orderData)
                 .goBackToOrdersScreen()