Fix tests

codemagic-ci-cd · Dec 7, 2023 · c13154f · c13154f
1 parent 9732a8c
commit c13154f
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 60 deletions.
diff --git a/.../Components/Components/Editors/Source Editor/WKSourceEditorAccessibilityIdentifiers.swift b/.../Components/Components/Editors/Source Editor/WKSourceEditorAccessibilityIdentifiers.swift
@@ -4,29 +4,25 @@ public struct WKSourceEditorAccessibilityIdentifiers {
 
     static var current: WKSourceEditorAccessibilityIdentifiers?
 
-    public init(textView: String, findButton: String, showMoreButton: String, closeButton: String, formatTextButton: String, formatHeadingButton: String, expandingToolbar: String, highlightToolbar: String, findToolbar: String, mainInputView: String, headerSelectInputView: String) {
+    public init(textView: String, findButton: String, showMoreButton: String, closeButton: String, formatTextButton: String, expandingToolbar: String, highlightToolbar: String, findToolbar: String, inputView: String) {
         self.textView = textView
         self.findButton = findButton
         self.showMoreButton = showMoreButton
         self.closeButton = closeButton
         self.formatTextButton = formatTextButton
-        self.formatHeadingButton = formatHeadingButton
         self.expandingToolbar = expandingToolbar
         self.highlightToolbar = highlightToolbar
         self.findToolbar = findToolbar
-        self.mainInputView = mainInputView
-        self.headerSelectInputView = headerSelectInputView
+        self.inputView = inputView
     }
 
     let textView: String
     let findButton: String
     let showMoreButton: String
     let closeButton: String
     let formatTextButton: String
-    let formatHeadingButton: String
     let expandingToolbar: String
     let highlightToolbar: String
     let findToolbar: String
-    let mainInputView: String
-    let headerSelectInputView: String
+    let inputView: String
 }
diff --git a/...ts/Sources/Components/Components/Editors/Source Editor/WKSourceEditorViewController.swift b/...ts/Sources/Components/Components/Editors/Source Editor/WKSourceEditorViewController.swift
@@ -64,7 +64,9 @@ public class WKSourceEditorViewController: WKComponentViewController {
     // Input Views
 
     private lazy var editorInputView: UIView? = {
-        return WKEditorInputView(delegate: self)
+        let inputView = WKEditorInputView(delegate: self)
+        inputView.accessibilityIdentifier = WKSourceEditorAccessibilityIdentifiers.current?.inputView
+        return inputView
     }()
 
     // Input Tracking Properties

diff --git a/Components/Tests/ComponentsTests/WKSourceEditorTests.swift b/Components/Tests/ComponentsTests/WKSourceEditorTests.swift
@@ -59,7 +59,6 @@ extension WKSourceEditorLocalizedStrings {
             findReplaceTypeAll: "",
             findReplaceWith: "",
             accessibilityLabelButtonFormatText: "",
-            accessibilityLabelButtonFormatHeading: "",
             accessibilityLabelButtonCitation: "",
             accessibilityLabelButtonCitationSelected: "",
             accessibilityLabelButtonLink: "",
@@ -82,7 +81,6 @@ extension WKSourceEditorLocalizedStrings {
             accessibilityLabelButtonBoldSelected: "",
             accessibilityLabelButtonItalics: "",
             accessibilityLabelButtonItalicsSelected: "",
-            accessibilityLabelButtonClearFormatting: "",
             accessibilityLabelButtonShowMore: "",
             accessibilityLabelButtonComment: "",
             accessibilityLabelButtonCommentSelected: "",

diff --git a/Wikipedia/Code/PageEditorViewController.swift b/Wikipedia/Code/PageEditorViewController.swift
@@ -319,10 +319,8 @@ enum SourceEditorAccessibilityIdentifiers: String {
     case showMoreButton = "Source Editor Show More Button"
     case closeButton = "Source Editor Close Button"
     case formatTextButton = "Source Editor Format Text Button"
-    case formatHeadingButton = "Source Editor Format Heading Button"
     case expandingToolbar = "Source Editor Expanding Toolbar"
     case highlightToolbar = "Source Editor Highlight Toolbar"
     case findToolbar = "Source Editor Find Toolbar"
-    case mainInputView = "Source Editor Main Input View"
-    case headerSelectInputView = "Source Editor Header Select Input View"
+    case inputView = "Source Editor Input View"
 }
diff --git a/WikipediaUITests/UITestHelperViewController.swift b/WikipediaUITests/UITestHelperViewController.swift
@@ -106,12 +106,10 @@ public class UITestHelperViewController: WKCanvasViewController {
             showMoreButton: SourceEditorAccessibilityIdentifiers.showMoreButton.rawValue,
             closeButton: SourceEditorAccessibilityIdentifiers.closeButton.rawValue,
             formatTextButton: SourceEditorAccessibilityIdentifiers.formatTextButton.rawValue,
-            formatHeadingButton: SourceEditorAccessibilityIdentifiers.formatHeadingButton.rawValue,
             expandingToolbar: SourceEditorAccessibilityIdentifiers.expandingToolbar.rawValue,
             highlightToolbar: SourceEditorAccessibilityIdentifiers.highlightToolbar.rawValue,
             findToolbar: SourceEditorAccessibilityIdentifiers.findButton.rawValue,
-            mainInputView: SourceEditorAccessibilityIdentifiers.mainInputView.rawValue,
-            headerSelectInputView: SourceEditorAccessibilityIdentifiers.headerSelectInputView.rawValue
+            inputView: SourceEditorAccessibilityIdentifiers.inputView.rawValue
           )
 
         let textAlignment: NSTextAlignment = UIApplication.shared.userInterfaceLayoutDirection == .rightToLeft ? .right : .left

diff --git a/WikipediaUITests/WKSourceEditorUITests.swift b/WikipediaUITests/WKSourceEditorUITests.swift
@@ -18,8 +18,7 @@ final class WKSourceEditorUITests: XCTestCase {
         textView.tap()
         textView.typeText("Hello World!")
 
-        XCTAssertFalse(app.isDisplayingMainInputView)
-        XCTAssertFalse(app.isDisplayingHeaderSelectView)
+        XCTAssertFalse(app.isDisplayingInputView)
         XCTAssertTrue(app.isDisplayingExpandingToolbar)
         XCTAssertFalse(app.isDisplayingHighlightingToolbar)
         XCTAssertFalse(app.isDisplayingFindAndReplaceToolbar)
@@ -30,8 +29,7 @@ final class WKSourceEditorUITests: XCTestCase {
 
         textView.doubleTap()
 
-        XCTAssertFalse(app.isDisplayingMainInputView)
-        XCTAssertFalse(app.isDisplayingHeaderSelectView)
+        XCTAssertFalse(app.isDisplayingInputView)
         XCTAssertFalse(app.isDisplayingExpandingToolbar)
         XCTAssertTrue(app.isDisplayingHighlightingToolbar)
         XCTAssertFalse(app.isDisplayingFindAndReplaceToolbar)
@@ -42,8 +40,7 @@ final class WKSourceEditorUITests: XCTestCase {
 
         app.buttons["Source Editor Show More Button"].tap()
 
-        XCTAssertTrue(app.isDisplayingMainInputView)
-        XCTAssertFalse(app.isDisplayingHeaderSelectView)
+        XCTAssertTrue(app.isDisplayingInputView)
         XCTAssertFalse(app.isDisplayingExpandingToolbar)
         XCTAssertFalse(app.isDisplayingHighlightingToolbar)
         XCTAssertFalse(app.isDisplayingFindAndReplaceToolbar)
@@ -54,8 +51,7 @@ final class WKSourceEditorUITests: XCTestCase {
 
         app.buttons["Source Editor Format Text Button"].tap()
 
-        XCTAssertTrue(app.isDisplayingMainInputView)
-        XCTAssertFalse(app.isDisplayingHeaderSelectView)
+        XCTAssertTrue(app.isDisplayingInputView)
         XCTAssertFalse(app.isDisplayingExpandingToolbar)
         XCTAssertFalse(app.isDisplayingHighlightingToolbar)
         XCTAssertFalse(app.isDisplayingFindAndReplaceToolbar)
@@ -64,36 +60,6 @@ final class WKSourceEditorUITests: XCTestCase {
         mainInputViewAttachment.name = ScreenshotNames.main.rawValue
         add(mainInputViewAttachment)
 
-        app.tables.element(boundBy: 0).cells.element(boundBy: 2).tap()
-
-        XCTAssertFalse(app.isDisplayingMainInputView)
-        XCTAssertTrue(app.isDisplayingHeaderSelectView)
-        XCTAssertFalse(app.isDisplayingExpandingToolbar)
-        XCTAssertFalse(app.isDisplayingHighlightingToolbar)
-        XCTAssertFalse(app.isDisplayingFindAndReplaceToolbar)
-
-        app.tables.element(boundBy: 0).cells.element(boundBy: 0).tap()
-
-        let headerSelectInputView1Attachment = XCTAttachment(screenshot: app.screenshot())
-        headerSelectInputView1Attachment.name = ScreenshotNames.headerSelect1.rawValue
-        add(headerSelectInputView1Attachment)
-
-        app.buttons["Source Editor Close Button"].tap()
-
-        app.buttons["Source Editor Format Heading Button"].tap()
-
-        XCTAssertFalse(app.isDisplayingMainInputView)
-        XCTAssertTrue(app.isDisplayingHeaderSelectView)
-        XCTAssertFalse(app.isDisplayingExpandingToolbar)
-        XCTAssertFalse(app.isDisplayingHighlightingToolbar)
-        XCTAssertFalse(app.isDisplayingFindAndReplaceToolbar)
-
-        app.tables.element(boundBy: 0).cells.element(boundBy: 2).tap()
-
-        let headerSelectInputView2Attachment = XCTAttachment(screenshot: app.screenshot())
-        headerSelectInputView2Attachment.name = ScreenshotNames.headerSelect2.rawValue
-        add(headerSelectInputView2Attachment)
-
         app.buttons["Source Editor Close Button"].tap()
 
         app.buttons["Source Editor Find Button"].tap()
@@ -117,12 +83,8 @@ extension XCUIApplication {
         return otherElements["Source Editor Find Toolbar"].exists
     }
 
-    var isDisplayingMainInputView: Bool {
-        return otherElements[ "Source Editor Main Input View"].exists
-    }
-
-    var isDisplayingHeaderSelectView: Bool {
-        return otherElements["Source Editor Header Select Input View"].exists
+    var isDisplayingInputView: Bool {
+        return otherElements[ "Source Editor Input View"].exists
     }
 }