From cad76b13c3a0608d01ea4de80ca9922857733b51 Mon Sep 17 00:00:00 2001 From: pachlava Date: Wed, 15 May 2024 13:01:43 +0300 Subject: [PATCH 1/2] Removed the currency code check. --- .../android/e2e/screens/products/ProductListScreen.kt | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/WooCommerce/src/androidTest/kotlin/com/woocommerce/android/e2e/screens/products/ProductListScreen.kt b/WooCommerce/src/androidTest/kotlin/com/woocommerce/android/e2e/screens/products/ProductListScreen.kt index 8f11432d1f6..ecb8b0b3236 100644 --- a/WooCommerce/src/androidTest/kotlin/com/woocommerce/android/e2e/screens/products/ProductListScreen.kt +++ b/WooCommerce/src/androidTest/kotlin/com/woocommerce/android/e2e/screens/products/ProductListScreen.kt @@ -120,10 +120,8 @@ class ProductListScreen : Screen { ViewMatchers.withChild( Matchers.allOf( ViewMatchers.withId(R.id.productStockAndStatus), - ViewMatchers.withText( - "${product.stockStatus}${product.variations} • \$${product.priceDiscountedRaw}.00" - - ) + ViewMatchers.withText(Matchers.containsString("${product.stockStatus}${product.variations} • ")), + ViewMatchers.withText(Matchers.containsString(product.priceDiscountedRaw)) ) ), ViewMatchers.withChild( From da431ed3dd60022ace8cf0382f8b360283a86730 Mon Sep 17 00:00:00 2001 From: pachlava Date: Wed, 15 May 2024 13:28:00 +0300 Subject: [PATCH 2/2] Attempt to prevent `Nuage...` account issue. --- .../android/e2e/screens/login/SiteAddressScreen.kt | 1 + .../android/e2e/screens/products/ProductListScreen.kt | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/WooCommerce/src/androidTest/kotlin/com/woocommerce/android/e2e/screens/login/SiteAddressScreen.kt b/WooCommerce/src/androidTest/kotlin/com/woocommerce/android/e2e/screens/login/SiteAddressScreen.kt index e9dc67f41f1..ea5034721f9 100644 --- a/WooCommerce/src/androidTest/kotlin/com/woocommerce/android/e2e/screens/login/SiteAddressScreen.kt +++ b/WooCommerce/src/androidTest/kotlin/com/woocommerce/android/e2e/screens/login/SiteAddressScreen.kt @@ -7,6 +7,7 @@ class SiteAddressScreen : Screen { constructor() : super(org.wordpress.android.login.R.id.input) fun proceedWith(siteAddress: String): EmailAddressScreen { + clickOn(org.wordpress.android.login.R.id.input) typeTextInto(org.wordpress.android.login.R.id.input, siteAddress) clickOn(R.id.bottom_button) diff --git a/WooCommerce/src/androidTest/kotlin/com/woocommerce/android/e2e/screens/products/ProductListScreen.kt b/WooCommerce/src/androidTest/kotlin/com/woocommerce/android/e2e/screens/products/ProductListScreen.kt index ecb8b0b3236..6efb13fb8eb 100644 --- a/WooCommerce/src/androidTest/kotlin/com/woocommerce/android/e2e/screens/products/ProductListScreen.kt +++ b/WooCommerce/src/androidTest/kotlin/com/woocommerce/android/e2e/screens/products/ProductListScreen.kt @@ -120,7 +120,9 @@ class ProductListScreen : Screen { ViewMatchers.withChild( Matchers.allOf( ViewMatchers.withId(R.id.productStockAndStatus), - ViewMatchers.withText(Matchers.containsString("${product.stockStatus}${product.variations} • ")), + ViewMatchers.withText( + Matchers.containsString("${product.stockStatus}${product.variations} • ") + ), ViewMatchers.withText(Matchers.containsString(product.priceDiscountedRaw)) ) ),