From 66fdd8f21688754caf7286c88aea7e56001f1489 Mon Sep 17 00:00:00 2001 From: Carlos Garcia Date: Tue, 5 Dec 2023 13:01:13 +0100 Subject: [PATCH 1/3] Update Gutenberg Mobile reference --- Gutenberg/config.yml | 2 +- Podfile.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Gutenberg/config.yml b/Gutenberg/config.yml index f2df11b61836..a949cbe9392c 100644 --- a/Gutenberg/config.yml +++ b/Gutenberg/config.yml @@ -9,6 +9,6 @@ # # LOCAL_GUTENBERG=../my-gutenberg-fork bundle exec pod install ref: - tag: v1.109.1 + commit: 32a7438cd4b45a99f8f293adc7daf14db5e6708c github_org: wordpress-mobile repo_name: gutenberg-mobile diff --git a/Podfile.lock b/Podfile.lock index d1dda56deae4..a9f7bff03ba8 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -26,7 +26,7 @@ PODS: - FSInteractiveMap (0.1.0) - Gifu (3.3.1) - Gridicons (1.2.0) - - Gutenberg (1.109.1) + - Gutenberg (1.109.2) - JTAppleCalendar (8.0.5) - Kanvas (1.4.9): - CropViewController @@ -108,7 +108,7 @@ DEPENDENCIES: - FSInteractiveMap (from `https://github.com/wordpress-mobile/FSInteractiveMap.git`, tag `0.2.0`) - Gifu (= 3.3.1) - Gridicons (~> 1.2) - - Gutenberg (from `https://cdn.a8c-ci.services/gutenberg-mobile/Gutenberg-v1.109.1.podspec`) + - Gutenberg (from `https://cdn.a8c-ci.services/gutenberg-mobile/Gutenberg-32a7438cd4b45a99f8f293adc7daf14db5e6708c.podspec`) - JTAppleCalendar (~> 8.0.5) - Kanvas (~> 1.4.4) - MediaEditor (>= 1.2.2, ~> 1.2) @@ -178,7 +178,7 @@ EXTERNAL SOURCES: :git: https://github.com/wordpress-mobile/FSInteractiveMap.git :tag: 0.2.0 Gutenberg: - :podspec: https://cdn.a8c-ci.services/gutenberg-mobile/Gutenberg-v1.109.1.podspec + :podspec: https://cdn.a8c-ci.services/gutenberg-mobile/Gutenberg-32a7438cd4b45a99f8f293adc7daf14db5e6708c.podspec CHECKOUT OPTIONS: FSInteractiveMap: @@ -201,7 +201,7 @@ SPEC CHECKSUMS: FSInteractiveMap: a396f610f48b76cb540baa87139d056429abda86 Gifu: 416d4e38c4c2fed012f019e0a1d3ffcb58e5b842 Gridicons: 4455b9f366960121430e45997e32112ae49ffe1d - Gutenberg: 1aedc9ff0ee83c0a8c2575c2fb455556ae30713b + Gutenberg: e95d4afb4a35f5f55346002b2097237116ef2b76 JTAppleCalendar: 16c6501b22cb27520372c28b0a2e0b12c8d0cd73 Kanvas: cc027f8058de881a4ae2b5aa5f05037b6d054d08 MediaEditor: d08314cfcbfac74361071a306b4bc3a39b3356ae From f80734aed68189ce718aa44858717f5105f603a3 Mon Sep 17 00:00:00 2001 From: Carlos Garcia Date: Tue, 5 Dec 2023 17:02:56 +0100 Subject: [PATCH 2/3] Release script: Update gutenberg-mobile ref 1.109.2 --- Gutenberg/config.yml | 2 +- Podfile.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gutenberg/config.yml b/Gutenberg/config.yml index a949cbe9392c..867f0a625d3f 100644 --- a/Gutenberg/config.yml +++ b/Gutenberg/config.yml @@ -9,6 +9,6 @@ # # LOCAL_GUTENBERG=../my-gutenberg-fork bundle exec pod install ref: - commit: 32a7438cd4b45a99f8f293adc7daf14db5e6708c + tag: v1.109.2 github_org: wordpress-mobile repo_name: gutenberg-mobile diff --git a/Podfile.lock b/Podfile.lock index a9f7bff03ba8..1dbfbcd621ca 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -108,7 +108,7 @@ DEPENDENCIES: - FSInteractiveMap (from `https://github.com/wordpress-mobile/FSInteractiveMap.git`, tag `0.2.0`) - Gifu (= 3.3.1) - Gridicons (~> 1.2) - - Gutenberg (from `https://cdn.a8c-ci.services/gutenberg-mobile/Gutenberg-32a7438cd4b45a99f8f293adc7daf14db5e6708c.podspec`) + - Gutenberg (from `https://cdn.a8c-ci.services/gutenberg-mobile/Gutenberg-v1.109.2.podspec`) - JTAppleCalendar (~> 8.0.5) - Kanvas (~> 1.4.4) - MediaEditor (>= 1.2.2, ~> 1.2) @@ -178,7 +178,7 @@ EXTERNAL SOURCES: :git: https://github.com/wordpress-mobile/FSInteractiveMap.git :tag: 0.2.0 Gutenberg: - :podspec: https://cdn.a8c-ci.services/gutenberg-mobile/Gutenberg-32a7438cd4b45a99f8f293adc7daf14db5e6708c.podspec + :podspec: https://cdn.a8c-ci.services/gutenberg-mobile/Gutenberg-v1.109.2.podspec CHECKOUT OPTIONS: FSInteractiveMap: @@ -201,7 +201,7 @@ SPEC CHECKSUMS: FSInteractiveMap: a396f610f48b76cb540baa87139d056429abda86 Gifu: 416d4e38c4c2fed012f019e0a1d3ffcb58e5b842 Gridicons: 4455b9f366960121430e45997e32112ae49ffe1d - Gutenberg: e95d4afb4a35f5f55346002b2097237116ef2b76 + Gutenberg: c144eb81ca9afbbe60734fd3c5abdd68940e08ec JTAppleCalendar: 16c6501b22cb27520372c28b0a2e0b12c8d0cd73 Kanvas: cc027f8058de881a4ae2b5aa5f05037b6d054d08 MediaEditor: d08314cfcbfac74361071a306b4bc3a39b3356ae From 1a77b1f8a50fefefedc94a804744cbaa00d6e353 Mon Sep 17 00:00:00 2001 From: Jos Date: Tue, 5 Dec 2023 04:55:17 +0800 Subject: [PATCH 3/3] [UI Tests] - Fix failing testCreateScheduledPost test (#22135) * add condition before calendar element tap * fix Trailing Whitespace Violation --- .../Screens/Editor/EditorPostSettings.swift | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/WordPress/UITestsFoundation/Screens/Editor/EditorPostSettings.swift b/WordPress/UITestsFoundation/Screens/Editor/EditorPostSettings.swift index 3c07cbfc372f..4f804fc5e5f2 100644 --- a/WordPress/UITestsFoundation/Screens/Editor/EditorPostSettings.swift +++ b/WordPress/UITestsFoundation/Screens/Editor/EditorPostSettings.swift @@ -39,6 +39,10 @@ public class EditorPostSettings: ScreenObject { $0.buttons["Next Month"] } + private let monthLabelGetter: (XCUIApplication) -> XCUIElement = { + $0.buttons["Month"] + } + private let firstCalendarDayButtonGetter: (XCUIApplication) -> XCUIElement = { $0.buttons.containing(.staticText, identifier: "1").element } @@ -54,6 +58,7 @@ public class EditorPostSettings: ScreenObject { var doneButton: XCUIElement { doneButtonGetter(app) } var featuredImageButton: XCUIElement { featuredImageButtonGetter(app) } var firstCalendarDayButton: XCUIElement { firstCalendarDayButtonGetter(app) } + var monthLabel: XCUIElement { monthLabelGetter(app) } var nextMonthButton: XCUIElement { nextMonthButtonGetter(app) } var publishDateButton: XCUIElement { publishDateButtonGetter(app) } var settingsTable: XCUIElement { settingsTableGetter(app) } @@ -139,10 +144,16 @@ public class EditorPostSettings: ScreenObject { public func updatePublishDateToFutureDate() -> Self { publishDateButton.tap() dateSelector.tap() + let currentMonth = monthLabel.value as! String // Selects the first day of the next month nextMonthButton.tap() - tapUntilCondition(element: firstCalendarDayButton, condition: firstCalendarDayButton.isSelected, description: "First Day button selected") + + // To ensure that the day tap happens on the correct month + let nextMonth = monthLabel.value as! String + if nextMonth != currentMonth { + tapUntilCondition(element: firstCalendarDayButton, condition: firstCalendarDayButton.isSelected, description: "First Day button selected") + } doneButton.tap() return self