From e8fe491d331b0cf375358887ccd172063d6a826d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Irfan=20=C3=96m=C3=BCr?= Date: Wed, 20 Nov 2024 20:31:00 +0300 Subject: [PATCH 1/2] Correct the file locations of promo texts in screenshots.json --- fastlane/screenshots.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/fastlane/screenshots.json b/fastlane/screenshots.json index c6bcd4769072..682933aef186 100644 --- a/fastlane/screenshots.json +++ b/fastlane/screenshots.json @@ -37,7 +37,7 @@ "filename": "Pixel 3-01.png", "background": "#674399", "screenshot": "images/phoneScreenshots/1-order-dashboard-dark.png", - "text": "playstoreres/metadata/{locale}/promo_screenshot_1.txt" + "text": "metadata/android/{locale}/promo_screenshot_1.txt" }, // Create orders on the fly { @@ -45,7 +45,7 @@ "filename": "Pixel 3-02.png", "background": "#C9356E", "screenshot": "images/phoneScreenshots/2-add-order-light.png", - "text": "playstoreres/metadata/{locale}/promo_screenshot_2.txt" + "text": "metadata/android/{locale}/promo_screenshot_2.txt" }, // Take payments in person { @@ -53,7 +53,7 @@ "filename": "Pixel 3-03.png", "background": "#674399", "screenshot": "images/phoneScreenshots/3-in-person-payments-dark.png", - "text": "playstoreres/metadata/{locale}/promo_screenshot_3.txt" + "text": "metadata/android/{locale}/promo_screenshot_3.txt" }, // Add and edit products with a touch { @@ -61,7 +61,7 @@ "filename": "Pixel 3-04.png", "background": "#C9356E", "screenshot": "images/phoneScreenshots/4-add-product-light.png", - "text": "playstoreres/metadata/{locale}/promo_screenshot_4.txt" + "text": "metadata/android/{locale}/promo_screenshot_4.txt" }, // Get notified of every sale { @@ -69,7 +69,7 @@ "filename": "Pixel 3-05.png", "background": "#674399", "screenshot": "images/phoneScreenshots/5-push-notifications-dark.png", - "text": "playstoreres/metadata/{locale}/promo_screenshot_5.txt" + "text": "metadata/android/{locale}/promo_screenshot_5.txt" } ] } From 595809b9ffa2cf6665a6c77d7a18372cc8f2b63f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Irfan=20=C3=96m=C3=BCr?= Date: Wed, 27 Nov 2024 20:52:41 +0300 Subject: [PATCH 2/2] Fix the date in the mock orders_all_detailed.json --- .../jetpack-blogs/wc/orders/orders_all_detailed.json | 6 +++--- .../android/e2e/tests/screenshot/ScreenshotTest.kt | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/WooCommerce/src/androidTest/assets/mocks/mappings/jetpack-blogs/wc/orders/orders_all_detailed.json b/WooCommerce/src/androidTest/assets/mocks/mappings/jetpack-blogs/wc/orders/orders_all_detailed.json index d058652ea7f5..77e23b4db41d 100644 --- a/WooCommerce/src/androidTest/assets/mocks/mappings/jetpack-blogs/wc/orders/orders_all_detailed.json +++ b/WooCommerce/src/androidTest/assets/mocks/mappings/jetpack-blogs/wc/orders/orders_all_detailed.json @@ -364,9 +364,9 @@ "refunds": [], "payment_url": "", "is_editable": false, - "date_created":"{{#assign 'customformat'}}yyyy-MM-dd'T'HH:mm:ss{{/assign}}{{fnow offset='-10 minutes' format=customformat}}", - "date_modified":"{{fnow offset='-10 minutes' format=customformat}}", - "date_paid_gmt": "{{fnow offset='-10 minutes' format=customformat}}" + "date_created_gmt":"{{currentYear}}-10-26T01:17:42", + "date_modified_gmt":"{{currentYear}}-10-26T01:17:42", + "date_paid_gmt": null }, { "id": 2181, "status": "completed", diff --git a/WooCommerce/src/androidTest/kotlin/com/woocommerce/android/e2e/tests/screenshot/ScreenshotTest.kt b/WooCommerce/src/androidTest/kotlin/com/woocommerce/android/e2e/tests/screenshot/ScreenshotTest.kt index 90a94810f714..d61bbd889946 100644 --- a/WooCommerce/src/androidTest/kotlin/com/woocommerce/android/e2e/tests/screenshot/ScreenshotTest.kt +++ b/WooCommerce/src/androidTest/kotlin/com/woocommerce/android/e2e/tests/screenshot/ScreenshotTest.kt @@ -124,7 +124,7 @@ class ScreenshotTest : TestBase(failOnUnmatchedWireMockRequests = false) { AppPrefs.setShowCardReaderConnectedTutorial(false) // Skip card reader tutorial TabNavComponent() .gotoOrdersScreen() - .selectOrder(5) + .selectOrderById(2787) .tapOnCollectPayment() .chooseCardPayment() .thenTakeScreenshot("in-person-payments")