Merge branch 'develop' into patch_rn_for_action_sheet

wordpress-mobile · May 22, 2020 · b359306 · b359306
2 parents cad7b71 + c598210
commit b359306
Show file tree

Hide file tree

Showing 7 changed files with 63 additions and 39 deletions.
diff --git a/Podfile b/Podfile
@@ -43,7 +43,7 @@ def wordpress_ui
 end
 
 def wordpress_kit
-    pod 'WordPressKit', '~> 4.8.0'
+    pod 'WordPressKit', '~> 4.9.0-beta.1'
     #pod 'WordPressKit', :git => 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', :tag => ''
     #pod 'WordPressKit', :git => 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', :branch => ''
     #pod 'WordPressKit', :git => 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', :commit => ''
@@ -176,14 +176,15 @@ target 'WordPress' do
 
     pod 'NSURL+IDN', '~> 0.4'
 
-    pod 'WPMediaPicker', '~> 1.6.1'
+    # pod 'WPMediaPicker', '~> 1.6.1'
+    pod 'WPMediaPicker', :git => 'https://github.com/wordpress-mobile/MediaPicker-iOS.git', :tag => '1.7.0-beta.2'
     ## while PR is in review:
     # pod 'WPMediaPicker', :git => 'https://github.com/wordpress-mobile/MediaPicker-iOS.git', :branch => ''
     # pod 'WPMediaPicker', :path => '../MediaPicker-iOS'
 
     pod 'Gridicons', '~> 1.0.1'
 
-    pod 'WordPressAuthenticator', '~> 1.16.1'
+    pod 'WordPressAuthenticator', '~> 1.17.0-beta.4'
     # 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', :commit => ''

diff --git a/Podfile.lock b/Podfile.lock
@@ -5,6 +5,11 @@ PODS:
     - Alamofire (~> 4.8)
   - AlamofireNetworkActivityIndicator (2.4.0):
     - Alamofire (~> 4.8)
+  - AppAuth (1.3.0):
+    - AppAuth/Core (= 1.3.0)
+    - AppAuth/ExternalUserAgent (= 1.3.0)
+  - AppAuth/Core (1.3.0)
+  - AppAuth/ExternalUserAgent (1.3.0)
   - AppCenter (2.5.1):
     - AppCenter/Analytics (= 2.5.1)
     - AppCenter/Crashes (= 2.5.1)
@@ -53,20 +58,19 @@ PODS:
   - FSInteractiveMap (0.1.0)
   - Gifu (3.2.0)
   - glog (0.3.5)
-  - GoogleSignIn (4.4.0):
-    - "GoogleToolboxForMac/NSDictionary+URLArguments (~> 2.1)"
-    - "GoogleToolboxForMac/NSString+URLArguments (~> 2.1)"
+  - GoogleSignIn (5.0.2):
+    - AppAuth (~> 1.2)
+    - GTMAppAuth (~> 1.0)
     - GTMSessionFetcher/Core (~> 1.1)
-  - GoogleToolboxForMac/DebugUtils (2.2.2):
-    - GoogleToolboxForMac/Defines (= 2.2.2)
-  - GoogleToolboxForMac/Defines (2.2.2)
-  - "GoogleToolboxForMac/NSDictionary+URLArguments (2.2.2)":
-    - GoogleToolboxForMac/DebugUtils (= 2.2.2)
-    - GoogleToolboxForMac/Defines (= 2.2.2)
-    - "GoogleToolboxForMac/NSString+URLArguments (= 2.2.2)"
-  - "GoogleToolboxForMac/NSString+URLArguments (2.2.2)"
   - Gridicons (1.0.1)
+  - GTMAppAuth (1.0.0):
+    - AppAuth/Core (~> 1.0)
+    - GTMSessionFetcher (~> 1.1)
+  - GTMSessionFetcher (1.4.0):
+    - GTMSessionFetcher/Full (= 1.4.0)
   - GTMSessionFetcher/Core (1.4.0)
