Automatically upload published and draft posts

WordPress/Classes/Services/PostAutoUploadInteractor.swift

@@ -26,8 +26,7 @@ final class PostAutoUploadInteractor {
     func autoUploadAction(for post: AbstractPost) -> AutoUploadAction {
         guard post.isFailed,
             let status = post.status,
-            PostAutoUploadInteractor.allowedStatuses.contains(status),
-            !post.hasRemote() else {
+            PostAutoUploadInteractor.allowedStatuses.contains(status) else {
                 return .nothing
         }
 

WordPress/Classes/ViewRelated/Post/PostCardStatusViewModel.swift

@@ -56,15 +56,7 @@ class PostCardStatusViewModel: NSObject {
         if MediaCoordinator.shared.isUploadingMedia(for: post) {
             return NSLocalizedString("Uploading media...", comment: "Message displayed on a post's card while the post is uploading media")
         } else if post.isFailed {
-            if canCancelAutoUpload {
-                return StatusMessages.postWillBePublished
-            }
-
-            if post.wasAutoUploadCancelled {
-                return StatusMessages.localChanges
-            }
-
-            return StatusMessages.uploadFailed
+            return generateFailedStatusMessage()
         } else if post.remoteStatus == .pushing {
             return NSLocalizedString("Uploading post...", comment: "Message displayed on a post's card when the post has failed to upload")
         } else {
@@ -98,7 +90,8 @@ class PostCardStatusViewModel: NSObject {
         }
 
         if post.isFailed {
-            return (canCancelAutoUpload || post.wasAutoUploadCancelled) ? .warning : .error
+            let autoUploadAction = autoUploadInteractor.autoUploadAction(for: post)
+            return (autoUploadAction == .upload || post.wasAutoUploadCancelled) ? .warning : .error
         }
 
         switch status {
@@ -216,6 +209,39 @@ class PostCardStatusViewModel: NSObject {
         return [status, sticky].filter { !$0.isEmpty }.joined(separator: separator)
     }
 
+    /// Determine what the failed status message should be and return it.
+    ///
+    /// This is a helper method for `status`.
+    private func generateFailedStatusMessage() -> String {
+        assert(post.remoteStatus == .failed, "This should only be used if the remoteStatus is .failed")
+
+        let defaultFailedMessage = StatusMessages.uploadFailed
+
+        guard post.remoteStatus == .failed, let postStatus = post.status else {
+            return defaultFailedMessage
+        }
+
+        if post.wasAutoUploadCancelled {
+            return StatusMessages.localChanges
+        }
+
+        if autoUploadInteractor.autoUploadAction(for: post) != .upload {
+            return defaultFailedMessage
+        }
+        if post.hasRemote() {
+            return StatusMessages.changesWillBeUploaded
+        }
+
+        switch postStatus {
+        case .draft:
+            return StatusMessages.draftWillBeUploaded
+        case .publish:
+            return StatusMessages.postWillBePublished
+        default:
+            return defaultFailedMessage
+        }
+    }
+
     private enum Constants {
         static let stickyLabel = NSLocalizedString("Sticky", comment: "Label text that defines a post marked as sticky")
     }
@@ -225,5 +251,9 @@ class PostCardStatusViewModel: NSObject {
         static let postWillBePublished = NSLocalizedString("Post will be published next time your device is online",
                                                            comment: "Message shown in the posts list when a post is scheduled for publishing")
         static let localChanges = NSLocalizedString("Local changes", comment: "A status label for a post that only exists on the user's iOS device, and has not yet been published to their blog.")
+        static let draftWillBeUploaded = NSLocalizedString("Draft will be uploaded next time your device is online",
+                                                           comment: "Message shown in post list when a draft is scheduled to be automatically uploaded.")
+        static let changesWillBeUploaded = NSLocalizedString("Changes will be uploaded next time your device is online",
+                                                             comment: "Message shown in post list when a post's local changes will be automatically uploaded when the device is online.")
     }
 }

WordPress/Classes/ViewRelated/Post/PostNoticeViewModel.swift

@@ -7,6 +7,7 @@ enum PostNoticeUserInfoKey {
 struct PostNoticeViewModel {
     private let post: AbstractPost
     private let postCoordinator: PostCoordinator
+    private let autoUploadInteractor = PostAutoUploadInteractor()
 
     init(post: AbstractPost, postCoordinator: PostCoordinator = PostCoordinator.shared) {
         self.post = post
@@ -103,16 +104,31 @@ struct PostNoticeViewModel {
         }
     }
 
-    // TODO Move strings to FailureTitles enum
     private var failureTitle: String {
-        if post.status == .publish {
-            return FailureTitles.postWillBePublished
+        var defaultTitle: String {
+            if post is Page {
+                return FailureTitles.pageFailedToUpload
+            } else {
+                return FailureTitles.postFailedToUpload
+            }
         }
 
-        if post is Page {
-            return NSLocalizedString("Page failed to upload", comment: "Title of notification displayed when a page has failed to upload.")
-        } else {
-            return NSLocalizedString("Post failed to upload", comment: "Title of notification displayed when a post has failed to upload.")
+        guard let postStatus = post.status,
+            autoUploadInteractor.autoUploadAction(for: post) == .upload else {
+            return defaultTitle
+        }
+
+        if post.hasRemote() {
+            return FailureTitles.changesWillBeUploaded
+        }
+
+        switch postStatus {
+        case .draft:
+            return FailureTitles.draftWillBeUploaded
+        case .publish:
+            return FailureTitles.postWillBePublished
+        default:
+            return defaultTitle
         }
     }
 
@@ -201,8 +217,7 @@ struct PostNoticeViewModel {
     }
 
     private var failureAction: FailureAction {
-        let interactor = PostAutoUploadInteractor()
-        return interactor.canCancelAutoUpload(of: post) ? .cancel : .retry
+        return autoUploadInteractor.canCancelAutoUpload(of: post) ? .cancel : .retry
     }
 
     // MARK: - Action Handlers
@@ -247,6 +262,14 @@ struct PostNoticeViewModel {
     enum FailureTitles {
         static let postWillBePublished = NSLocalizedString("Post will be published the next time your device is online",
                                                            comment: "Text displayed in notice after a post if published while offline.")
+        static let draftWillBeUploaded = NSLocalizedString("Draft will be uploaded next time your device is online",
+                                                           comment: "Text displayed in notice after the app fails to upload a draft.")
+        static let pageFailedToUpload = NSLocalizedString("Page failed to upload",
+                                                          comment: "Title of notification displayed when a page has failed to upload.")
+        static let postFailedToUpload = NSLocalizedString("Post failed to upload",
+                                                          comment: "Title of notification displayed when a post has failed to upload.")
+        static let changesWillBeUploaded = NSLocalizedString("Changes will be uploaded next time your device is online",
+                                                             comment: "Text displayed in notice after the app fails to upload a post.")
     }
 
     enum FailureActionTitles {

WordPress/WordPressTest/PostBuilder.swift

@@ -42,6 +42,11 @@ class PostBuilder {
         return self
     }
 
+    func with(status: BasePost.Status) -> PostBuilder {
+        post.status = status
+        return self
+    }
+
     func with(title: String) -> PostBuilder {
         post.postTitle = title
         return self

WordPress/WordPressTest/PostCardCellTests.swift

@@ -14,6 +14,7 @@ class PostCardCellTests: XCTestCase {
     private var postActionSheetDelegateMock: PostActionSheetDelegateMock!
 
     override func setUp() {
+        super.setUp()
         contextManager = TestContextManager()
         context = contextManager.newDerivedContext()
 
@@ -263,9 +264,21 @@ class PostCardCellTests: XCTestCase {
         XCTAssertFalse(postCell.separatorLabel.isHidden)
     }
 
-    func testShowsWarningMessageForFailedPublishedPosts() {
+    func testShowsChangesWillBeUploadedWarningForFailedPublishedPostsWithRemote() {
         // Given
-        let post = PostBuilder().published().with(remoteStatus: .failed).confirmedAutoUpload().build()
+        let post = PostBuilder(context).published().withRemote().with(remoteStatus: .failed).confirmedAutoUpload().build()
+
+        // When
+        postCell.configure(with: post)
+
+        // Then
+        XCTAssertEqual(postCell.statusLabel.text, StatusMessages.changesWillBeUploaded)
+        XCTAssertEqual(postCell.statusLabel.textColor, UIColor.warning)
+    }
+
+    func testShowsPostWillBePublishedWarningForLocallyPublishedPosts() {
+        // Given
+        let post = PostBuilder(context).published().with(remoteStatus: .failed).confirmedAutoUpload().build()
 
         // When
         postCell.configure(with: post)
@@ -326,6 +339,30 @@ class PostCardCellTests: XCTestCase {
         XCTAssertEqual(postCell.statusLabel.textColor, UIColor.warning)
     }
 
+    func testShowsChangesWillBeUploadedMessageForDraftsWithRemote() {
+        // Given
+        let post = PostBuilder(context).drafted().withRemote().with(remoteStatus: .failed).confirmedAutoUpload().build()
+
+        // When
+        postCell.configure(with: post)
+
+        // Then
+        XCTAssertEqual(postCell.statusLabel.text, StatusMessages.changesWillBeUploaded)
+        XCTAssertEqual(postCell.statusLabel.textColor, UIColor.warning)
+    }
+
+    func testShowsDraftWillBeUploadedMessageForLocalDrafts() {
+        // Given
+        let post = PostBuilder(context).drafted().with(remoteStatus: .failed).build()
+
+        // When
+        postCell.configure(with: post)
+
+        // Then
+        XCTAssertEqual(postCell.statusLabel.text, StatusMessages.draftWillBeUploaded)
+        XCTAssertEqual(postCell.statusLabel.textColor, UIColor.warning)
+    }
+
     private func postCellFromNib() -> PostCardCell {
         let bundle = Bundle(for: PostCardCell.self)
         guard let postCell = bundle.loadNibNamed("PostCardCell", owner: nil)?.first as? PostCardCell else {

WordPress/WordPressTest/Services/PostAutoUploadInteractorTests.swift

@@ -31,10 +31,12 @@ class PostCoordinatorUploadActionUseCaseTests: XCTestCase {
             createPost(.publish, confirmedAutoUpload: true): .upload,
             // Published local drafts with no confirmation will be remote auto-saved
             createPost(.publish): .autoSave,
-            // Draft and published posts with remote are currently unsupported. This will be
-            // fixed soon.
-            createPost(.draft, hasRemote: true): .nothing,
-            createPost(.publish, hasRemote: true): .nothing,
+            // Posts with remote that do not have confirmation will be remote auto-saved
+            createPost(.draft, hasRemote: true): .autoSave,
+            createPost(.publish, hasRemote: true): .autoSave,
+            // Posts with remote that have confirmation will be automatically uploaded
+            createPost(.draft, hasRemote: true, confirmedAutoUpload: true): .upload,
+            createPost(.publish, hasRemote: true, confirmedAutoUpload: true): .upload,
             // Other statuses are currently ignored
             createPost(.publishPrivate, confirmedAutoUpload: true): .nothing,
             createPost(.scheduled, confirmedAutoUpload: true): .nothing,
@@ -67,7 +69,7 @@ class PostCoordinatorUploadActionUseCaseTests: XCTestCase {
     }
 
     /// Test which auto-uploaded post types can be canceled by the user
-    func testCancelAutoUploadMethodAppliesToLocalDraftsAndConfirmedUploads() {
+    func testCancelAutoUploadMethodAppliesToDraftsAndConfirmedUploads() {
         // Arrange
         let postsAndExpectedCancelableResult: [Post: Bool] = [
             // Local drafts are automatically uploaded and do not need to be canceled. We consider
@@ -79,10 +81,9 @@ class PostCoordinatorUploadActionUseCaseTests: XCTestCase {
             // auto-saved is considered safe and do not need to be canceled. It should also happen
             // in the background without any interaction from the user.
             createPost(.publish): false,
-            // Draft and published posts with remote are currently unsupported. These should
-            // allow cancelation. This will be fixed soon.
-            createPost(.draft, hasRemote: true, confirmedAutoUpload: true): false,
-            createPost(.publish, hasRemote: true, confirmedAutoUpload: true): false,
+            // Confirmed draft and published posts with remote will be automatically uploaded.
+            createPost(.draft, hasRemote: true, confirmedAutoUpload: true): true,
+            createPost(.publish, hasRemote: true, confirmedAutoUpload: true): true,
             // Posts with remote that have no confirmation will be remote auto-saved.
             createPost(.draft, hasRemote: true): false,
             createPost(.publish, hasRemote: true): false,

WordPress/WordPressTest/Services/PostCoordinatorFailedPostsFetcherTests.swift

@@ -29,11 +29,11 @@ class PostCoordinatorFailedPostsFetcherTests: XCTestCase {
             createPost(status: .draft),
             createPost(status: .draft),
             createPost(status: .draft),
-            createPost(status: .publish)
-        ]
-        let unexpectedPosts = [
+            createPost(status: .publish),
             createPost(status: .draft, hasRemote: true),
             createPost(status: .publish, hasRemote: true),
+        ]
+        let unexpectedPosts = [
             createPost(status: .publishPrivate),
             createPost(status: .publishPrivate, hasRemote: true),
             createPost(status: .scheduled),