rename vars for clarity

jeff4a501 · Jul 12, 2023 · 57879d5 · 57879d5
1 parent 77e9d12
commit 57879d5
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 30 deletions.
diff --git a/WordPress/UITests/Flows/LoginFlow.swift b/WordPress/UITests/Flows/LoginFlow.swift
@@ -24,13 +24,13 @@ class LoginFlow {
 
     // Login with WP site via Site Address.
     @discardableResult
-    static func login(siteUrl: String, email: String, password: String, title: String? = nil) throws -> MySiteScreen {
+    static func login(siteUrl: String, email: String, password: String, selectedSiteTitle: String? = nil) throws -> MySiteScreen {
         return try PrologueScreen()
             .selectSiteAddress()
             .proceedWithWP(siteUrl: siteUrl)
             .proceedWith(email: email)
             .proceedWithValidPassword()
-            .continueWithSelectedSite(title: title)
+            .continueWithSelectedSite(title: selectedSiteTitle)
     }
 
     // Login with self-hosted site via Site Address.

diff --git a/WordPress/UITests/Tests/EditorGutenbergTests.swift b/WordPress/UITests/Tests/EditorGutenbergTests.swift
@@ -19,48 +19,48 @@ class EditorGutenbergTests: XCTestCase {
         takeScreenshotOfFailedTest()
     }
 
-    let title = "Rich post title"
-    let content = "Some text, and more text"
+    let postTitle = "Rich post title"
+    let postContent = "Some text, and more text"
     let videoUrlPath = "http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/BigBuckBunny.mp4"
     let audioUrlPath = "http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/ElephantsDream.mp4"
 
     func testTextPostPublish() throws {
 
         try BlockEditorScreen()
-            .enterTextInTitle(text: title)
-            .addParagraphBlock(withText: content)
-            .verifyContentStructure(blocks: 1, words: content.components(separatedBy: " ").count, characters: content.count)
+            .enterTextInTitle(text: postTitle)
+            .addParagraphBlock(withText: postContent)
+            .verifyContentStructure(blocks: 1, words: postContent.components(separatedBy: " ").count, characters: postContent.count)
             .publish()
-            .viewPublishedPost(withTitle: title)
-            .verifyEpilogueDisplays(postTitle: title, siteAddress: WPUITestCredentials.testWPcomSitePrimaryAddress)
-            .done()
+            .viewPublishedPost(withTitle: postTitle)
+            .verifyEpilogueDisplays(postTitle: postTitle, siteAddress: WPUITestCredentials.testWPcomSitePrimaryAddress)
+            .tapDone()
     }
 
     func testBasicPostPublishWithCategoryAndTag() throws {
 
         let category = getCategory()
         let tag = getTag()
         try BlockEditorScreen()
-            .enterTextInTitle(text: title)
-            .addParagraphBlock(withText: content)
+            .enterTextInTitle(text: postTitle)
+            .addParagraphBlock(withText: postContent)
             .addImage()
-            .verifyContentStructure(blocks: 2, words: content.components(separatedBy: " ").count, characters: content.count)
+            .verifyContentStructure(blocks: 2, words: postContent.components(separatedBy: " ").count, characters: postContent.count)
             .openPostSettings()
             .selectCategory(name: category)
             .addTag(name: tag)
             .closePostSettings()
             .publish()
-            .viewPublishedPost(withTitle: title)
-            .verifyEpilogueDisplays(postTitle: title, siteAddress: WPUITestCredentials.testWPcomSitePrimaryAddress)
-            .done()
+            .viewPublishedPost(withTitle: postTitle)
+            .verifyEpilogueDisplays(postTitle: postTitle, siteAddress: WPUITestCredentials.testWPcomSitePrimaryAddress)
+            .tapDone()
     }
 
     func testAddRemoveFeaturedImage() throws {
 
         try BlockEditorScreen()
-            .enterTextInTitle(text: title)
-            .addParagraphBlock(withText: content)
-            .verifyContentStructure(blocks: 1, words: content.components(separatedBy: " ").count, characters: content.count)
+            .enterTextInTitle(text: postTitle)
+            .addParagraphBlock(withText: postContent)
+            .verifyContentStructure(blocks: 1, words: postContent.components(separatedBy: " ").count, characters: postContent.count)
             .openPostSettings()
             .setFeaturedImage()
             .verifyPostSettings(hasImage: true)
@@ -73,10 +73,10 @@ class EditorGutenbergTests: XCTestCase {
 
     func testAddGalleryBlock() throws {
         try BlockEditorScreen()
-            .enterTextInTitle(text: title)
-            .addParagraphBlock(withText: content)
+            .enterTextInTitle(text: postTitle)
+            .addParagraphBlock(withText: postContent)
             .addImageGallery()
-            .verifyContentStructure(blocks: 2, words: content.components(separatedBy: " ").count, characters: content.count)
+            .verifyContentStructure(blocks: 2, words: postContent.components(separatedBy: " ").count, characters: postContent.count)
     }
 
     func testAddMediaBlocks() throws {

diff --git a/WordPress/UITests/Tests/PostTests.swift b/WordPress/UITests/Tests/PostTests.swift
@@ -10,7 +10,7 @@ class PostTests: XCTestCase {
             siteUrl: WPUITestCredentials.testWPcomSiteAddress,
             email: WPUITestCredentials.testWPcomUserEmail,
             password: WPUITestCredentials.testWPcomPassword,
-            title: WPUITestCredentials.testWPcomSiteForScheduledPost
+            selectedSiteTitle: WPUITestCredentials.testWPcomSiteForScheduledPost
         )
 
         try TabNavComponent()
@@ -22,18 +22,18 @@ class PostTests: XCTestCase {
         takeScreenshotOfFailedTest()
     }
 
-    let title = "Scheduled Post"
+    let postTitle = "Scheduled Post"
 
     func testCreateScheduledPost() throws {
         try BlockEditorScreen()
-            .enterTextInTitle(text: title)
+            .enterTextInTitle(text: postTitle)
             .openPostSettings()
-            .updatePublishDate()
+            .updatePublishDateToFutureDate()
             .closePublishDateSelector()
             .closePostSettings()
             .schedulePost()
-            .viewPublishedPost(withTitle: title)
-            .verifyEpilogueDisplays(postTitle: title, siteAddress: WPUITestCredentials.testWPcomSiteForScheduledPost)
-            .done()
+            .viewPublishedPost(withTitle: postTitle)
+            .verifyEpilogueDisplays(postTitle: postTitle, siteAddress: WPUITestCredentials.testWPcomSiteForScheduledPost)
+            .tapDone()
     }
 }
diff --git a/WordPress/UITestsFoundation/Screens/Editor/EditorPublishEpilogueScreen.swift b/WordPress/UITestsFoundation/Screens/Editor/EditorPublishEpilogueScreen.swift
@@ -27,7 +27,7 @@ public class EditorPublishEpilogueScreen: ScreenObject {
     }
 
     /// - Note: Returns `Void` since the return screen depends on which screen we started from.
-    public func done() {
+    public func tapDone() {
         doneButton.tap()
     }