+  - GTMSessionFetcher/Full (1.4.0):
+    - GTMSessionFetcher/Core (= 1.4.0)
   - Gutenberg (1.28.0):
     - React (= 0.61.5)
     - React-CoreModules (= 0.61.5)
@@ -376,19 +380,19 @@ PODS:
   - WordPress-Aztec-iOS (1.19.1)
   - WordPress-Editor-iOS (1.19.1):
     - WordPress-Aztec-iOS (= 1.19.1)
-  - WordPressAuthenticator (1.16.1):
+  - WordPressAuthenticator (1.17.0-beta.4):
     - 1PasswordExtension (= 1.8.6)
     - Alamofire (= 4.8)
     - CocoaLumberjack (~> 3.5)
-    - GoogleSignIn (~> 4.4)
+    - GoogleSignIn (~> 5.0.2)
     - Gridicons (~> 1.0)
     - lottie-ios (= 3.1.6)
     - "NSURL+IDN (= 0.4)"
     - SVProgressHUD (= 2.2.5)
-    - WordPressKit (~> 4.8.0)
+    - WordPressKit (~> 4.9.0-beta.1)
     - WordPressShared (~> 1.8.16)
     - WordPressUI (~> 1.7.0)
-  - WordPressKit (4.8.0):
+  - WordPressKit (4.9.0-beta.1):
     - Alamofire (~> 4.8.0)
     - CocoaLumberjack (~> 3.4)
     - NSObject-SafeExpectations (= 0.0.4)
@@ -400,7 +404,7 @@ PODS:
     - CocoaLumberjack (~> 3.4)
     - FormatterKit/TimeIntervalFormatter (= 1.8.2)
   - WordPressUI (1.7.0)
-  - WPMediaPicker (1.6.1)
+  - WPMediaPicker (1.7.0-beta.2)
   - wpxmlrpc (0.8.5)
   - Yoga (1.14.0)
   - ZendeskCommonUISDK (4.0.0):
@@ -479,12 +483,12 @@ DEPENDENCIES:
   - Starscream (= 3.0.6)
   - SVProgressHUD (= 2.2.5)
   - WordPress-Editor-iOS (~> 1.19.1)
-  - WordPressAuthenticator (~> 1.16.1)
-  - WordPressKit (~> 4.8.0)
+  - WordPressAuthenticator (~> 1.17.0-beta.4)
+  - WordPressKit (~> 4.9.0-beta.1)
   - WordPressMocks (~> 0.0.8)
   - WordPressShared (~> 1.8.16)
   - WordPressUI (~> 1.7.0)
