From 418162f1c664b8f842868ed72205c20b155977d6 Mon Sep 17 00:00:00 2001 From: rachelmcr Date: Tue, 6 Oct 2020 11:37:40 +0100 Subject: [PATCH 1/7] Add accessibility identifier to comment notification reply button --- .../Classes/Models/Notifications/Actions/ReplyToComment.swift | 1 + .../Notifications/Views/NoteBlockActionsTableViewCell.swift | 1 + 2 files changed, 2 insertions(+) diff --git a/WordPress/Classes/Models/Notifications/Actions/ReplyToComment.swift b/WordPress/Classes/Models/Notifications/Actions/ReplyToComment.swift index aaae6453b01f..4a267596df05 100644 --- a/WordPress/Classes/Models/Notifications/Actions/ReplyToComment.swift +++ b/WordPress/Classes/Models/Notifications/Actions/ReplyToComment.swift @@ -2,6 +2,7 @@ class ReplyToComment: DefaultNotificationActionCommand { static let title = NSLocalizedString("Reply", comment: "Reply to a comment.") static let hint = NSLocalizedString("Replies to a comment.", comment: "VoiceOver accessibility hint, informing the user the button can be used to reply to a comment.") + static let identifier = "reply-button" override var actionTitle: String { return ReplyToComment.title diff --git a/WordPress/Classes/ViewRelated/Notifications/Views/NoteBlockActionsTableViewCell.swift b/WordPress/Classes/ViewRelated/Notifications/Views/NoteBlockActionsTableViewCell.swift index 0779ad4e3513..c56b45b6ed3c 100644 --- a/WordPress/Classes/ViewRelated/Notifications/Views/NoteBlockActionsTableViewCell.swift +++ b/WordPress/Classes/ViewRelated/Notifications/Views/NoteBlockActionsTableViewCell.swift @@ -194,6 +194,7 @@ class NoteBlockActionsTableViewCell: NoteBlockTableViewCell { btnReply.setTitleColor(textNormalColor, for: UIControl.State()) btnReply.accessibilityLabel = ReplyToComment.title btnReply.accessibilityHint = ReplyToComment.hint + btnReply.accessibilityIdentifier = ReplyToComment.identifier btnLike.setTitle(LikeComment.TitleStrings.like, for: UIControl.State()) btnLike.setTitle(LikeComment.TitleStrings.unlike, for: .highlighted) From 531b458ead6d30ee0bf9b79aa0491044769f7012 Mon Sep 17 00:00:00 2001 From: rachelmcr Date: Tue, 6 Oct 2020 11:46:17 +0100 Subject: [PATCH 2/7] Update tests to support new mocks and screenshot steps --- Podfile | 8 +-- Podfile.lock | 30 +++++++---- .../WordPressScreenshotGeneration.swift | 52 ++++++++++++------- .../Screens/Editor/BlockEditorScreen.swift | 10 ++++ .../Screens/Login/LoginEpilogueScreen.swift | 4 +- .../Screens/NotificationsScreen.swift | 13 +++++ .../Screens/StatsScreen.swift | 1 + .../Screens/TabNavComponent.swift | 2 +- .../Tests/MainNavigationTests.swift | 1 + .../WPUITestCredentials.swift | 4 +- 10 files changed, 87 insertions(+), 38 deletions(-) diff --git a/Podfile b/Podfile index 6976532ec3b5..f68afaf93cf0 100644 --- a/Podfile +++ b/Podfile @@ -192,9 +192,9 @@ target 'WordPress' do pod 'Gridicons', '~> 1.0.1' - pod 'WordPressAuthenticator', '~> 1.26.0-beta' + # pod 'WordPressAuthenticator', '~> 1.26.0-beta' # While in PR - # pod 'WordPressAuthenticator', :git => 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', :branch => '' + pod 'WordPressAuthenticator', :git => 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', :branch => 'fix/accessibility-ids' # pod 'WordPressAuthenticator', :git => 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', :commit => '' # pod 'WordPressAuthenticator', :path => '../WordPressAuthenticator-iOS' @@ -363,9 +363,9 @@ end ## =================== ## def wordpress_mocks - pod 'WordPressMocks', '~> 0.0.8' + # pod 'WordPressMocks', '~> 0.0.8' # pod 'WordPressMocks', :git => 'https://github.com/wordpress-mobile/WordPressMocks.git', :commit => '' - # pod 'WordPressMocks', :git => 'https://github.com/wordpress-mobile/WordPressMocks.git', :branch => 'add/screenshot-mocks' + pod 'WordPressMocks', :git => 'https://github.com/wordpress-mobile/WordPressMocks.git', :branch => 'update/mocks-for-screenshots' # pod 'WordPressMocks', :path => '../WordPressMocks' end diff --git a/Podfile.lock b/Podfile.lock index 312dd8a3fca4..fbb861bab1dc 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -395,7 +395,7 @@ PODS: - WordPress-Aztec-iOS (1.19.3) - WordPress-Editor-iOS (1.19.3): - WordPress-Aztec-iOS (= 1.19.3) - - WordPressAuthenticator (1.26.0-beta.16): + - WordPressAuthenticator (1.26.0): - 1PasswordExtension (= 1.8.6) - Alamofire (= 4.8) - CocoaLumberjack (~> 3.5) @@ -405,7 +405,7 @@ PODS: - "NSURL+IDN (= 0.4)" - SVProgressHUD (= 2.2.5) - WordPressKit (~> 4.18-beta) - - WordPressShared (~> 1.11-beta) + - WordPressShared (~> 1.12-beta) - WordPressUI (~> 1.7.0) - WordPressKit (4.18.0-beta.2): - Alamofire (~> 4.8.0) @@ -414,7 +414,7 @@ PODS: - UIDeviceIdentifier (~> 1) - WordPressShared (~> 1.10-beta) - wpxmlrpc (~> 0.9.0-beta) - - WordPressMocks (0.0.8) + - WordPressMocks (0.0.9-beta.1) - WordPressShared (1.12.0): - CocoaLumberjack (~> 3.4) - FormatterKit/TimeIntervalFormatter (= 1.8.2) @@ -505,9 +505,9 @@ DEPENDENCIES: - Starscream (= 3.0.6) - SVProgressHUD (= 2.2.5) - WordPress-Editor-iOS (~> 1.19.3) - - WordPressAuthenticator (~> 1.26.0-beta) + - WordPressAuthenticator (from `https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git`, branch `fix/accessibility-ids`) - WordPressKit (~> 4.18.0-beta) - - WordPressMocks (~> 0.0.8) + - WordPressMocks (from `https://github.com/wordpress-mobile/WordPressMocks.git`, branch `update/mocks-for-screenshots`) - WordPressShared (~> 1.12.0) - WordPressUI (~> 1.7.1) - WPMediaPicker (~> 1.7.0) @@ -555,9 +555,7 @@ SPEC REPOS: - UIDeviceIdentifier - WordPress-Aztec-iOS - WordPress-Editor-iOS - - WordPressAuthenticator - WordPressKit - - WordPressMocks - WordPressShared - WordPressUI - WPMediaPicker @@ -657,6 +655,12 @@ EXTERNAL SOURCES: :commit: a0a5353efe8560ccca572b6a15165b5608df7ee1 :git: https://github.com/wordpress-mobile/gutenberg-mobile/ :submodules: true + WordPressAuthenticator: + :branch: fix/accessibility-ids + :git: https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git + WordPressMocks: + :branch: update/mocks-for-screenshots + :git: https://github.com/wordpress-mobile/WordPressMocks.git Yoga: :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/a0a5353efe8560ccca572b6a15165b5608df7ee1/third-party-podspecs/Yoga.podspec.json @@ -675,6 +679,12 @@ CHECKOUT OPTIONS: :commit: a0a5353efe8560ccca572b6a15165b5608df7ee1 :git: https://github.com/wordpress-mobile/gutenberg-mobile/ :submodules: true + WordPressAuthenticator: + :commit: ee1176c17ad9e19afe53663387d50b44e657d9bc + :git: https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git + WordPressMocks: + :commit: 8f076a7ffb5f634ec4bebede821093abe286a68b + :git: https://github.com/wordpress-mobile/WordPressMocks.git SPEC CHECKSUMS: 1PasswordExtension: f97cc80ae58053c331b2b6dc8843ba7103b33794 @@ -755,9 +765,9 @@ SPEC CHECKSUMS: UIDeviceIdentifier: a79ccdfc940373835a7d8e9fc7541e6bf61b6319 WordPress-Aztec-iOS: b7ac8b30f746992e85d9668453ac87c2cdcecf4f WordPress-Editor-iOS: 1886f7fe464d79ee64ccfe7985281f8cf45f75eb - WordPressAuthenticator: 5b1743f4578bbb7ef81c65b1b97f1007d37b68a1 + WordPressAuthenticator: 31bceb4ab25de663a327b791e76a405b9c903b73 WordPressKit: 7fb381043697d3f1ec7c0f52407aa0fd54b544db - WordPressMocks: b4064b99a073117bbc304abe82df78f2fbe60992 + WordPressMocks: 1e04de6afa3a17f6f1ab4782f8460d7faefcf2f7 WordPressShared: 38cb62e9cb998d4dc3c1611f17934c6875a6b3e8 WordPressUI: 9da5d966b8beb091950cd96880db398d7f30e246 WPMediaPicker: 754bc043ea42abc2eae8a07e5680c777c112666a @@ -772,6 +782,6 @@ SPEC CHECKSUMS: ZendeskSupportSDK: a87ab1e4badace92c75eb11dc77ede1e995b2adc ZIPFoundation: 249fa8890597086cd536bb2df5c9804d84e122b0 -PODFILE CHECKSUM: caba36b01d2e3ecf68f096e7e2c8ebb58452fb5e +PODFILE CHECKSUM: 2bae271e4a98c97c57399caf0ba49a81d153d44a COCOAPODS: 1.9.3 diff --git a/WordPress/WordPressScreenshotGeneration/WordPressScreenshotGeneration.swift b/WordPress/WordPressScreenshotGeneration/WordPressScreenshotGeneration.swift index 4571bdf0c1d6..31119ba18c09 100644 --- a/WordPress/WordPressScreenshotGeneration/WordPressScreenshotGeneration.swift +++ b/WordPress/WordPressScreenshotGeneration/WordPressScreenshotGeneration.swift @@ -36,34 +36,44 @@ class WordPressScreenshotGeneration: XCTestCase { func testGenerateScreenshots() { - // Get My Site screenshot - let mySite = MySiteScreen() + // Get post editor screenshot + let postList = MySiteScreen() .showSiteSwitcher() - .switchToSite(withTitle: "infocusphotographers.com") - snapshot("4-MySite") - - // Get BlockPicker screenshot - let postList = mySite + .switchToSite(withTitle: "fourpawsdoggrooming.wordpress.com") .gotoPostsScreen() .showOnly(.drafts) - let postEditorScreenshot = postList.selectPost(withSlug: "summer-band-jam") - BlockEditorScreen().openBlockPicker() - snapshot("1-BlockPicker") - BlockEditorScreen().closeBlockPicker() + let postEditorScreenshot = postList.selectPost(withSlug: "our-services") + if isIpad { + snapshot("1-Editor-With-BlockPicker") + } else { + BlockEditorScreen().openBlockPicker() + snapshot("1-Editor") + BlockEditorScreen().closeBlockPicker() + } postEditorScreenshot.close() - // Get a screenshot of the full-screen editor + // Get a screenshot of the editor with keyboard (iPad only) if isIpad { - let ipadScreenshot = postList.selectPost(withSlug: "now-booking-summer-sessions") - snapshot("6-No-Keyboard-Editor") + let ipadScreenshot = MySiteScreen() + .showSiteSwitcher() + .switchToSite(withTitle: "weekendbakesblog.wordpress.com") + .gotoPostsScreen() + .showOnly(.drafts) + .selectPost(withSlug: "easy-blueberry-muffins") + BlockEditorScreen().selectBlock(containingText: "Ingredients") + snapshot("6-Editor-With-Keyboard") ipadScreenshot.close() - } - - if !isIpad { + } else { postList.pop() } + // Get My Site screenshot + let mySite = MySiteScreen() + .showSiteSwitcher() + .switchToSite(withTitle: "tricountyrealestate.wordpress.com") + snapshot("4-MySite") + // Get Media screenshot _ = mySite.gotoMediaScreen() sleep(imagesWaitTime) // wait for post images to load @@ -77,7 +87,7 @@ class WordPressScreenshotGeneration: XCTestCase { let statsScreen = mySite.gotoStatsScreen() statsScreen .dismissCustomizeInsightsNotice() - .switchTo(mode: .years) + .switchTo(mode: .months) snapshot("3-Stats") // Get Discover screenshot @@ -88,9 +98,13 @@ class WordPressScreenshotGeneration: XCTestCase { snapshot("2-Discover") // Get Notifications screenshot - TabNavComponent() + let notificationList = TabNavComponent() .gotoNotificationsScreen() .dismissNotificationAlertIfNeeded() + if isIpad { + notificationList.openNotification(withText: "Reyansh Pawar commented on My Top 10 Pastry Recipes") + .replyToNotification() + } snapshot("5-Notifications") } } diff --git a/WordPress/WordPressUITests/Screens/Editor/BlockEditorScreen.swift b/WordPress/WordPressUITests/Screens/Editor/BlockEditorScreen.swift index 73506bd2fc6a..d510015f9b15 100644 --- a/WordPress/WordPressUITests/Screens/Editor/BlockEditorScreen.swift +++ b/WordPress/WordPressUITests/Screens/Editor/BlockEditorScreen.swift @@ -65,6 +65,16 @@ class BlockEditorScreen: BaseScreen { return self } + /** + Selects a block based on part of the block label (e.g. partial text in a paragraph block) + */ + @discardableResult + func selectBlock(containingText text: String) -> BlockEditorScreen { + let predicate = NSPredicate(format: "label CONTAINS[c] '\(text)'") + XCUIApplication().buttons.containing(predicate).firstMatch.tap() + return self + } + // returns void since return screen depends on from which screen it loaded func closeEditor() { XCTContext.runActivity(named: "Close the block editor") { (activity) in diff --git a/WordPress/WordPressUITests/Screens/Login/LoginEpilogueScreen.swift b/WordPress/WordPressUITests/Screens/Login/LoginEpilogueScreen.swift index 4aca07f5953a..da46bb0c6ba5 100644 --- a/WordPress/WordPressUITests/Screens/Login/LoginEpilogueScreen.swift +++ b/WordPress/WordPressUITests/Screens/Login/LoginEpilogueScreen.swift @@ -21,7 +21,7 @@ class LoginEpilogueScreen: BaseScreen { connectSiteButton = app.cells[ElementStringIDs.connectSiteButton] continueButton = app.buttons[ElementStringIDs.continueButton] - super.init(element: siteUrlField) + super.init(element: continueButton) } func continueWithSelectedSite() -> MySiteScreen { @@ -41,7 +41,7 @@ class LoginEpilogueScreen: BaseScreen { } let expectedSiteUrl = getDisplayUrl(for: siteUrl) - let actualSiteUrl = siteUrlField.label + let actualSiteUrl = siteUrlField.firstMatch.label XCTAssertEqual(expectedSiteUrl, actualSiteUrl, "Site URL displayed is \(actualSiteUrl) but should be \(expectedSiteUrl)") return self diff --git a/WordPress/WordPressUITests/Screens/NotificationsScreen.swift b/WordPress/WordPressUITests/Screens/NotificationsScreen.swift index 3da6750c02b7..18cece74bac8 100644 --- a/WordPress/WordPressUITests/Screens/NotificationsScreen.swift +++ b/WordPress/WordPressUITests/Screens/NotificationsScreen.swift @@ -4,14 +4,27 @@ import XCTest class NotificationsScreen: BaseScreen { let tabBar: TabNavComponent + let replyButton: XCUIElement init() { let navBar = XCUIApplication().tables["Notifications Table"] + replyButton = XCUIApplication().buttons["reply-button"] tabBar = TabNavComponent() super.init(element: navBar) } + func openNotification(withText notificationText: String) -> NotificationsScreen { + XCUIApplication().staticTexts[notificationText].tap() + return self + } + + @discardableResult + func replyToNotification() -> NotificationsScreen { + replyButton.tap() + return self + } + static func isLoaded() -> Bool { return XCUIApplication().tables["Notifications Table"].exists } diff --git a/WordPress/WordPressUITests/Screens/StatsScreen.swift b/WordPress/WordPressUITests/Screens/StatsScreen.swift index 31c5a4df35f7..7a06ad37ff3c 100644 --- a/WordPress/WordPressUITests/Screens/StatsScreen.swift +++ b/WordPress/WordPressUITests/Screens/StatsScreen.swift @@ -8,6 +8,7 @@ private struct ElementStringIDs { class StatsScreen: BaseScreen { enum Mode: String { + case months = "months" case years = "years" } diff --git a/WordPress/WordPressUITests/Screens/TabNavComponent.swift b/WordPress/WordPressUITests/Screens/TabNavComponent.swift index 050a54ec1175..346210125ca1 100644 --- a/WordPress/WordPressUITests/Screens/TabNavComponent.swift +++ b/WordPress/WordPressUITests/Screens/TabNavComponent.swift @@ -27,7 +27,7 @@ class TabNavComponent: BaseScreen { func gotoMySiteScreen() -> MySiteScreen { // Avoid transitioning to the sites list if MySites is already on screen if !MySiteScreen.isVisible { - gotoMySitesScreen().switchToSite(withTitle: "infocusphotographers.com") + gotoMySitesScreen().switchToSite(withTitle: WPUITestCredentials.testWPcomSiteAddress) } return MySiteScreen() } diff --git a/WordPress/WordPressUITests/Tests/MainNavigationTests.swift b/WordPress/WordPressUITests/Tests/MainNavigationTests.swift index 2f468f927c61..4316deb5eaad 100644 --- a/WordPress/WordPressUITests/Tests/MainNavigationTests.swift +++ b/WordPress/WordPressUITests/Tests/MainNavigationTests.swift @@ -27,6 +27,7 @@ class MainNavigationTests: XCTestCase { _ = mySiteScreen .tabBar.gotoNotificationsScreen() + .dismissNotificationAlertIfNeeded() XCTContext.runActivity(named: "Confirm Notifications screen and main navigation bar are loaded.") { (activity) in XCTAssert(NotificationsScreen.isLoaded(), "Notifications screen isn't loaded.") diff --git a/WordPress/WordPressUITests/WPUITestCredentials.swift b/WordPress/WordPressUITests/WPUITestCredentials.swift index dca4d802b80a..95f0076527cc 100644 --- a/WordPress/WordPressUITests/WPUITestCredentials.swift +++ b/WordPress/WordPressUITests/WPUITestCredentials.swift @@ -3,8 +3,8 @@ struct WPUITestCredentials { static let testWPcomUserEmail: String = "e2eflowtestingmobile@example.com" static let testWPcomUsername: String = "e2eflowtestingmobile" static let testWPcomPassword: String = "mocked_password" - static let testWPcomSiteAddress: String = "infocusphotographers.wordpress.com" - static let testWPcomSitePrimaryAddress: String = "infocusphotographers.com" + static let testWPcomSiteAddress: String = "tricountyrealestate.wordpress.com" + static let testWPcomSitePrimaryAddress: String = "tricountyrealestate.wordpress.com" static let selfHostedUsername: String = "e2eflowtestingmobile" static let selfHostedPassword: String = "mocked_password" static let selfHostedSiteAddress: String = "\(WireMock.URL().absoluteString)" From cfa3857444bdade3b50fab17ddb102b87376cbd9 Mon Sep 17 00:00:00 2001 From: rachelmcr Date: Tue, 6 Oct 2020 12:28:28 +0100 Subject: [PATCH 3/7] Fix editor screenshot names --- .../WordPressScreenshotGeneration.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/WordPress/WordPressScreenshotGeneration/WordPressScreenshotGeneration.swift b/WordPress/WordPressScreenshotGeneration/WordPressScreenshotGeneration.swift index 31119ba18c09..ab6718ec7062 100644 --- a/WordPress/WordPressScreenshotGeneration/WordPressScreenshotGeneration.swift +++ b/WordPress/WordPressScreenshotGeneration/WordPressScreenshotGeneration.swift @@ -45,10 +45,10 @@ class WordPressScreenshotGeneration: XCTestCase { let postEditorScreenshot = postList.selectPost(withSlug: "our-services") if isIpad { - snapshot("1-Editor-With-BlockPicker") + snapshot("1-Editor") } else { BlockEditorScreen().openBlockPicker() - snapshot("1-Editor") + snapshot("1-Editor-With-BlockPicker") BlockEditorScreen().closeBlockPicker() } postEditorScreenshot.close() From 60ca032a05d41f5484b2f007d0f4dcd33f84f393 Mon Sep 17 00:00:00 2001 From: rachelmcr Date: Tue, 6 Oct 2020 13:12:57 +0100 Subject: [PATCH 4/7] Fix Podfile after bad merge --- Podfile | 4 ++-- Podfile.lock | 44 ++++++++++---------------------------------- 2 files changed, 12 insertions(+), 36 deletions(-) diff --git a/Podfile b/Podfile index 12161dcfa3c2..26ade71a4b57 100644 --- a/Podfile +++ b/Podfile @@ -194,8 +194,8 @@ target 'WordPress' do # pod 'WordPressAuthenticator', '~> 1.26.0-beta' # While in PR - pod 'WordPressAuthenticator', :git => 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', :branch => 'fix/accessibility-ids' - # pod 'WordPressAuthenticator', :git => 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', :commit => '' + # pod 'WordPressAuthenticator', :git => 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', :branch => 'fix/accessibility-ids' + pod 'WordPressAuthenticator', :git => 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', :commit => '20f709620d777e72bd42342e4bdf86f25d7a7cbc' # pod 'WordPressAuthenticator', :path => '../WordPressAuthenticator-iOS' pod 'MediaEditor', '~> 1.2.1' diff --git a/Podfile.lock b/Podfile.lock index 20a720a62e42..0e4c04538539 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -395,7 +395,7 @@ PODS: - WordPress-Aztec-iOS (1.19.3) - WordPress-Editor-iOS (1.19.3): - WordPress-Aztec-iOS (= 1.19.3) - - WordPressAuthenticator (1.26.0): + - WordPressAuthenticator (1.27.0-beta.1): - 1PasswordExtension (= 1.8.6) - Alamofire (= 4.8) - CocoaLumberjack (~> 3.5) @@ -412,15 +412,9 @@ PODS: - CocoaLumberjack (~> 3.4) - NSObject-SafeExpectations (= 0.0.4) - UIDeviceIdentifier (~> 1) -<<<<<<< HEAD - - WordPressShared (~> 1.10-beta) - - wpxmlrpc (~> 0.9.0-beta) - - WordPressMocks (0.0.9-beta.1) -======= - WordPressShared (~> 1.12) - wpxmlrpc (~> 0.9.0) - - WordPressMocks (0.0.8) ->>>>>>> develop + - WordPressMocks (0.0.9-beta.1) - WordPressShared (1.12.0): - CocoaLumberjack (~> 3.4) - FormatterKit/TimeIntervalFormatter (= 1.8.2) @@ -511,7 +505,7 @@ DEPENDENCIES: - Starscream (= 3.0.6) - SVProgressHUD (= 2.2.5) - WordPress-Editor-iOS (~> 1.19.3) - - WordPressAuthenticator (from `https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git`, branch `fix/accessibility-ids`) + - WordPressAuthenticator (from `https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git`, commit `20f709620d777e72bd42342e4bdf86f25d7a7cbc`) - WordPressKit (~> 4.18.0-beta) - WordPressMocks (from `https://github.com/wordpress-mobile/WordPressMocks.git`, branch `update/mocks-for-screenshots`) - WordPressShared (~> 1.12.0) @@ -660,16 +654,13 @@ EXTERNAL SOURCES: RNTAztecView: :git: https://github.com/wordpress-mobile/gutenberg-mobile/ :submodules: true -<<<<<<< HEAD + :tag: v1.38.0 WordPressAuthenticator: - :branch: fix/accessibility-ids + :commit: 20f709620d777e72bd42342e4bdf86f25d7a7cbc :git: https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git WordPressMocks: :branch: update/mocks-for-screenshots :git: https://github.com/wordpress-mobile/WordPressMocks.git -======= - :tag: v1.38.0 ->>>>>>> develop Yoga: :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.38.0/third-party-podspecs/Yoga.podspec.json @@ -681,22 +672,16 @@ CHECKOUT OPTIONS: :git: https://github.com/wordpress-mobile/gutenberg-mobile/ :submodules: true :tag: v1.38.0 - RNCMaskedView: - :commit: d4ccf2bba163679c4550ce6ba0119604cd5e6379 - :git: https://github.com/react-native-community/react-native-masked-view.git RNTAztecView: :git: https://github.com/wordpress-mobile/gutenberg-mobile/ :submodules: true -<<<<<<< HEAD + :tag: v1.38.0 WordPressAuthenticator: - :commit: ee1176c17ad9e19afe53663387d50b44e657d9bc + :commit: 20f709620d777e72bd42342e4bdf86f25d7a7cbc :git: https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git WordPressMocks: :commit: 8f076a7ffb5f634ec4bebede821093abe286a68b :git: https://github.com/wordpress-mobile/WordPressMocks.git -======= - :tag: v1.38.0 ->>>>>>> develop SPEC CHECKSUMS: 1PasswordExtension: f97cc80ae58053c331b2b6dc8843ba7103b33794 @@ -777,14 +762,9 @@ SPEC CHECKSUMS: UIDeviceIdentifier: a79ccdfc940373835a7d8e9fc7541e6bf61b6319 WordPress-Aztec-iOS: b7ac8b30f746992e85d9668453ac87c2cdcecf4f WordPress-Editor-iOS: 1886f7fe464d79ee64ccfe7985281f8cf45f75eb - WordPressAuthenticator: 31bceb4ab25de663a327b791e76a405b9c903b73 -<<<<<<< HEAD - WordPressKit: 7fb381043697d3f1ec7c0f52407aa0fd54b544db - WordPressMocks: 1e04de6afa3a17f6f1ab4782f8460d7faefcf2f7 -======= + WordPressAuthenticator: 2d1db69d4a746709aa1e63750ff969166c284621 WordPressKit: 1d10fa14ea185600472d31cf25e677c7d938b17d - WordPressMocks: b4064b99a073117bbc304abe82df78f2fbe60992 ->>>>>>> develop + WordPressMocks: 1e04de6afa3a17f6f1ab4782f8460d7faefcf2f7 WordPressShared: 38cb62e9cb998d4dc3c1611f17934c6875a6b3e8 WordPressUI: 9da5d966b8beb091950cd96880db398d7f30e246 WPMediaPicker: d5ae9a83cd5cc0e4de46bfc1c59120aa86658bc3 @@ -799,10 +779,6 @@ SPEC CHECKSUMS: ZendeskSupportSDK: a87ab1e4badace92c75eb11dc77ede1e995b2adc ZIPFoundation: 249fa8890597086cd536bb2df5c9804d84e122b0 -<<<<<<< HEAD -PODFILE CHECKSUM: 2bae271e4a98c97c57399caf0ba49a81d153d44a -======= -PODFILE CHECKSUM: 7bbec11760f752c9de09862b157e7d0c9b54da1e ->>>>>>> develop +PODFILE CHECKSUM: 289dfe965f1c5db97ea2791157e533b08846cf2c COCOAPODS: 1.9.3 From 8c378e12a54bc2cfd664f1550bc6e9c21b83e915 Mon Sep 17 00:00:00 2001 From: rachelmcr Date: Wed, 7 Oct 2020 10:56:23 +0100 Subject: [PATCH 5/7] Add time for media to load before editor screenshots --- .../WordPressScreenshotGeneration.swift | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/WordPress/WordPressScreenshotGeneration/WordPressScreenshotGeneration.swift b/WordPress/WordPressScreenshotGeneration/WordPressScreenshotGeneration.swift index ab6718ec7062..614cb13143a7 100644 --- a/WordPress/WordPressScreenshotGeneration/WordPressScreenshotGeneration.swift +++ b/WordPress/WordPressScreenshotGeneration/WordPressScreenshotGeneration.swift @@ -44,6 +44,7 @@ class WordPressScreenshotGeneration: XCTestCase { .showOnly(.drafts) let postEditorScreenshot = postList.selectPost(withSlug: "our-services") + sleep(imagesWaitTime) // wait for post images to load if isIpad { snapshot("1-Editor") } else { @@ -62,7 +63,8 @@ class WordPressScreenshotGeneration: XCTestCase { .showOnly(.drafts) .selectPost(withSlug: "easy-blueberry-muffins") BlockEditorScreen().selectBlock(containingText: "Ingredients") - snapshot("6-Editor-With-Keyboard") + sleep(imagesWaitTime) // wait for post images to load + snapshot("7-Editor-With-Keyboard") ipadScreenshot.close() } else { postList.pop() From 50ca4cb58cc57395127a210ef1aaeab0d5e6ec81 Mon Sep 17 00:00:00 2001 From: rachelmcr Date: Wed, 7 Oct 2020 17:50:34 +0100 Subject: [PATCH 6/7] Update pods to release versions --- Podfile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Podfile b/Podfile index 26ade71a4b57..206fa7795655 100644 --- a/Podfile +++ b/Podfile @@ -192,10 +192,10 @@ target 'WordPress' do pod 'Gridicons', '~> 1.0.1' - # pod 'WordPressAuthenticator', '~> 1.26.0-beta' + pod 'WordPressAuthenticator', '~> 1.27.0-beta.2' # While in PR - # pod 'WordPressAuthenticator', :git => 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', :branch => 'fix/accessibility-ids' - pod 'WordPressAuthenticator', :git => 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', :commit => '20f709620d777e72bd42342e4bdf86f25d7a7cbc' + # pod 'WordPressAuthenticator', :git => 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', :branch => '' + # pod 'WordPressAuthenticator', :git => 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', :commit => '' # pod 'WordPressAuthenticator', :path => '../WordPressAuthenticator-iOS' pod 'MediaEditor', '~> 1.2.1' @@ -363,9 +363,9 @@ end ## =================== ## def wordpress_mocks - # pod 'WordPressMocks', '~> 0.0.8' + pod 'WordPressMocks', '~> 0.0.9-beta.1' # pod 'WordPressMocks', :git => 'https://github.com/wordpress-mobile/WordPressMocks.git', :commit => '' - pod 'WordPressMocks', :git => 'https://github.com/wordpress-mobile/WordPressMocks.git', :branch => 'update/mocks-for-screenshots' + # pod 'WordPressMocks', :git => 'https://github.com/wordpress-mobile/WordPressMocks.git', :branch => '' # pod 'WordPressMocks', :path => '../WordPressMocks' end From 3ec1fde045623d3c7448e7de15d96727df365295 Mon Sep 17 00:00:00 2001 From: rachelmcr Date: Wed, 7 Oct 2020 18:07:19 +0100 Subject: [PATCH 7/7] Update Podfile.lock --- Podfile.lock | 26 +++++++------------------- 1 file changed, 7 insertions(+), 19 deletions(-) diff --git a/Podfile.lock b/Podfile.lock index 7a03d54630f6..c89772e40ffe 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -395,7 +395,7 @@ PODS: - WordPress-Aztec-iOS (1.19.3) - WordPress-Editor-iOS (1.19.3): - WordPress-Aztec-iOS (= 1.19.3) - - WordPressAuthenticator (1.27.0-beta.1): + - WordPressAuthenticator (1.27.0-beta.2): - 1PasswordExtension (= 1.8.6) - Alamofire (= 4.8) - CocoaLumberjack (~> 3.5) @@ -505,9 +505,9 @@ DEPENDENCIES: - Starscream (= 3.0.6) - SVProgressHUD (= 2.2.5) - WordPress-Editor-iOS (~> 1.19.3) - - WordPressAuthenticator (from `https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git`, commit `20f709620d777e72bd42342e4bdf86f25d7a7cbc`) + - WordPressAuthenticator (~> 1.27.0-beta.2) - WordPressKit (~> 4.18.0-beta) - - WordPressMocks (from `https://github.com/wordpress-mobile/WordPressMocks.git`, branch `update/mocks-for-screenshots`) + - WordPressMocks (~> 0.0.9-beta.1) - WordPressShared (~> 1.12.0) - WordPressUI (~> 1.7.1) - WPMediaPicker (~> 1.7.2) @@ -555,7 +555,9 @@ SPEC REPOS: - UIDeviceIdentifier - WordPress-Aztec-iOS - WordPress-Editor-iOS + - WordPressAuthenticator - WordPressKit + - WordPressMocks - WordPressShared - WordPressUI - WPMediaPicker @@ -655,13 +657,6 @@ EXTERNAL SOURCES: :commit: 5ff93360313e9919c7a4b7f0faa1cb9e5e9c3542 :git: https://github.com/wordpress-mobile/gutenberg-mobile/ :submodules: true - :tag: v1.38.0 - WordPressAuthenticator: - :commit: 20f709620d777e72bd42342e4bdf86f25d7a7cbc - :git: https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git - WordPressMocks: - :branch: update/mocks-for-screenshots - :git: https://github.com/wordpress-mobile/WordPressMocks.git Yoga: :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/5ff93360313e9919c7a4b7f0faa1cb9e5e9c3542/third-party-podspecs/Yoga.podspec.json @@ -680,13 +675,6 @@ CHECKOUT OPTIONS: :commit: 5ff93360313e9919c7a4b7f0faa1cb9e5e9c3542 :git: https://github.com/wordpress-mobile/gutenberg-mobile/ :submodules: true - :tag: v1.38.0 - WordPressAuthenticator: - :commit: 20f709620d777e72bd42342e4bdf86f25d7a7cbc - :git: https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git - WordPressMocks: - :commit: 8f076a7ffb5f634ec4bebede821093abe286a68b - :git: https://github.com/wordpress-mobile/WordPressMocks.git SPEC CHECKSUMS: 1PasswordExtension: f97cc80ae58053c331b2b6dc8843ba7103b33794 @@ -767,7 +755,7 @@ SPEC CHECKSUMS: UIDeviceIdentifier: a79ccdfc940373835a7d8e9fc7541e6bf61b6319 WordPress-Aztec-iOS: b7ac8b30f746992e85d9668453ac87c2cdcecf4f WordPress-Editor-iOS: 1886f7fe464d79ee64ccfe7985281f8cf45f75eb - WordPressAuthenticator: 2d1db69d4a746709aa1e63750ff969166c284621 + WordPressAuthenticator: f81da13fbec5ad230538d93d082776777c9c09e3 WordPressKit: 1d10fa14ea185600472d31cf25e677c7d938b17d WordPressMocks: 1e04de6afa3a17f6f1ab4782f8460d7faefcf2f7 WordPressShared: 38cb62e9cb998d4dc3c1611f17934c6875a6b3e8 @@ -784,6 +772,6 @@ SPEC CHECKSUMS: ZendeskSupportSDK: a87ab1e4badace92c75eb11dc77ede1e995b2adc ZIPFoundation: 249fa8890597086cd536bb2df5c9804d84e122b0 -PODFILE CHECKSUM: 289dfe965f1c5db97ea2791157e533b08846cf2c +PODFILE CHECKSUM: e52e67df2c5945cbfa4a5bcc7648ad382f4685bc COCOAPODS: 1.9.3