-  - WPMediaPicker (~> 1.6.1)
+  - WPMediaPicker (from `https://github.com/wordpress-mobile/MediaPicker-iOS.git`, tag `1.7.0-beta.2`)
   - Yoga (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/1f5ee28cfd84a9a7fd962f0d63f560baeb777ba7/react-native-gutenberg-bridge/third-party-podspecs/Yoga.podspec.json`)
   - ZendeskSupportSDK (= 5.0.0)
   - ZIPFoundation (~> 0.9.8)
@@ -495,6 +499,7 @@ SPEC REPOS:
     - Alamofire
     - AlamofireImage
     - AlamofireNetworkActivityIndicator
+    - AppAuth
     - AppCenter
     - Automattic-Tracks-iOS
     - boost-for-react-native
@@ -505,8 +510,8 @@ SPEC REPOS:
     - FormatterKit
     - Gifu
     - GoogleSignIn
-    - GoogleToolboxForMac
     - Gridicons
+    - GTMAppAuth
     - GTMSessionFetcher
     - JTAppleCalendar
     - lottie-ios
@@ -532,7 +537,6 @@ SPEC REPOS:
     - WordPressMocks
     - WordPressShared
     - WordPressUI
-    - WPMediaPicker
     - wpxmlrpc
     - ZendeskCommonUISDK
     - ZendeskCoreSDK
@@ -613,6 +617,9 @@ EXTERNAL SOURCES:
   RNTAztecView:
     :commit: 1f5ee28cfd84a9a7fd962f0d63f560baeb777ba7
     :git: http://github.com/wordpress-mobile/gutenberg-mobile/
+  WPMediaPicker:
+    :git: https://github.com/wordpress-mobile/MediaPicker-iOS.git
+    :tag: 1.7.0-beta.2
   Yoga:
     :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/1f5ee28cfd84a9a7fd962f0d63f560baeb777ba7/react-native-gutenberg-bridge/third-party-podspecs/Yoga.podspec.json
 
@@ -626,12 +633,16 @@ CHECKOUT OPTIONS:
   RNTAztecView:
     :commit: 1f5ee28cfd84a9a7fd962f0d63f560baeb777ba7
     :git: http://github.com/wordpress-mobile/gutenberg-mobile/
+  WPMediaPicker:
+    :git: https://github.com/wordpress-mobile/MediaPicker-iOS.git
+    :tag: 1.7.0-beta.2
 
 SPEC CHECKSUMS:
   1PasswordExtension: f97cc80ae58053c331b2b6dc8843ba7103b33794
   Alamofire: 3ec537f71edc9804815215393ae2b1a8ea33a844
   AlamofireImage: 63cfe3baf1370be6c498149687cf6db3e3b00999
   AlamofireNetworkActivityIndicator: 9acc3de3ca6645bf0efed462396b0df13dd3e7b8
+  AppAuth: 73574f3013a1e65b9601a3ddc8b3158cce68c09d
   AppCenter: fddcbac6e4baae3d93a196ceb0bfe0e4ce407dec
   Automattic-Tracks-iOS: dbe6301bebdc1e444972475bae19299491702cef
   boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
@@ -646,9 +657,9 @@ SPEC CHECKSUMS:
   FSInteractiveMap: a396f610f48b76cb540baa87139d056429abda86
   Gifu: 7bcb6427457d85e0b4dff5a84ec5947ac19a93ea
   glog: 1f3da668190260b06b429bb211bfbee5cd790c28
-  GoogleSignIn: 7ff245e1a7b26d379099d3243a562f5747e23d39
-  GoogleToolboxForMac: 800648f8b3127618c1b59c7f97684427630c5ea3
+  GoogleSignIn: 7137d297ddc022a7e0aa4619c86d72c909fa7213
   Gridicons: 8e19276b20bb15d1fda1d4d0db96d066d170135b
+  GTMAppAuth: 4deac854479704f348309e7b66189e604cf5e01e
   GTMSessionFetcher: 6f5c8abbab8a9bce4bb3f057e317728ec6182b10
   Gutenberg: 0c90bd47ecf991fbe677172a3a2f8ab1ef715c07
   JTAppleCalendar: 932cadea40b1051beab10f67843451d48ba16c99
@@ -697,12 +708,12 @@ SPEC CHECKSUMS:
   UIDeviceIdentifier: 44f805037d21b94394821828f4fcaba34b38c2d0
   WordPress-Aztec-iOS: 25a9cbe204a22dd6d540d66d90b8a889421e0b42
   WordPress-Editor-iOS: 9f3d720086b90fd8b73f8eccd744c15abbdb7607
-  WordPressAuthenticator: b9955b0978828b97593df3e659571aa78943c7b0
-  WordPressKit: 84045e236949248632a2c644149e5657733011bb
+  WordPressAuthenticator: 6648c27a13a5ef13045af7fe30ea6ef60a1252b5
+  WordPressKit: e8aab0ace717c9b9be307ccfdda08821f31b655c
   WordPressMocks: b4064b99a073117bbc304abe82df78f2fbe60992
   WordPressShared: 1bc316ed162f42af4e0fa2869437e9e28b532b01
   WordPressUI: 1cf47a3b78154faf69caa18569ee7ece1e510fa0
-  WPMediaPicker: 59559813ec8a7929a91aa5a1db74998d8485fb9f
+  WPMediaPicker: d4f6fb1f2f803469c28ada02e2cc60e4e5140882
   wpxmlrpc: 6a9bdd6ab9d1b159b384b0df0f3f39de9af4fecf
   Yoga: c920bf12bf8146aa5cd118063378c2cf5682d16c
   ZendeskCommonUISDK: 3c432801e31abff97d6e30441ea102eaef6b99e2
@@ -714,6 +725,6 @@ SPEC CHECKSUMS:
   ZendeskSupportSDK: a87ab1e4badace92c75eb11dc77ede1e995b2adc
   ZIPFoundation: 249fa8890597086cd536bb2df5c9804d84e122b0
 
-PODFILE CHECKSUM: ffa39472a3b20875985a9b9a49475e92b56b5f79
+PODFILE CHECKSUM: e130e9863883c1e89bb3c516322f0dfdb950b673
 
 COCOAPODS: 1.8.4
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
@@ -1,6 +1,7 @@
 15.0
 -----
 * [**] Block editor: Fix media upload progress when there's no connection.
+* [*] Fix a bug where taking a photo for your user gravatar got you blocked in the crop screen.
 
 14.9
 -----

diff --git a/WordPress/WordPressUITests/Screens/MySiteScreen.swift b/WordPress/WordPressUITests/Screens/MySiteScreen.swift
@@ -82,4 +82,8 @@ class MySiteScreen: BaseScreen {
         createButton.tap()
         return ActionSheetComponent()
     }
+
+    static func isLoaded() -> Bool {
+        return XCUIApplication().tables[ElementStringIDs.blogTable].exists
+    }
 }
diff --git a/WordPress/WordPressUITests/Screens/ReaderScreen.swift b/WordPress/WordPressUITests/Screens/ReaderScreen.swift
@@ -1,13 +1,21 @@
 import Foundation
 import XCTest
 
+private struct ElementStringIDs {
+    static let readerTable = "Reader"
+}
+
 class ReaderScreen: BaseScreen {
     let tabBar: TabNavComponent
 
     init() {
-        let readerTable = XCUIApplication().tables["Reader"]
+        let readerTable = XCUIApplication().tables[ElementStringIDs.readerTable]
         tabBar = TabNavComponent()
 
         super.init(element: readerTable)
     }
+
+    static func isLoaded() -> Bool {
+        return XCUIApplication().tables[ElementStringIDs.readerTable].exists
+    }
 }
diff --git a/WordPress/WordPressUITests/Tests/MainNavigationTests.swift b/WordPress/WordPressUITests/Tests/MainNavigationTests.swift
@@ -7,9 +7,8 @@ class MainNavigationTests: XCTestCase {
         setUpTestSuite()
 
         _ = LoginFlow.login(siteUrl: WPUITestCredentials.testWPcomSiteAddress, username: WPUITestCredentials.testWPcomUsername, password: WPUITestCredentials.testWPcomPassword)
-        mySiteScreen = EditorFlow
-            .toggleBlockEditor(to: .on)
-            .goBackToMySite()
+        mySiteScreen = TabNavComponent()
+         .gotoMySiteScreen()
     }
 
     override func tearDown() {
@@ -19,13 +18,14 @@ class MainNavigationTests: XCTestCase {
     }
 
     func testTabBarNavigation() {
-        mySiteScreen
-            .tabBar.gotoMySitesScreen()
-            .tabBar.gotoBlockEditorScreen()
-            .closeEditor()
+        XCTAssert(MySiteScreen.isLoaded(), "MySitesScreen screen isn't loaded.")
 
         _ = mySiteScreen
             .tabBar.gotoReaderScreen()
+
+        XCTAssert(ReaderScreen.isLoaded(), "Reader screen isn't loaded.")
+
+        _ = mySiteScreen
             .tabBar.gotoNotificationsScreen()
 
         XCTContext.runActivity(named: "Confirm Notifications screen and main navigation bar are loaded.") { (activity) in

diff --git a/WordPress/WordPressUITests/WordPressUITests.xctestplan b/WordPress/WordPressUITests/WordPressUITests.xctestplan
@@ -22,7 +22,6 @@
       "skippedTests" : [
         "EditorTests\/testPlayground()",
         "LoginTests\/testEmailMagicLinkLogin()",
-        "MainNavigationTests\/testTabBarNavigation()",
         "SignupTests\/testEmailSignup()"
       ],
       "target" : {