From 5d114513f420fd3557e3ac76ff7c730bce8c0954 Mon Sep 17 00:00:00 2001
From: rachelmcr <rachel@automattic.com>
Date: Thu, 13 Apr 2017 00:29:38 +0100
Subject: [PATCH 1/7] Add UI tests for simple text formatting

---
 .../AztecExample.xcodeproj/project.pbxproj    | 155 ++++++++++-
 Example/AztecUITests/AztecUITests.swift       | 263 ++++++++++++++++++
 Example/AztecUITests/Info.plist               |  22 ++
 Example/AztecUITests/XCTest+Extensions.swift  |  45 +++
 Example/Example/EditorDemoController.swift    | 168 ++++++++++-
 5 files changed, 639 insertions(+), 14 deletions(-)
 create mode 100644 Example/AztecUITests/AztecUITests.swift
 create mode 100644 Example/AztecUITests/Info.plist
 create mode 100644 Example/AztecUITests/XCTest+Extensions.swift

diff --git a/Example/AztecExample.xcodeproj/project.pbxproj b/Example/AztecExample.xcodeproj/project.pbxproj
index d812e9bb6..1783149e6 100644
--- a/Example/AztecExample.xcodeproj/project.pbxproj
+++ b/Example/AztecExample.xcodeproj/project.pbxproj
@@ -21,6 +21,8 @@
 		B570B1C91E82D332008CF41E /* MoreAttachmentRenderer.swift in Sources */ = {isa = PBXBuildFile; fileRef = B570B1C81E82D332008CF41E /* MoreAttachmentRenderer.swift */; };
 		B570B1CC1E82D343008CF41E /* CommentAttachmentRenderer.swift in Sources */ = {isa = PBXBuildFile; fileRef = B570B1CB1E82D343008CF41E /* CommentAttachmentRenderer.swift */; };
 		B5AF89341E93ECE60051EFDB /* HTMLAttachmentRenderer.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5AF89331E93ECE60051EFDB /* HTMLAttachmentRenderer.swift */; };
+		CC400F1A1E9EC04200859AB4 /* AztecUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = CC400F191E9EC04200859AB4 /* AztecUITests.swift */; };
+		CC400F251E9EC16900859AB4 /* XCTest+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = CC400F241E9EC16900859AB4 /* XCTest+Extensions.swift */; };
 		E63EF92B1D36A60B00B5BA4B /* EditorDemoController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E63EF92A1D36A60B00B5BA4B /* EditorDemoController.swift */; };
 		FF6691C21E76CF9200C6A703 /* OptionsTableView.swift in Sources */ = {isa = PBXBuildFile; fileRef = FF6691C11E76CF9200C6A703 /* OptionsTableView.swift */; };
 		FF9AF5481DB0E4E200C42ED3 /* AttachmentDetailsViewController.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = FF9AF5471DB0E4E200C42ED3 /* AttachmentDetailsViewController.storyboard */; };
@@ -55,6 +57,13 @@
 			remoteGlobalIDString = 607FACCF1AFB9204008FA782;
 			remoteInfo = "WordPress-Aztec-iOS";
 		};
+		CC400F1C1E9EC04200859AB4 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 607FACC81AFB9204008FA782 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 607FACCF1AFB9204008FA782;
+			remoteInfo = AztecExample;
+		};
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -99,6 +108,10 @@
 		B570B1C81E82D332008CF41E /* MoreAttachmentRenderer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MoreAttachmentRenderer.swift; sourceTree = "<group>"; };
 		B570B1CB1E82D343008CF41E /* CommentAttachmentRenderer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CommentAttachmentRenderer.swift; sourceTree = "<group>"; };
 		B5AF89331E93ECE60051EFDB /* HTMLAttachmentRenderer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HTMLAttachmentRenderer.swift; sourceTree = "<group>"; };
+		CC400F171E9EC04200859AB4 /* AztecUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = AztecUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
+		CC400F191E9EC04200859AB4 /* AztecUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AztecUITests.swift; sourceTree = "<group>"; };
+		CC400F1B1E9EC04200859AB4 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		CC400F241E9EC16900859AB4 /* XCTest+Extensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "XCTest+Extensions.swift"; sourceTree = "<group>"; };
 		E63EF92A1D36A60B00B5BA4B /* EditorDemoController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EditorDemoController.swift; sourceTree = "<group>"; };
 		FF6691C11E76CF9200C6A703 /* OptionsTableView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OptionsTableView.swift; sourceTree = "<group>"; };
 		FF9AF5471DB0E4E200C42ED3 /* AttachmentDetailsViewController.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = AttachmentDetailsViewController.storyboard; sourceTree = "<group>"; };
@@ -120,6 +133,13 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		CC400F141E9EC04200859AB4 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
@@ -162,6 +182,7 @@
 			children = (
 				607FACD21AFB9204008FA782 /* Example for WordPress-Aztec-iOS */,
 				607FACE81AFB9204008FA782 /* Tests */,
+				CC400F181E9EC04200859AB4 /* AztecUITests */,
 				02ECB379638AE0CDEAB24BEC /* Frameworks */,
 				607FACD11AFB9204008FA782 /* Products */,
 				599F257B1D8BD058002871D6 /* Dependencies */,
@@ -173,6 +194,7 @@
 			children = (
 				607FACD01AFB9204008FA782 /* AztecExample.app */,
 				607FACE51AFB9204008FA782 /* AztecExample-Tests.xctest */,
+				CC400F171E9EC04200859AB4 /* AztecUITests.xctest */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -231,6 +253,16 @@
 			name = Renders;
 			sourceTree = "<group>";
 		};
+		CC400F181E9EC04200859AB4 /* AztecUITests */ = {
+			isa = PBXGroup;
+			children = (
+				CC400F191E9EC04200859AB4 /* AztecUITests.swift */,
+				CC400F1B1E9EC04200859AB4 /* Info.plist */,
+				CC400F241E9EC16900859AB4 /* XCTest+Extensions.swift */,
+			);
+			path = AztecUITests;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
@@ -272,13 +304,31 @@
 			productReference = 607FACE51AFB9204008FA782 /* AztecExample-Tests.xctest */;
 			productType = "com.apple.product-type.bundle.unit-test";
 		};
+		CC400F161E9EC04200859AB4 /* AztecUITests */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = CC400F231E9EC04200859AB4 /* Build configuration list for PBXNativeTarget "AztecUITests" */;
+			buildPhases = (
+				CC400F131E9EC04200859AB4 /* Sources */,
+				CC400F141E9EC04200859AB4 /* Frameworks */,
+				CC400F151E9EC04200859AB4 /* Resources */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				CC400F1D1E9EC04200859AB4 /* PBXTargetDependency */,
+			);
+			name = AztecUITests;
+			productName = AztecUITests;
+			productReference = CC400F171E9EC04200859AB4 /* AztecUITests.xctest */;
+			productType = "com.apple.product-type.bundle.ui-testing";
+		};
 /* End PBXNativeTarget section */
 
 /* Begin PBXProject section */
 		607FACC81AFB9204008FA782 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastSwiftUpdateCheck = 0720;
+				LastSwiftUpdateCheck = 0830;
 				LastUpgradeCheck = 0800;
 				ORGANIZATIONNAME = "Automattic Inc.";
 				TargetAttributes = {
@@ -294,6 +344,11 @@
 						ProvisioningStyle = Manual;
 						TestTargetID = 607FACCF1AFB9204008FA782;
 					};
+					CC400F161E9EC04200859AB4 = {
+						CreatedOnToolsVersion = 8.3.1;
+						ProvisioningStyle = Automatic;
+						TestTargetID = 607FACCF1AFB9204008FA782;
+					};
 				};
 			};
 			buildConfigurationList = 607FACCB1AFB9204008FA782 /* Build configuration list for PBXProject "AztecExample" */;
@@ -317,6 +372,7 @@
 			targets = (
 				607FACCF1AFB9204008FA782 /* AztecExample */,
 				607FACE41AFB9204008FA782 /* AztecExample-Tests */,
+				CC400F161E9EC04200859AB4 /* AztecUITests */,
 			);
 		};
 /* End PBXProject section */
@@ -359,6 +415,13 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		CC400F151E9EC04200859AB4 /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
@@ -384,6 +447,15 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		CC400F131E9EC04200859AB4 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				CC400F251E9EC16900859AB4 /* XCTest+Extensions.swift in Sources */,
+				CC400F1A1E9EC04200859AB4 /* AztecUITests.swift in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 /* End PBXSourcesBuildPhase section */
 
 /* Begin PBXTargetDependency section */
@@ -397,6 +469,11 @@
 			target = 607FACCF1AFB9204008FA782 /* AztecExample */;
 			targetProxy = 607FACE61AFB9204008FA782 /* PBXContainerItemProxy */;
 		};
+		CC400F1D1E9EC04200859AB4 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 607FACCF1AFB9204008FA782 /* AztecExample */;
+			targetProxy = CC400F1C1E9EC04200859AB4 /* PBXContainerItemProxy */;
+		};
 /* End PBXTargetDependency section */
 
 /* Begin PBXVariantGroup section */
@@ -582,6 +659,72 @@
 			};
 			name = Release;
 		};
+		CC400F1E1E9EC04200859AB4 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				DEBUG_INFORMATION_FORMAT = dwarf;
+				INFOPLIST_FILE = AztecUITests/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 10.3;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = WP.AztecUITests;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
+				SWIFT_VERSION = 3.0;
+				TEST_TARGET_NAME = AztecExample;
+			};
+			name = Debug;
+		};
+		CC400F1F1E9EC04200859AB4 /* Release-Alpha */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				INFOPLIST_FILE = AztecUITests/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 10.3;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = WP.AztecUITests;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 3.0;
+				TEST_TARGET_NAME = AztecExample;
+			};
+			name = "Release-Alpha";
+		};
+		CC400F201E9EC04200859AB4 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				INFOPLIST_FILE = AztecUITests/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 10.3;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = WP.AztecUITests;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 3.0;
+				TEST_TARGET_NAME = AztecExample;
+			};
+			name = Release;
+		};
+		CC400F211E9EC04200859AB4 /* Profiling */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				INFOPLIST_FILE = AztecUITests/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 10.3;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = WP.AztecUITests;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 3.0;
+				TEST_TARGET_NAME = AztecExample;
+			};
+			name = Profiling;
+		};
 		F111A10D1DA7E77500294FD3 /* Profiling */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
@@ -782,6 +925,16 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
+		CC400F231E9EC04200859AB4 /* Build configuration list for PBXNativeTarget "AztecUITests" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				CC400F1E1E9EC04200859AB4 /* Debug */,
+				CC400F1F1E9EC04200859AB4 /* Release-Alpha */,
+				CC400F201E9EC04200859AB4 /* Release */,
+				CC400F211E9EC04200859AB4 /* Profiling */,
+			);
+			defaultConfigurationIsVisible = 0;
+		};
 /* End XCConfigurationList section */
 	};
 	rootObject = 607FACC81AFB9204008FA782 /* Project object */;
diff --git a/Example/AztecUITests/AztecUITests.swift b/Example/AztecUITests/AztecUITests.swift
new file mode 100644
index 000000000..01e95ee3a
--- /dev/null
+++ b/Example/AztecUITests/AztecUITests.swift
@@ -0,0 +1,263 @@
+import XCTest
+
+class AztecSimpleTextFormattingTests: XCTestCase {
+
+    private var app: XCUIApplication!
+    private var htmlContentTextView: XCUIElement!
+    private var richContentTextView: XCUIElement!
+
+    override func setUp() {
+        super.setUp()
+
+        // In UI tests it is usually best to stop immediately when a failure occurs.
+        continueAfterFailure = false
+        // UI tests must launch the application that they test. Doing this in setup will make sure it happens for each test method.
+        XCUIDevice.shared().orientation = .portrait
+        app = XCUIApplication()
+        app.launch()
+
+        let tablesQuery = app.tables
+        tablesQuery.staticTexts[ elementStringIDs.emptyDemo ].tap()
+    }
+
+    override func tearDown() {
+        // Put teardown code here. This method is called after the invocation of each test method in the class.
+        super.tearDown()
+    }
+
+    func testSimpleBoldText() {
+        richContentTextView = app.textViews[ elementStringIDs.richTextField ]
+        richContentTextView.tap()
+        richContentTextView.enterAndSelectText(text: "text")
+
+        app.scrollViews.otherElements.buttons[ elementStringIDs.boldButton ].tap()
+        app.buttons[ elementStringIDs.sourcecodeButton ].tap()
+
+        htmlContentTextView = app.textViews[ elementStringIDs.htmlTextField ]
+        let text : String = htmlContentTextView.value as! String
+        let expected = "<strong>text</strong>"
+        XCTAssertEqual(expected, text)
+    }
+
+    func testSimpleItalicText() {
+        richContentTextView = app.textViews[ elementStringIDs.richTextField ]
+        richContentTextView.tap()
+        richContentTextView.enterAndSelectText(text: "text")
+
+        app.scrollViews.otherElements.buttons[ elementStringIDs.italicButton ].tap()
+        app.buttons[ elementStringIDs.sourcecodeButton ].tap()
+
+        htmlContentTextView = app.textViews[ elementStringIDs.htmlTextField ]
+        let text : String = htmlContentTextView.value as! String
+        let expected = "<em>text</em>"
+        XCTAssertEqual(expected, text)
+    }
+
+    func testSimpleUnderlineText() {
+        richContentTextView = app.textViews[ elementStringIDs.richTextField ]
+        richContentTextView.tap()
+        richContentTextView.enterAndSelectText(text: "text")
+
+        app.scrollViews.otherElements.buttons[ elementStringIDs.underlineButton ].tap()
+        app.buttons[ elementStringIDs.sourcecodeButton ].tap()
+
+        htmlContentTextView = app.textViews[ elementStringIDs.htmlTextField ]
+        let text : String = htmlContentTextView.value as! String
+        let expected = "<u>text</u>"
+        XCTAssertEqual(expected, text)
+    }
+
+    func testSimpleStrikethroughText() {
+        richContentTextView = app.textViews[ elementStringIDs.richTextField ]
+        richContentTextView.tap()
+        richContentTextView.enterAndSelectText(text: "text")
+
+        app.scrollViews.otherElements.buttons[ elementStringIDs.strikethroughButton ].tap()
+        app.buttons[ elementStringIDs.sourcecodeButton ].tap()
+
+        htmlContentTextView = app.textViews[ elementStringIDs.htmlTextField ]
+        let text : String = htmlContentTextView.value as! String
+        let expected = "<del>text</del>"
+        XCTAssertEqual(expected, text)
+    }
+
+    func testSimpleBlockquoteText() {
+        richContentTextView = app.textViews[ elementStringIDs.richTextField ]
+        richContentTextView.tap()
+        richContentTextView.enterAndSelectText(text: "text")
+
+        app.scrollViews.otherElements.buttons[ elementStringIDs.blockquoteButton ].tap()
+        app.buttons[ elementStringIDs.sourcecodeButton ].tap()
+
+        htmlContentTextView = app.textViews[ elementStringIDs.htmlTextField ]
+        let text : String = htmlContentTextView.value as! String
+        let expected = "<blockquote>text</blockquote>"
+        XCTAssertEqual(expected, text)
+    }
+
+    // Enable this test after unordered lists are fully implemented
+    func testSimpleUnorderedListText() {
+        richContentTextView = app.textViews[ elementStringIDs.richTextField ]
+        richContentTextView.tap()
+        richContentTextView.enterAndSelectText(text: "text")
+
+        app.scrollViews.otherElements.buttons[ elementStringIDs.unorderedlistButton ].tap()
+        app.buttons[ elementStringIDs.sourcecodeButton ].tap()
+
+        htmlContentTextView = app.textViews[ elementStringIDs.htmlTextField ]
+        let text : String = htmlContentTextView.value as! String
+        let expected = "<ul><li>text</li></ul>"
+        XCTAssertEqual(expected, text)
+    }
+
+    // Enable this test after ordered lists are fully implemented
+    func testSimpleOrderedListText() {
+        richContentTextView = app.textViews[ elementStringIDs.richTextField ]
+        richContentTextView.tap()
+        richContentTextView.enterAndSelectText(text: "text")
+
+        app.scrollViews.otherElements.buttons[ elementStringIDs.orderedlistButton ].tap()
+        app.buttons[ elementStringIDs.sourcecodeButton ].tap()
+
+        htmlContentTextView = app.textViews[ elementStringIDs.htmlTextField ]
+        let text : String = htmlContentTextView.value as! String
+        let expected = "<ol><li>text</li></ol>"
+        XCTAssertEqual(expected, text)
+    }
+
+    func testSimpleLinkedText() {
+        richContentTextView = app.textViews[ elementStringIDs.richTextField ]
+        richContentTextView.tap()
+        richContentTextView.enterAndSelectText(text: "text")
+
+        // Copy link to be auto-filled in URL field
+        UIPasteboard.general.string = "https://wordpress.com/"
+        app.scrollViews.otherElements.buttons[ elementStringIDs.linkButton ].tap()
+        app.alerts.buttons.element(boundBy: 3).tap()
+        app.buttons[ elementStringIDs.sourcecodeButton ].tap()
+
+        htmlContentTextView = app.textViews[ elementStringIDs.htmlTextField ]
+        let text : String = htmlContentTextView.value as! String
+        let expected = "<a href=\"https://wordpress.com/\">text</a>"
+        XCTAssertEqual(expected, text)
+    }
+
+    func testHorizontalRuler() {
+        richContentTextView = app.textViews[ elementStringIDs.richTextField ]
+        richContentTextView.tap()
+
+        app.scrollViews.otherElements.buttons[ elementStringIDs.horizontalrulerButton ].tap()
+        app.buttons[ elementStringIDs.sourcecodeButton ].tap()
+
+        htmlContentTextView = app.textViews[ elementStringIDs.htmlTextField ]
+        let text: String = htmlContentTextView.value as! String
+        let expected = "<hr>"
+        XCTAssertEqual(expected, text)
+    }
+
+    func testMoreTag() {
+        richContentTextView = app.textViews[ elementStringIDs.richTextField ]
+        richContentTextView.tap()
+
+        app.scrollViews.otherElements.buttons[ elementStringIDs.moreButton ].tap()
+        app.buttons[ elementStringIDs.sourcecodeButton ].tap()
+
+        htmlContentTextView = app.textViews[ elementStringIDs.htmlTextField ]
+        let text: String = htmlContentTextView.value as! String
+        let expected = "<!--more-->"
+        XCTAssertEqual(expected, text)
+    }
+
+    func testHeadingOneText() {
+        richContentTextView = app.textViews[ elementStringIDs.richTextField ]
+        richContentTextView.tap()
+        richContentTextView.enterAndSelectText(text: "text")
+
+        app.scrollViews.otherElements.buttons[ elementStringIDs.headerButton ].tap()
+        app.tables.staticTexts[ elementStringIDs.header1Button ].tap()
+        app.buttons[ elementStringIDs.sourcecodeButton ].tap()
+
+        htmlContentTextView = app.textViews[ elementStringIDs.htmlTextField ]
+        let text : String = htmlContentTextView.value as! String
+        let expected = "<h1>text</h1>"
+        XCTAssertEqual(expected, text)
+    }
+
+    func testHeadingTwoText() {
+        richContentTextView = app.textViews[ elementStringIDs.richTextField ]
+        richContentTextView.tap()
+        richContentTextView.enterAndSelectText(text: "text")
+
+        app.scrollViews.otherElements.buttons[ elementStringIDs.headerButton ].tap()
+        app.tables.staticTexts[ elementStringIDs.header2Button ].tap()
+        app.buttons[ elementStringIDs.sourcecodeButton ].tap()
+
+        htmlContentTextView = app.textViews[ elementStringIDs.htmlTextField ]
+        let text : String = htmlContentTextView.value as! String
+        let expected = "<h2>text</h2>"
+        XCTAssertEqual(expected, text)
+    }
+
+    func testHeadingThreeText() {
+        richContentTextView = app.textViews[ elementStringIDs.richTextField ]
+        richContentTextView.tap()
+        richContentTextView.enterAndSelectText(text: "text")
+
+        app.scrollViews.otherElements.buttons[ elementStringIDs.headerButton ].tap()
+        app.tables.staticTexts[ elementStringIDs.header3Button ].tap()
+        app.buttons[ elementStringIDs.sourcecodeButton ].tap()
+
+        htmlContentTextView = app.textViews[ elementStringIDs.htmlTextField ]
+        let text : String = htmlContentTextView.value as! String
+        let expected = "<h3>text</h3>"
+        XCTAssertEqual(expected, text)
+    }
+
+    func testHeadingFourText() {
+        richContentTextView = app.textViews[ elementStringIDs.richTextField ]
+        richContentTextView.tap()
+        richContentTextView.enterAndSelectText(text: "text")
+
+        app.scrollViews.otherElements.buttons[ elementStringIDs.headerButton ].tap()
+        app.tables.element(boundBy: 0).swipeUp()
+        app.tables.staticTexts[ elementStringIDs.header4Button ].tap()
+        app.buttons[ elementStringIDs.sourcecodeButton ].tap()
+
+        htmlContentTextView = app.textViews[ elementStringIDs.htmlTextField ]
+        let text : String = htmlContentTextView.value as! String
+        let expected = "<h4>text</h4>"
+        XCTAssertEqual(expected, text)
+    }
+
+    func testHeadingFiveText() {
+        richContentTextView = app.textViews[ elementStringIDs.richTextField ]
+        richContentTextView.tap()
+        richContentTextView.enterAndSelectText(text: "text")
+
+        app.scrollViews.otherElements.buttons[ elementStringIDs.headerButton ].tap()
+        app.tables.element(boundBy: 0).swipeUp()
+        app.tables.staticTexts[ elementStringIDs.header5Button ].tap()
+        app.buttons[ elementStringIDs.sourcecodeButton ].tap()
+
+        htmlContentTextView = app.textViews[ elementStringIDs.htmlTextField ]
+        let text : String = htmlContentTextView.value as! String
+        let expected = "<h5>text</h5>"
+        XCTAssertEqual(expected, text)
+    }
+
+    func testHeadingSixText() {
+        richContentTextView = app.textViews[ elementStringIDs.richTextField ]
+        richContentTextView.tap()
+        richContentTextView.enterAndSelectText(text: "text")
+
+        app.scrollViews.otherElements.buttons[ elementStringIDs.headerButton ].tap()
+        app.tables.element(boundBy: 0).swipeUp()
+        app.tables.staticTexts[ elementStringIDs.header6Button ].tap()
+        app.buttons[ elementStringIDs.sourcecodeButton ].tap()
+
+        htmlContentTextView = app.textViews[ elementStringIDs.htmlTextField ]
+        let text : String = htmlContentTextView.value as! String
+        let expected = "<h6>text</h6>"
+        XCTAssertEqual(expected, text)
+    }
+}
diff --git a/Example/AztecUITests/Info.plist b/Example/AztecUITests/Info.plist
new file mode 100644
index 000000000..6c6c23c43
--- /dev/null
+++ b/Example/AztecUITests/Info.plist
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>en</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>BNDL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+</dict>
+</plist>
diff --git a/Example/AztecUITests/XCTest+Extensions.swift b/Example/AztecUITests/XCTest+Extensions.swift
new file mode 100644
index 000000000..cb8d830f7
--- /dev/null
+++ b/Example/AztecUITests/XCTest+Extensions.swift
@@ -0,0 +1,45 @@
+import XCTest
+
+public struct elementStringIDs {
+    // Demo Menu
+    static var emptyDemo = "Empty Editor Demo"
+
+    // Text Fields
+    static var richTextField = "richContentView"
+    static var htmlTextField = "HTMLContentView"
+
+    // Toolbar
+    static var mediaButton = "formatToolbarInsertMedia"
+    static var headerButton = "formatToolbarSelectParagraphStyle"
+    static var boldButton = "formatToolbarToggleBold"
+    static var italicButton = "formatToolbarToggleItalic"
+    static var underlineButton = "formatToolbarToggleUnderline"
+    static var strikethroughButton = "formatToolbarToggleStrikethrough"
+    static var blockquoteButton = "formatToolbarToggleBlockquote"
+    static var orderedlistButton = "formatToolbarToggleListOrdered"
+    static var unorderedlistButton = "formatToolbarToggleListUnordered"
+    static var linkButton = "formatToolbarInsertLink"
+    static var horizontalrulerButton = "formatToolbarInsertHorizontalRuler"
+    static var sourcecodeButton = "formatToolbarToggleHtmlView"
+    static var moreButton = "formatToolbarInsertMore"
+    static var header1Button = "Heading 1"
+    static var header2Button = "Heading 2"
+    static var header3Button = "Heading 3"
+    static var header4Button = "Heading 4"
+    static var header5Button = "Heading 5"
+    static var header6Button = "Heading 6"
+}
+
+extension XCUIElement {
+    /**
+     Enters text in the field and then selects all entered text
+     - Parameter text: the text to enter into the field
+    */
+    func enterAndSelectText(text: String) -> Void {
+        let app = XCUIApplication()
+
+        self.typeText(text)
+        self.press(forDuration: 1.2)
+        app.menuItems.element(boundBy: 1).tap()
+    }
+}
diff --git a/Example/Example/EditorDemoController.swift b/Example/Example/EditorDemoController.swift
index 6e5e78489..299438bce 100644
--- a/Example/Example/EditorDemoController.swift
+++ b/Example/Example/EditorDemoController.swift
@@ -20,6 +20,7 @@ class EditorDemoController: UIViewController {
         textView.delegate = self
         textView.formattingDelegate = self
         textView.mediaDelegate = self
+        textView.accessibilityIdentifier = "richContentView"
 
         return textView
     }()
@@ -34,6 +35,7 @@ class EditorDemoController: UIViewController {
 
         textView.isHidden = true
         textView.delegate = self
+        textView.accessibilityIdentifier = "HTMLContentView"
 
         return textView
     }()
@@ -681,6 +683,13 @@ extension EditorDemoController : Aztec.FormatBarDelegate {
 
     // MARK: -
 
+    func makeToolbarButton(identifier: FormattingIdentifier) -> FormatBarItem {
+        let button = FormatBarItem(image: identifier.iconImage, identifier: identifier)
+        button.accessibilityLabel = identifier.accessibilityLabel
+        button.accessibilityIdentifier = identifier.accessibilityIdentifier
+        return button
+    }
+
     func createToolbar(htmlMode: Bool) -> Aztec.FormatBar {
 
         let scrollableItems = scrollableItemsForToolbar
@@ -712,24 +721,24 @@ extension EditorDemoController : Aztec.FormatBarDelegate {
 
     var scrollableItemsForToolbar: [FormatBarItem] {
         return [
-            FormatBarItem(image: Gridicon.iconOfType(.addImage), identifier: .media),
-            FormatBarItem(image: Gridicon.iconOfType(.heading), identifier: .header),
-            FormatBarItem(image: Gridicon.iconOfType(.bold), identifier: .bold),
-            FormatBarItem(image: Gridicon.iconOfType(.italic), identifier: .italic),
-            FormatBarItem(image: Gridicon.iconOfType(.underline), identifier: .underline),
-            FormatBarItem(image: Gridicon.iconOfType(.strikethrough), identifier: .strikethrough),
-            FormatBarItem(image: Gridicon.iconOfType(.quote), identifier: .blockquote),
-            FormatBarItem(image: Gridicon.iconOfType(.listUnordered), identifier: .unorderedlist),
-            FormatBarItem(image: Gridicon.iconOfType(.listOrdered), identifier: .orderedlist),
-            FormatBarItem(image: Gridicon.iconOfType(.link), identifier: .link),
-            FormatBarItem(image: Gridicon.iconOfType(.minusSmall), identifier: .horizontalruler),
-            FormatBarItem(image: Gridicon.iconOfType(.readMore), identifier: .more)
+            makeToolbarButton(identifier: .media),
+            makeToolbarButton(identifier: .header),
+            makeToolbarButton(identifier: .bold),
+            makeToolbarButton(identifier: .italic),
+            makeToolbarButton(identifier: .underline),
+            makeToolbarButton(identifier: .strikethrough),
+            makeToolbarButton(identifier: .blockquote),
+            makeToolbarButton(identifier: .unorderedlist),
+            makeToolbarButton(identifier: .orderedlist),
+            makeToolbarButton(identifier: .link),
+            makeToolbarButton(identifier: .horizontalruler),
+            makeToolbarButton(identifier: .more)
         ]
     }
 
     var fixedItemsForToolbar: [FormatBarItem] {
         return [
-            FormatBarItem(image: Gridicon.iconOfType(.code), identifier: .sourcecode)
+            makeToolbarButton(identifier: .sourcecode)
         ]
     }
 
@@ -958,3 +967,136 @@ extension EditorDemoController {
         static let moreAttachmentText = "more"
     }
 }
+
+extension FormattingIdentifier {
+
+    var iconImage: UIImage {
+
+        switch(self) {
+        case .media:
+            return Gridicon.iconOfType(.addImage)
+        case .header:
+            return Gridicon.iconOfType(.heading)
+        case .bold:
+            return Gridicon.iconOfType(.bold)
+        case .italic:
+            return Gridicon.iconOfType(.italic)
+        case .underline:
+            return Gridicon.iconOfType(.underline)
+        case .strikethrough:
+            return Gridicon.iconOfType(.strikethrough)
+        case .blockquote:
+            return Gridicon.iconOfType(.quote)
+        case .orderedlist:
+            return Gridicon.iconOfType(.listOrdered)
+        case .unorderedlist:
+            return Gridicon.iconOfType(.listUnordered)
+        case .link:
+            return Gridicon.iconOfType(.link)
+        case .horizontalruler:
+            return Gridicon.iconOfType(.minusSmall)
+        case .sourcecode:
+            return Gridicon.iconOfType(.code)
+        case .more:
+            return Gridicon.iconOfType(.readMore)
+        case .header1:
+            return Gridicon.iconOfType(.heading)
+        case .header2:
+            return Gridicon.iconOfType(.heading)
+        case .header3:
+            return Gridicon.iconOfType(.heading)
+        case .header4:
+            return Gridicon.iconOfType(.heading)
+        case .header5:
+            return Gridicon.iconOfType(.heading)
+        case .header6:
+            return Gridicon.iconOfType(.heading)
+        }
+    }
+
+    var accessibilityIdentifier: String {
+        switch(self) {
+        case .media:
+            return "formatToolbarInsertMedia"
+        case .header:
+            return "formatToolbarSelectParagraphStyle"
+        case .bold:
+            return "formatToolbarToggleBold"
+        case .italic:
+            return "formatToolbarToggleItalic"
+        case .underline:
+            return "formatToolbarToggleUnderline"
+        case .strikethrough:
+            return "formatToolbarToggleStrikethrough"
+        case .blockquote:
+            return "formatToolbarToggleBlockquote"
+        case .orderedlist:
+            return "formatToolbarToggleListOrdered"
+        case .unorderedlist:
+            return "formatToolbarToggleListUnordered"
+        case .link:
+            return "formatToolbarInsertLink"
+        case .horizontalruler:
+            return "formatToolbarInsertHorizontalRuler"
+        case .sourcecode:
+            return "formatToolbarToggleHtmlView"
+        case .more:
+            return "formatToolbarInsertMore"
+        case .header1:
+            return "formatToolbarToggleH1"
+        case .header2:
+            return "formatToolbarToggleH2"
+        case .header3:
+            return "formatToolbarToggleH3"
+        case .header4:
+            return "formatToolbarToggleH4"
+        case .header5:
+            return "formatToolbarToggleH5"
+        case .header6:
+            return "formatToolbarToggleH6"
+        }
+    }
+
+    var accessibilityLabel: String {
+        switch(self) {
+        case .media:
+            return NSLocalizedString("Insert media", comment: "Accessibility label for insert media button on formatting toolbar.")
+        case .header:
+            return NSLocalizedString("Select paragraph style", comment: "Accessibility label for selecting paragraph style button on formatting toolbar.")
+        case .bold:
+            return NSLocalizedString("Bold", comment: "Accessibility label for bold button on formatting toolbar.")
+        case .italic:
+            return NSLocalizedString("Italic", comment: "Accessibility label for italic button on formatting toolbar.")
+        case .underline:
+            return NSLocalizedString("Underline", comment: "Accessibility label for underline button on formatting toolbar.")
+        case .strikethrough:
+            return NSLocalizedString("Strike Through", comment: "Accessibility label for strikethrough button on formatting toolbar.")
+        case .blockquote:
+            return NSLocalizedString("Block Quote", comment: "Accessibility label for block quote button on formatting toolbar.")
+        case .orderedlist:
+            return NSLocalizedString("Ordered List", comment: "Accessibility label for Ordered list button on formatting toolbar.")
+        case .unorderedlist:
+            return NSLocalizedString("Unordered List", comment: "Accessibility label for unordered list button on formatting toolbar.")
+        case .link:
+            return NSLocalizedString("Insert Link", comment: "Accessibility label for insert link button on formatting toolbar.")
+        case .horizontalruler:
+            return NSLocalizedString("Insert Horizontal Ruler", comment: "Accessibility label for insert horizontal ruler button on formatting toolbar.")
+        case .sourcecode:
+            return NSLocalizedString("HTML", comment:"Accessibility label for HTML button on formatting toolbar.")
+        case .more:
+            return NSLocalizedString("More", comment:"Accessibility label for the More button on formatting toolbar.")
+        case .header1:
+            return NSLocalizedString("Header 1", comment: "Accessibility label for selecting h1 paragraph style button on the formatting toolbar.")
+        case .header2:
+            return NSLocalizedString("Header 2", comment: "Accessibility label for selecting h2 paragraph style button on the formatting toolbar.")
+        case .header3:
+            return NSLocalizedString("Header 3", comment: "Accessibility label for selecting h3 paragraph style button on the formatting toolbar.")
+        case .header4:
+            return NSLocalizedString("Header 4", comment: "Accessibility label for selecting h4 paragraph style button on the formatting toolbar.")
+        case .header5:
+            return NSLocalizedString("Header 5", comment: "Accessibility label for selecting h5 paragraph style button on the formatting toolbar.")
+        case .header6:
+            return NSLocalizedString("Header 6", comment: "Accessibility label for selecting h6 paragraph style button on the formatting toolbar.")
+        }
+    }
+}

From cf2a1010e96c63aa0920f7ea74f9dac9d7db054c Mon Sep 17 00:00:00 2001
From: rachelmcr <rachel@automattic.com>
Date: Thu, 13 Apr 2017 09:04:00 +0100
Subject: [PATCH 2/7] Style fixes

---
 Example/AztecUITests/AztecUITests.swift      | 172 +++++++++----------
 Example/AztecUITests/XCTest+Extensions.swift |   4 +-
 2 files changed, 88 insertions(+), 88 deletions(-)

diff --git a/Example/AztecUITests/AztecUITests.swift b/Example/AztecUITests/AztecUITests.swift
index 01e95ee3a..7ee6bee37 100644
--- a/Example/AztecUITests/AztecUITests.swift
+++ b/Example/AztecUITests/AztecUITests.swift
@@ -17,7 +17,7 @@ class AztecSimpleTextFormattingTests: XCTestCase {
         app.launch()
 
         let tablesQuery = app.tables
-        tablesQuery.staticTexts[ elementStringIDs.emptyDemo ].tap()
+        tablesQuery.staticTexts[elementStringIDs.emptyDemo].tap()
     }
 
     override func tearDown() {
@@ -26,237 +26,237 @@ class AztecSimpleTextFormattingTests: XCTestCase {
     }
 
     func testSimpleBoldText() {
-        richContentTextView = app.textViews[ elementStringIDs.richTextField ]
+        richContentTextView = app.textViews[elementStringIDs.richTextField]
         richContentTextView.tap()
         richContentTextView.enterAndSelectText(text: "text")
 
-        app.scrollViews.otherElements.buttons[ elementStringIDs.boldButton ].tap()
-        app.buttons[ elementStringIDs.sourcecodeButton ].tap()
+        app.scrollViews.otherElements.buttons[elementStringIDs.boldButton].tap()
+        app.buttons[elementStringIDs.sourcecodeButton].tap()
 
-        htmlContentTextView = app.textViews[ elementStringIDs.htmlTextField ]
-        let text : String = htmlContentTextView.value as! String
+        htmlContentTextView = app.textViews[elementStringIDs.htmlTextField]
+        let text: String = htmlContentTextView.value as! String
         let expected = "<strong>text</strong>"
         XCTAssertEqual(expected, text)
     }
 
     func testSimpleItalicText() {
-        richContentTextView = app.textViews[ elementStringIDs.richTextField ]
+        richContentTextView = app.textViews[elementStringIDs.richTextField]
         richContentTextView.tap()
         richContentTextView.enterAndSelectText(text: "text")
 
-        app.scrollViews.otherElements.buttons[ elementStringIDs.italicButton ].tap()
-        app.buttons[ elementStringIDs.sourcecodeButton ].tap()
+        app.scrollViews.otherElements.buttons[elementStringIDs.italicButton].tap()
+        app.buttons[elementStringIDs.sourcecodeButton].tap()
 
-        htmlContentTextView = app.textViews[ elementStringIDs.htmlTextField ]
-        let text : String = htmlContentTextView.value as! String
+        htmlContentTextView = app.textViews[elementStringIDs.htmlTextField]
+        let text: String = htmlContentTextView.value as! String
         let expected = "<em>text</em>"
         XCTAssertEqual(expected, text)
     }
 
     func testSimpleUnderlineText() {
-        richContentTextView = app.textViews[ elementStringIDs.richTextField ]
+        richContentTextView = app.textViews[elementStringIDs.richTextField]
         richContentTextView.tap()
         richContentTextView.enterAndSelectText(text: "text")
 
-        app.scrollViews.otherElements.buttons[ elementStringIDs.underlineButton ].tap()
-        app.buttons[ elementStringIDs.sourcecodeButton ].tap()
+        app.scrollViews.otherElements.buttons[elementStringIDs.underlineButton].tap()
+        app.buttons[elementStringIDs.sourcecodeButton].tap()
 
-        htmlContentTextView = app.textViews[ elementStringIDs.htmlTextField ]
-        let text : String = htmlContentTextView.value as! String
+        htmlContentTextView = app.textViews[elementStringIDs.htmlTextField]
+        let text: String = htmlContentTextView.value as! String
         let expected = "<u>text</u>"
         XCTAssertEqual(expected, text)
     }
 
     func testSimpleStrikethroughText() {
-        richContentTextView = app.textViews[ elementStringIDs.richTextField ]
+        richContentTextView = app.textViews[elementStringIDs.richTextField]
         richContentTextView.tap()
         richContentTextView.enterAndSelectText(text: "text")
 
-        app.scrollViews.otherElements.buttons[ elementStringIDs.strikethroughButton ].tap()
-        app.buttons[ elementStringIDs.sourcecodeButton ].tap()
+        app.scrollViews.otherElements.buttons[elementStringIDs.strikethroughButton].tap()
+        app.buttons[elementStringIDs.sourcecodeButton].tap()
 
-        htmlContentTextView = app.textViews[ elementStringIDs.htmlTextField ]
-        let text : String = htmlContentTextView.value as! String
+        htmlContentTextView = app.textViews[elementStringIDs.htmlTextField]
+        let text: String = htmlContentTextView.value as! String
         let expected = "<del>text</del>"
         XCTAssertEqual(expected, text)
     }
 
     func testSimpleBlockquoteText() {
-        richContentTextView = app.textViews[ elementStringIDs.richTextField ]
+        richContentTextView = app.textViews[elementStringIDs.richTextField]
         richContentTextView.tap()
         richContentTextView.enterAndSelectText(text: "text")
 
-        app.scrollViews.otherElements.buttons[ elementStringIDs.blockquoteButton ].tap()
-        app.buttons[ elementStringIDs.sourcecodeButton ].tap()
+        app.scrollViews.otherElements.buttons[elementStringIDs.blockquoteButton].tap()
+        app.buttons[elementStringIDs.sourcecodeButton].tap()
 
-        htmlContentTextView = app.textViews[ elementStringIDs.htmlTextField ]
-        let text : String = htmlContentTextView.value as! String
+        htmlContentTextView = app.textViews[elementStringIDs.htmlTextField]
+        let text: String = htmlContentTextView.value as! String
         let expected = "<blockquote>text</blockquote>"
         XCTAssertEqual(expected, text)
     }
 
     // Enable this test after unordered lists are fully implemented
     func testSimpleUnorderedListText() {
-        richContentTextView = app.textViews[ elementStringIDs.richTextField ]
+        richContentTextView = app.textViews[elementStringIDs.richTextField]
         richContentTextView.tap()
         richContentTextView.enterAndSelectText(text: "text")
 
-        app.scrollViews.otherElements.buttons[ elementStringIDs.unorderedlistButton ].tap()
-        app.buttons[ elementStringIDs.sourcecodeButton ].tap()
+        app.scrollViews.otherElements.buttons[elementStringIDs.unorderedlistButton].tap()
+        app.buttons[elementStringIDs.sourcecodeButton].tap()
 
-        htmlContentTextView = app.textViews[ elementStringIDs.htmlTextField ]
-        let text : String = htmlContentTextView.value as! String
+        htmlContentTextView = app.textViews[elementStringIDs.htmlTextField]
+        let text: String = htmlContentTextView.value as! String
         let expected = "<ul><li>text</li></ul>"
         XCTAssertEqual(expected, text)
     }
 
     // Enable this test after ordered lists are fully implemented
     func testSimpleOrderedListText() {
-        richContentTextView = app.textViews[ elementStringIDs.richTextField ]
+        richContentTextView = app.textViews[elementStringIDs.richTextField]
         richContentTextView.tap()
         richContentTextView.enterAndSelectText(text: "text")
 
-        app.scrollViews.otherElements.buttons[ elementStringIDs.orderedlistButton ].tap()
-        app.buttons[ elementStringIDs.sourcecodeButton ].tap()
+        app.scrollViews.otherElements.buttons[elementStringIDs.orderedlistButton].tap()
+        app.buttons[elementStringIDs.sourcecodeButton].tap()
 
-        htmlContentTextView = app.textViews[ elementStringIDs.htmlTextField ]
-        let text : String = htmlContentTextView.value as! String
+        htmlContentTextView = app.textViews[elementStringIDs.htmlTextField]
+        let text: String = htmlContentTextView.value as! String
         let expected = "<ol><li>text</li></ol>"
         XCTAssertEqual(expected, text)
     }
 
     func testSimpleLinkedText() {
-        richContentTextView = app.textViews[ elementStringIDs.richTextField ]
+        richContentTextView = app.textViews[elementStringIDs.richTextField]
         richContentTextView.tap()
         richContentTextView.enterAndSelectText(text: "text")
 
         // Copy link to be auto-filled in URL field
         UIPasteboard.general.string = "https://wordpress.com/"
-        app.scrollViews.otherElements.buttons[ elementStringIDs.linkButton ].tap()
+        app.scrollViews.otherElements.buttons[elementStringIDs.linkButton].tap()
         app.alerts.buttons.element(boundBy: 3).tap()
-        app.buttons[ elementStringIDs.sourcecodeButton ].tap()
+        app.buttons[elementStringIDs.sourcecodeButton].tap()
 
-        htmlContentTextView = app.textViews[ elementStringIDs.htmlTextField ]
-        let text : String = htmlContentTextView.value as! String
+        htmlContentTextView = app.textViews[elementStringIDs.htmlTextField]
+        let text: String = htmlContentTextView.value as! String
         let expected = "<a href=\"https://wordpress.com/\">text</a>"
         XCTAssertEqual(expected, text)
     }
 
     func testHorizontalRuler() {
-        richContentTextView = app.textViews[ elementStringIDs.richTextField ]
+        richContentTextView = app.textViews[elementStringIDs.richTextField]
         richContentTextView.tap()
 
-        app.scrollViews.otherElements.buttons[ elementStringIDs.horizontalrulerButton ].tap()
-        app.buttons[ elementStringIDs.sourcecodeButton ].tap()
+        app.scrollViews.otherElements.buttons[elementStringIDs.horizontalrulerButton].tap()
+        app.buttons[elementStringIDs.sourcecodeButton].tap()
 
-        htmlContentTextView = app.textViews[ elementStringIDs.htmlTextField ]
-        let text: String = htmlContentTextView.value as! String
+        htmlContentTextView = app.textViews[elementStringIDs.htmlTextField]
+        let tex: String = htmlContentTextView.value as! String
         let expected = "<hr>"
         XCTAssertEqual(expected, text)
     }
 
     func testMoreTag() {
-        richContentTextView = app.textViews[ elementStringIDs.richTextField ]
+        richContentTextView = app.textViews[elementStringIDs.richTextField]
         richContentTextView.tap()
 
-        app.scrollViews.otherElements.buttons[ elementStringIDs.moreButton ].tap()
-        app.buttons[ elementStringIDs.sourcecodeButton ].tap()
+        app.scrollViews.otherElements.buttons[elementStringIDs.moreButton].tap()
+        app.buttons[elementStringIDs.sourcecodeButton].tap()
 
-        htmlContentTextView = app.textViews[ elementStringIDs.htmlTextField ]
+        htmlContentTextView = app.textViews[elementStringIDs.htmlTextField]
         let text: String = htmlContentTextView.value as! String
         let expected = "<!--more-->"
         XCTAssertEqual(expected, text)
     }
 
     func testHeadingOneText() {
-        richContentTextView = app.textViews[ elementStringIDs.richTextField ]
+        richContentTextView = app.textViews[elementStringIDs.richTextField]
         richContentTextView.tap()
         richContentTextView.enterAndSelectText(text: "text")
 
-        app.scrollViews.otherElements.buttons[ elementStringIDs.headerButton ].tap()
-        app.tables.staticTexts[ elementStringIDs.header1Button ].tap()
-        app.buttons[ elementStringIDs.sourcecodeButton ].tap()
+        app.scrollViews.otherElements.buttons[elementStringIDs.headerButton].tap()
+        app.tables.staticTexts[elementStringIDs.header1Button].tap()
+        app.buttons[elementStringIDs.sourcecodeButton].tap()
 
-        htmlContentTextView = app.textViews[ elementStringIDs.htmlTextField ]
-        let text : String = htmlContentTextView.value as! String
+        htmlContentTextView = app.textViews[elementStringIDs.htmlTextField]
+        let text: String = htmlContentTextView.value as! String
         let expected = "<h1>text</h1>"
         XCTAssertEqual(expected, text)
     }
 
     func testHeadingTwoText() {
-        richContentTextView = app.textViews[ elementStringIDs.richTextField ]
+        richContentTextView = app.textViews[elementStringIDs.richTextField]
         richContentTextView.tap()
         richContentTextView.enterAndSelectText(text: "text")
 
-        app.scrollViews.otherElements.buttons[ elementStringIDs.headerButton ].tap()
-        app.tables.staticTexts[ elementStringIDs.header2Button ].tap()
-        app.buttons[ elementStringIDs.sourcecodeButton ].tap()
+        app.scrollViews.otherElements.buttons[elementStringIDs.headerButton].tap()
+        app.tables.staticTexts[elementStringIDs.header2Button].tap()
+        app.buttons[elementStringIDs.sourcecodeButton].tap()
 
-        htmlContentTextView = app.textViews[ elementStringIDs.htmlTextField ]
-        let text : String = htmlContentTextView.value as! String
+        htmlContentTextView = app.textViews[elementStringIDs.htmlTextField]
+        let text: String = htmlContentTextView.value as! String
         let expected = "<h2>text</h2>"
         XCTAssertEqual(expected, text)
     }
 
     func testHeadingThreeText() {
-        richContentTextView = app.textViews[ elementStringIDs.richTextField ]
+        richContentTextView = app.textViews[elementStringIDs.richTextField]
         richContentTextView.tap()
         richContentTextView.enterAndSelectText(text: "text")
 
-        app.scrollViews.otherElements.buttons[ elementStringIDs.headerButton ].tap()
-        app.tables.staticTexts[ elementStringIDs.header3Button ].tap()
-        app.buttons[ elementStringIDs.sourcecodeButton ].tap()
+        app.scrollViews.otherElements.buttons[elementStringIDs.headerButton].tap()
+        app.tables.staticTexts[elementStringIDs.header3Button].tap()
+        app.buttons[elementStringIDs.sourcecodeButton].tap()
 
-        htmlContentTextView = app.textViews[ elementStringIDs.htmlTextField ]
-        let text : String = htmlContentTextView.value as! String
+        htmlContentTextView = app.textViews[elementStringIDs.htmlTextField]
+        let text: String = htmlContentTextView.value as! String
         let expected = "<h3>text</h3>"
         XCTAssertEqual(expected, text)
     }
 
     func testHeadingFourText() {
-        richContentTextView = app.textViews[ elementStringIDs.richTextField ]
+        richContentTextView = app.textViews[elementStringIDs.richTextField]
         richContentTextView.tap()
         richContentTextView.enterAndSelectText(text: "text")
 
-        app.scrollViews.otherElements.buttons[ elementStringIDs.headerButton ].tap()
+        app.scrollViews.otherElements.buttons[elementStringIDs.headerButton].tap()
         app.tables.element(boundBy: 0).swipeUp()
-        app.tables.staticTexts[ elementStringIDs.header4Button ].tap()
-        app.buttons[ elementStringIDs.sourcecodeButton ].tap()
+        app.tables.staticTexts[elementStringIDs.header4Button].tap()
+        app.buttons[elementStringIDs.sourcecodeButton].tap()
 
-        htmlContentTextView = app.textViews[ elementStringIDs.htmlTextField ]
-        let text : String = htmlContentTextView.value as! String
+        htmlContentTextView = app.textViews[elementStringIDs.htmlTextField]
+        let text: String = htmlContentTextView.value as! String
         let expected = "<h4>text</h4>"
         XCTAssertEqual(expected, text)
     }
 
     func testHeadingFiveText() {
-        richContentTextView = app.textViews[ elementStringIDs.richTextField ]
+        richContentTextView = app.textViews[elementStringIDs.richTextField]
         richContentTextView.tap()
         richContentTextView.enterAndSelectText(text: "text")
 
-        app.scrollViews.otherElements.buttons[ elementStringIDs.headerButton ].tap()
+        app.scrollViews.otherElements.buttons[elementStringIDs.headerButton].tap()
         app.tables.element(boundBy: 0).swipeUp()
-        app.tables.staticTexts[ elementStringIDs.header5Button ].tap()
-        app.buttons[ elementStringIDs.sourcecodeButton ].tap()
+        app.tables.staticTexts[elementStringIDs.header5Button].tap()
+        app.buttons[elementStringIDs.sourcecodeButton].tap()
 
-        htmlContentTextView = app.textViews[ elementStringIDs.htmlTextField ]
-        let text : String = htmlContentTextView.value as! String
+        htmlContentTextView = app.textViews[elementStringIDs.htmlTextField]
+        let text: String = htmlContentTextView.value as! String
         let expected = "<h5>text</h5>"
         XCTAssertEqual(expected, text)
     }
 
     func testHeadingSixText() {
-        richContentTextView = app.textViews[ elementStringIDs.richTextField ]
+        richContentTextView = app.textViews[elementStringIDs.richTextField]
         richContentTextView.tap()
         richContentTextView.enterAndSelectText(text: "text")
 
-        app.scrollViews.otherElements.buttons[ elementStringIDs.headerButton ].tap()
+        app.scrollViews.otherElements.buttons[elementStringIDs.headerButton].tap()
         app.tables.element(boundBy: 0).swipeUp()
-        app.tables.staticTexts[ elementStringIDs.header6Button ].tap()
-        app.buttons[ elementStringIDs.sourcecodeButton ].tap()
+        app.tables.staticTexts[elementStringIDs.header6Button].tap()
+        app.buttons[elementStringIDs.sourcecodeButton].tap()
 
-        htmlContentTextView = app.textViews[ elementStringIDs.htmlTextField ]
-        let text : String = htmlContentTextView.value as! String
+        htmlContentTextView = app.textViews[elementStringIDs.htmlTextField]
+        let text: String = htmlContentTextView.value as! String
         let expected = "<h6>text</h6>"
         XCTAssertEqual(expected, text)
     }
diff --git a/Example/AztecUITests/XCTest+Extensions.swift b/Example/AztecUITests/XCTest+Extensions.swift
index cb8d830f7..1d11248e1 100644
--- a/Example/AztecUITests/XCTest+Extensions.swift
+++ b/Example/AztecUITests/XCTest+Extensions.swift
@@ -38,8 +38,8 @@ extension XCUIElement {
     func enterAndSelectText(text: String) -> Void {
         let app = XCUIApplication()
 
-        self.typeText(text)
-        self.press(forDuration: 1.2)
+        typeText(text)
+        press(forDuration: 1.2)
         app.menuItems.element(boundBy: 1).tap()
     }
 }

From 4930fbbd46ce2103fa4e506b317e6e8f31570756 Mon Sep 17 00:00:00 2001
From: rachelmcr <rachel@automattic.com>
Date: Fri, 14 Apr 2017 09:32:19 +0100
Subject: [PATCH 3/7] Add and update helper functions

---
 Example/AztecUITests/AztecUITests.swift      | 129 +++++++------------
 Example/AztecUITests/XCTest+Extensions.swift |  37 +++++-
 2 files changed, 79 insertions(+), 87 deletions(-)

diff --git a/Example/AztecUITests/AztecUITests.swift b/Example/AztecUITests/AztecUITests.swift
index 7ee6bee37..fd3d0e215 100644
--- a/Example/AztecUITests/AztecUITests.swift
+++ b/Example/AztecUITests/AztecUITests.swift
@@ -3,8 +3,7 @@ import XCTest
 class AztecSimpleTextFormattingTests: XCTestCase {
 
     private var app: XCUIApplication!
-    private var htmlContentTextView: XCUIElement!
-    private var richContentTextView: XCUIElement!
+    private var richTextField: XCUIElement!
 
     override func setUp() {
         super.setUp()
@@ -26,109 +25,94 @@ class AztecSimpleTextFormattingTests: XCTestCase {
     }
 
     func testSimpleBoldText() {
-        richContentTextView = app.textViews[elementStringIDs.richTextField]
-        richContentTextView.tap()
-        richContentTextView.enterAndSelectText(text: "text")
+        enterTextInField(text: "text")
+        selectAllTextInField()
 
         app.scrollViews.otherElements.buttons[elementStringIDs.boldButton].tap()
         app.buttons[elementStringIDs.sourcecodeButton].tap()
 
-        htmlContentTextView = app.textViews[elementStringIDs.htmlTextField]
-        let text: String = htmlContentTextView.value as! String
+        let text = getHTMLContent()
         let expected = "<strong>text</strong>"
         XCTAssertEqual(expected, text)
     }
 
     func testSimpleItalicText() {
-        richContentTextView = app.textViews[elementStringIDs.richTextField]
-        richContentTextView.tap()
-        richContentTextView.enterAndSelectText(text: "text")
+        enterTextInField(text: "text")
+        selectAllTextInField()
 
         app.scrollViews.otherElements.buttons[elementStringIDs.italicButton].tap()
         app.buttons[elementStringIDs.sourcecodeButton].tap()
 
-        htmlContentTextView = app.textViews[elementStringIDs.htmlTextField]
-        let text: String = htmlContentTextView.value as! String
+        let text = getHTMLContent()
         let expected = "<em>text</em>"
         XCTAssertEqual(expected, text)
     }
 
     func testSimpleUnderlineText() {
-        richContentTextView = app.textViews[elementStringIDs.richTextField]
-        richContentTextView.tap()
-        richContentTextView.enterAndSelectText(text: "text")
+        enterTextInField(text: "text")
+        selectAllTextInField()
 
         app.scrollViews.otherElements.buttons[elementStringIDs.underlineButton].tap()
         app.buttons[elementStringIDs.sourcecodeButton].tap()
 
-        htmlContentTextView = app.textViews[elementStringIDs.htmlTextField]
-        let text: String = htmlContentTextView.value as! String
+        let text = getHTMLContent()
         let expected = "<u>text</u>"
         XCTAssertEqual(expected, text)
     }
 
     func testSimpleStrikethroughText() {
-        richContentTextView = app.textViews[elementStringIDs.richTextField]
-        richContentTextView.tap()
-        richContentTextView.enterAndSelectText(text: "text")
+        enterTextInField(text: "text")
+        selectAllTextInField()
 
         app.scrollViews.otherElements.buttons[elementStringIDs.strikethroughButton].tap()
         app.buttons[elementStringIDs.sourcecodeButton].tap()
 
-        htmlContentTextView = app.textViews[elementStringIDs.htmlTextField]
-        let text: String = htmlContentTextView.value as! String
+        let text = getHTMLContent()
         let expected = "<del>text</del>"
         XCTAssertEqual(expected, text)
     }
 
     func testSimpleBlockquoteText() {
-        richContentTextView = app.textViews[elementStringIDs.richTextField]
-        richContentTextView.tap()
-        richContentTextView.enterAndSelectText(text: "text")
+        enterTextInField(text: "text")
+        selectAllTextInField()
 
         app.scrollViews.otherElements.buttons[elementStringIDs.blockquoteButton].tap()
         app.buttons[elementStringIDs.sourcecodeButton].tap()
 
-        htmlContentTextView = app.textViews[elementStringIDs.htmlTextField]
-        let text: String = htmlContentTextView.value as! String
+        let text = getHTMLContent()
         let expected = "<blockquote>text</blockquote>"
         XCTAssertEqual(expected, text)
     }
 
     // Enable this test after unordered lists are fully implemented
     func testSimpleUnorderedListText() {
-        richContentTextView = app.textViews[elementStringIDs.richTextField]
-        richContentTextView.tap()
-        richContentTextView.enterAndSelectText(text: "text")
+        enterTextInField(text: "text")
+        selectAllTextInField()
 
         app.scrollViews.otherElements.buttons[elementStringIDs.unorderedlistButton].tap()
         app.buttons[elementStringIDs.sourcecodeButton].tap()
 
-        htmlContentTextView = app.textViews[elementStringIDs.htmlTextField]
-        let text: String = htmlContentTextView.value as! String
+        let text = getHTMLContent()
         let expected = "<ul><li>text</li></ul>"
         XCTAssertEqual(expected, text)
     }
 
     // Enable this test after ordered lists are fully implemented
     func testSimpleOrderedListText() {
-        richContentTextView = app.textViews[elementStringIDs.richTextField]
-        richContentTextView.tap()
-        richContentTextView.enterAndSelectText(text: "text")
+        enterTextInField(text: "text")
+        selectAllTextInField()
 
         app.scrollViews.otherElements.buttons[elementStringIDs.orderedlistButton].tap()
         app.buttons[elementStringIDs.sourcecodeButton].tap()
 
-        htmlContentTextView = app.textViews[elementStringIDs.htmlTextField]
-        let text: String = htmlContentTextView.value as! String
+        let text = getHTMLContent()
         let expected = "<ol><li>text</li></ol>"
         XCTAssertEqual(expected, text)
     }
 
     func testSimpleLinkedText() {
-        richContentTextView = app.textViews[elementStringIDs.richTextField]
-        richContentTextView.tap()
-        richContentTextView.enterAndSelectText(text: "text")
+        enterTextInField(text: "text")
+        selectAllTextInField()
 
         // Copy link to be auto-filled in URL field
         UIPasteboard.general.string = "https://wordpress.com/"
@@ -136,127 +120,112 @@ class AztecSimpleTextFormattingTests: XCTestCase {
         app.alerts.buttons.element(boundBy: 3).tap()
         app.buttons[elementStringIDs.sourcecodeButton].tap()
 
-        htmlContentTextView = app.textViews[elementStringIDs.htmlTextField]
-        let text: String = htmlContentTextView.value as! String
+        let text = getHTMLContent()
         let expected = "<a href=\"https://wordpress.com/\">text</a>"
         XCTAssertEqual(expected, text)
     }
 
     func testHorizontalRuler() {
-        richContentTextView = app.textViews[elementStringIDs.richTextField]
-        richContentTextView.tap()
+        let richTextField = app.textViews[elementStringIDs.richTextField]
+        richTextField.tap()
 
         app.scrollViews.otherElements.buttons[elementStringIDs.horizontalrulerButton].tap()
         app.buttons[elementStringIDs.sourcecodeButton].tap()
 
-        htmlContentTextView = app.textViews[elementStringIDs.htmlTextField]
-        let tex: String = htmlContentTextView.value as! String
+        let text = getHTMLContent()
         let expected = "<hr>"
         XCTAssertEqual(expected, text)
     }
 
     func testMoreTag() {
-        richContentTextView = app.textViews[elementStringIDs.richTextField]
-        richContentTextView.tap()
+        let richTextField = app.textViews[elementStringIDs.richTextField]
+        richTextField.tap()
 
         app.scrollViews.otherElements.buttons[elementStringIDs.moreButton].tap()
         app.buttons[elementStringIDs.sourcecodeButton].tap()
 
-        htmlContentTextView = app.textViews[elementStringIDs.htmlTextField]
-        let text: String = htmlContentTextView.value as! String
+        let text = getHTMLContent()
         let expected = "<!--more-->"
         XCTAssertEqual(expected, text)
     }
 
     func testHeadingOneText() {
-        richContentTextView = app.textViews[elementStringIDs.richTextField]
-        richContentTextView.tap()
-        richContentTextView.enterAndSelectText(text: "text")
+        enterTextInField(text: "text")
+        selectAllTextInField()
 
         app.scrollViews.otherElements.buttons[elementStringIDs.headerButton].tap()
         app.tables.staticTexts[elementStringIDs.header1Button].tap()
         app.buttons[elementStringIDs.sourcecodeButton].tap()
 
-        htmlContentTextView = app.textViews[elementStringIDs.htmlTextField]
-        let text: String = htmlContentTextView.value as! String
+        let text = getHTMLContent()
         let expected = "<h1>text</h1>"
         XCTAssertEqual(expected, text)
     }
 
     func testHeadingTwoText() {
-        richContentTextView = app.textViews[elementStringIDs.richTextField]
-        richContentTextView.tap()
-        richContentTextView.enterAndSelectText(text: "text")
+        enterTextInField(text: "text")
+        selectAllTextInField()
 
         app.scrollViews.otherElements.buttons[elementStringIDs.headerButton].tap()
         app.tables.staticTexts[elementStringIDs.header2Button].tap()
         app.buttons[elementStringIDs.sourcecodeButton].tap()
 
-        htmlContentTextView = app.textViews[elementStringIDs.htmlTextField]
-        let text: String = htmlContentTextView.value as! String
+        let text = getHTMLContent()
         let expected = "<h2>text</h2>"
         XCTAssertEqual(expected, text)
     }
 
     func testHeadingThreeText() {
-        richContentTextView = app.textViews[elementStringIDs.richTextField]
-        richContentTextView.tap()
-        richContentTextView.enterAndSelectText(text: "text")
+        enterTextInField(text: "text")
+        selectAllTextInField()
 
         app.scrollViews.otherElements.buttons[elementStringIDs.headerButton].tap()
         app.tables.staticTexts[elementStringIDs.header3Button].tap()
         app.buttons[elementStringIDs.sourcecodeButton].tap()
 
-        htmlContentTextView = app.textViews[elementStringIDs.htmlTextField]
-        let text: String = htmlContentTextView.value as! String
+        let text = getHTMLContent()
         let expected = "<h3>text</h3>"
         XCTAssertEqual(expected, text)
     }
 
     func testHeadingFourText() {
-        richContentTextView = app.textViews[elementStringIDs.richTextField]
-        richContentTextView.tap()
-        richContentTextView.enterAndSelectText(text: "text")
+        enterTextInField(text: "text")
+        selectAllTextInField()
 
         app.scrollViews.otherElements.buttons[elementStringIDs.headerButton].tap()
         app.tables.element(boundBy: 0).swipeUp()
         app.tables.staticTexts[elementStringIDs.header4Button].tap()
         app.buttons[elementStringIDs.sourcecodeButton].tap()
 
-        htmlContentTextView = app.textViews[elementStringIDs.htmlTextField]
-        let text: String = htmlContentTextView.value as! String
+        let text = getHTMLContent()
         let expected = "<h4>text</h4>"
         XCTAssertEqual(expected, text)
     }
 
     func testHeadingFiveText() {
-        richContentTextView = app.textViews[elementStringIDs.richTextField]
-        richContentTextView.tap()
-        richContentTextView.enterAndSelectText(text: "text")
+        enterTextInField(text: "text")
+        selectAllTextInField()
 
         app.scrollViews.otherElements.buttons[elementStringIDs.headerButton].tap()
         app.tables.element(boundBy: 0).swipeUp()
         app.tables.staticTexts[elementStringIDs.header5Button].tap()
         app.buttons[elementStringIDs.sourcecodeButton].tap()
 
-        htmlContentTextView = app.textViews[elementStringIDs.htmlTextField]
-        let text: String = htmlContentTextView.value as! String
+        let text = getHTMLContent()
         let expected = "<h5>text</h5>"
         XCTAssertEqual(expected, text)
     }
 
     func testHeadingSixText() {
-        richContentTextView = app.textViews[elementStringIDs.richTextField]
-        richContentTextView.tap()
-        richContentTextView.enterAndSelectText(text: "text")
+        enterTextInField(text: "text")
+        selectAllTextInField()
 
         app.scrollViews.otherElements.buttons[elementStringIDs.headerButton].tap()
         app.tables.element(boundBy: 0).swipeUp()
         app.tables.staticTexts[elementStringIDs.header6Button].tap()
         app.buttons[elementStringIDs.sourcecodeButton].tap()
 
-        htmlContentTextView = app.textViews[elementStringIDs.htmlTextField]
-        let text: String = htmlContentTextView.value as! String
+        let text = getHTMLContent()
         let expected = "<h6>text</h6>"
         XCTAssertEqual(expected, text)
     }
diff --git a/Example/AztecUITests/XCTest+Extensions.swift b/Example/AztecUITests/XCTest+Extensions.swift
index 1d11248e1..b06a6b6c3 100644
--- a/Example/AztecUITests/XCTest+Extensions.swift
+++ b/Example/AztecUITests/XCTest+Extensions.swift
@@ -30,16 +30,39 @@ public struct elementStringIDs {
     static var header6Button = "Heading 6"
 }
 
-extension XCUIElement {
+extension XCTest {
     /**
-     Enters text in the field and then selects all entered text
-     - Parameter text: the text to enter into the field
-    */
-    func enterAndSelectText(text: String) -> Void {
+     Enters text in the rich text field with auto-correction disabled
+     - Parameter text: the test to enter into the field
+     */
+    func enterTextInField(text: String) -> Void {
         let app = XCUIApplication()
+        let richTextField = app.textViews[elementStringIDs.richTextField]
 
-        typeText(text)
-        press(forDuration: 1.2)
+        // Paste text to avoid autocorrection
+        UIPasteboard.general.string = text
+        richTextField.press(forDuration: 1.2)
+        app.menuItems.element(boundBy: 0).tap()
+    }
+
+    /**
+     Selects all entered text in the rich text field
+     */
+    func selectAllTextInField() -> Void {
+        let app = XCUIApplication()
+        let richTextField = app.textViews[elementStringIDs.richTextField]
+
+        richTextField.press(forDuration: 1.2)
         app.menuItems.element(boundBy: 1).tap()
     }
+
+    /**
+     Gets the contents of the HTML text view
+     */
+    func getHTMLContent() -> String {
+        let app = XCUIApplication()
+        let htmlContentTextView = app.textViews[elementStringIDs.htmlTextField]
+        let text = htmlContentTextView.value as! String
+        return text
+    }
 }

From 4bb21f87818f18b40f454145b63c2fd57b744f03 Mon Sep 17 00:00:00 2001
From: rachelmcr <rachel@automattic.com>
Date: Fri, 14 Apr 2017 09:43:24 +0100
Subject: [PATCH 4/7] Use insert link label

---
 Example/AztecUITests/AztecUITests.swift      | 2 +-
 Example/AztecUITests/XCTest+Extensions.swift | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/Example/AztecUITests/AztecUITests.swift b/Example/AztecUITests/AztecUITests.swift
index fd3d0e215..8e98ce37c 100644
--- a/Example/AztecUITests/AztecUITests.swift
+++ b/Example/AztecUITests/AztecUITests.swift
@@ -117,7 +117,7 @@ class AztecSimpleTextFormattingTests: XCTestCase {
         // Copy link to be auto-filled in URL field
         UIPasteboard.general.string = "https://wordpress.com/"
         app.scrollViews.otherElements.buttons[elementStringIDs.linkButton].tap()
-        app.alerts.buttons.element(boundBy: 3).tap()
+        app.alerts.buttons[elementStringIDs.insertLinkConfirmButton].tap()
         app.buttons[elementStringIDs.sourcecodeButton].tap()
 
         let text = getHTMLContent()
diff --git a/Example/AztecUITests/XCTest+Extensions.swift b/Example/AztecUITests/XCTest+Extensions.swift
index b06a6b6c3..16bd9d878 100644
--- a/Example/AztecUITests/XCTest+Extensions.swift
+++ b/Example/AztecUITests/XCTest+Extensions.swift
@@ -8,6 +8,9 @@ public struct elementStringIDs {
     static var richTextField = "richContentView"
     static var htmlTextField = "HTMLContentView"
 
+    // Alerts
+    static var insertLinkConfirmButton = "Insert Link"
+
     // Toolbar
     static var mediaButton = "formatToolbarInsertMedia"
     static var headerButton = "formatToolbarSelectParagraphStyle"

From 72299bef6edfdfc52c97d8b0ae246d49ce1e4f33 Mon Sep 17 00:00:00 2001
From: rachelmcr <rachel@automattic.com>
Date: Fri, 14 Apr 2017 10:05:06 +0100
Subject: [PATCH 5/7] Update getHTMLContent helper

---
 Example/AztecUITests/AztecUITests.swift      | 16 ----------------
 Example/AztecUITests/XCTest+Extensions.swift |  3 +++
 2 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/Example/AztecUITests/AztecUITests.swift b/Example/AztecUITests/AztecUITests.swift
index 8e98ce37c..5c8dacf5d 100644
--- a/Example/AztecUITests/AztecUITests.swift
+++ b/Example/AztecUITests/AztecUITests.swift
@@ -29,7 +29,6 @@ class AztecSimpleTextFormattingTests: XCTestCase {
         selectAllTextInField()
 
         app.scrollViews.otherElements.buttons[elementStringIDs.boldButton].tap()
-        app.buttons[elementStringIDs.sourcecodeButton].tap()
 
         let text = getHTMLContent()
         let expected = "<strong>text</strong>"
@@ -41,7 +40,6 @@ class AztecSimpleTextFormattingTests: XCTestCase {
         selectAllTextInField()
 
         app.scrollViews.otherElements.buttons[elementStringIDs.italicButton].tap()
-        app.buttons[elementStringIDs.sourcecodeButton].tap()
 
         let text = getHTMLContent()
         let expected = "<em>text</em>"
@@ -53,7 +51,6 @@ class AztecSimpleTextFormattingTests: XCTestCase {
         selectAllTextInField()
 
         app.scrollViews.otherElements.buttons[elementStringIDs.underlineButton].tap()
-        app.buttons[elementStringIDs.sourcecodeButton].tap()
 
         let text = getHTMLContent()
         let expected = "<u>text</u>"
@@ -65,7 +62,6 @@ class AztecSimpleTextFormattingTests: XCTestCase {
         selectAllTextInField()
 
         app.scrollViews.otherElements.buttons[elementStringIDs.strikethroughButton].tap()
-        app.buttons[elementStringIDs.sourcecodeButton].tap()
 
         let text = getHTMLContent()
         let expected = "<del>text</del>"
@@ -77,7 +73,6 @@ class AztecSimpleTextFormattingTests: XCTestCase {
         selectAllTextInField()
 
         app.scrollViews.otherElements.buttons[elementStringIDs.blockquoteButton].tap()
-        app.buttons[elementStringIDs.sourcecodeButton].tap()
 
         let text = getHTMLContent()
         let expected = "<blockquote>text</blockquote>"
@@ -90,7 +85,6 @@ class AztecSimpleTextFormattingTests: XCTestCase {
         selectAllTextInField()
 
         app.scrollViews.otherElements.buttons[elementStringIDs.unorderedlistButton].tap()
-        app.buttons[elementStringIDs.sourcecodeButton].tap()
 
         let text = getHTMLContent()
         let expected = "<ul><li>text</li></ul>"
@@ -103,7 +97,6 @@ class AztecSimpleTextFormattingTests: XCTestCase {
         selectAllTextInField()
 
         app.scrollViews.otherElements.buttons[elementStringIDs.orderedlistButton].tap()
-        app.buttons[elementStringIDs.sourcecodeButton].tap()
 
         let text = getHTMLContent()
         let expected = "<ol><li>text</li></ol>"
@@ -118,7 +111,6 @@ class AztecSimpleTextFormattingTests: XCTestCase {
         UIPasteboard.general.string = "https://wordpress.com/"
         app.scrollViews.otherElements.buttons[elementStringIDs.linkButton].tap()
         app.alerts.buttons[elementStringIDs.insertLinkConfirmButton].tap()
-        app.buttons[elementStringIDs.sourcecodeButton].tap()
 
         let text = getHTMLContent()
         let expected = "<a href=\"https://wordpress.com/\">text</a>"
@@ -130,7 +122,6 @@ class AztecSimpleTextFormattingTests: XCTestCase {
         richTextField.tap()
 
         app.scrollViews.otherElements.buttons[elementStringIDs.horizontalrulerButton].tap()
-        app.buttons[elementStringIDs.sourcecodeButton].tap()
 
         let text = getHTMLContent()
         let expected = "<hr>"
@@ -142,7 +133,6 @@ class AztecSimpleTextFormattingTests: XCTestCase {
         richTextField.tap()
 
         app.scrollViews.otherElements.buttons[elementStringIDs.moreButton].tap()
-        app.buttons[elementStringIDs.sourcecodeButton].tap()
 
         let text = getHTMLContent()
         let expected = "<!--more-->"
@@ -155,7 +145,6 @@ class AztecSimpleTextFormattingTests: XCTestCase {
 
         app.scrollViews.otherElements.buttons[elementStringIDs.headerButton].tap()
         app.tables.staticTexts[elementStringIDs.header1Button].tap()
-        app.buttons[elementStringIDs.sourcecodeButton].tap()
 
         let text = getHTMLContent()
         let expected = "<h1>text</h1>"
@@ -168,7 +157,6 @@ class AztecSimpleTextFormattingTests: XCTestCase {
 
         app.scrollViews.otherElements.buttons[elementStringIDs.headerButton].tap()
         app.tables.staticTexts[elementStringIDs.header2Button].tap()
-        app.buttons[elementStringIDs.sourcecodeButton].tap()
 
         let text = getHTMLContent()
         let expected = "<h2>text</h2>"
@@ -181,7 +169,6 @@ class AztecSimpleTextFormattingTests: XCTestCase {
 
         app.scrollViews.otherElements.buttons[elementStringIDs.headerButton].tap()
         app.tables.staticTexts[elementStringIDs.header3Button].tap()
-        app.buttons[elementStringIDs.sourcecodeButton].tap()
 
         let text = getHTMLContent()
         let expected = "<h3>text</h3>"
@@ -195,7 +182,6 @@ class AztecSimpleTextFormattingTests: XCTestCase {
         app.scrollViews.otherElements.buttons[elementStringIDs.headerButton].tap()
         app.tables.element(boundBy: 0).swipeUp()
         app.tables.staticTexts[elementStringIDs.header4Button].tap()
-        app.buttons[elementStringIDs.sourcecodeButton].tap()
 
         let text = getHTMLContent()
         let expected = "<h4>text</h4>"
@@ -209,7 +195,6 @@ class AztecSimpleTextFormattingTests: XCTestCase {
         app.scrollViews.otherElements.buttons[elementStringIDs.headerButton].tap()
         app.tables.element(boundBy: 0).swipeUp()
         app.tables.staticTexts[elementStringIDs.header5Button].tap()
-        app.buttons[elementStringIDs.sourcecodeButton].tap()
 
         let text = getHTMLContent()
         let expected = "<h5>text</h5>"
@@ -223,7 +208,6 @@ class AztecSimpleTextFormattingTests: XCTestCase {
         app.scrollViews.otherElements.buttons[elementStringIDs.headerButton].tap()
         app.tables.element(boundBy: 0).swipeUp()
         app.tables.staticTexts[elementStringIDs.header6Button].tap()
-        app.buttons[elementStringIDs.sourcecodeButton].tap()
 
         let text = getHTMLContent()
         let expected = "<h6>text</h6>"
diff --git a/Example/AztecUITests/XCTest+Extensions.swift b/Example/AztecUITests/XCTest+Extensions.swift
index 16bd9d878..d38dc412d 100644
--- a/Example/AztecUITests/XCTest+Extensions.swift
+++ b/Example/AztecUITests/XCTest+Extensions.swift
@@ -64,6 +64,9 @@ extension XCTest {
      */
     func getHTMLContent() -> String {
         let app = XCUIApplication()
+
+        app.buttons[elementStringIDs.sourcecodeButton].tap()
+
         let htmlContentTextView = app.textViews[elementStringIDs.htmlTextField]
         let text = htmlContentTextView.value as! String
         return text

From 9d1f8d3daf8f65302d14167dc2fe656f6e25f2a8 Mon Sep 17 00:00:00 2001
From: rachelmcr <rachel@automattic.com>
Date: Sat, 15 Apr 2017 12:36:05 +0100
Subject: [PATCH 6/7] Fix text entry and add hr and more tag tests

---
 Example/AztecUITests/AztecUITests.swift      | 85 ++++++++++++--------
 Example/AztecUITests/XCTest+Extensions.swift |  6 +-
 2 files changed, 52 insertions(+), 39 deletions(-)

diff --git a/Example/AztecUITests/AztecUITests.swift b/Example/AztecUITests/AztecUITests.swift
index 5c8dacf5d..42362bd43 100644
--- a/Example/AztecUITests/AztecUITests.swift
+++ b/Example/AztecUITests/AztecUITests.swift
@@ -17,6 +17,9 @@ class AztecSimpleTextFormattingTests: XCTestCase {
 
         let tablesQuery = app.tables
         tablesQuery.staticTexts[elementStringIDs.emptyDemo].tap()
+
+        let richTextField = app.textViews[elementStringIDs.richTextField]
+        richTextField.tap()
     }
 
     override func tearDown() {
@@ -25,86 +28,86 @@ class AztecSimpleTextFormattingTests: XCTestCase {
     }
 
     func testSimpleBoldText() {
-        enterTextInField(text: "text")
+        enterTextInField(text: "1")
         selectAllTextInField()
 
         app.scrollViews.otherElements.buttons[elementStringIDs.boldButton].tap()
 
         let text = getHTMLContent()
-        let expected = "<strong>text</strong>"
+        let expected = "<strong>1</strong>"
         XCTAssertEqual(expected, text)
     }
 
     func testSimpleItalicText() {
-        enterTextInField(text: "text")
+        enterTextInField(text: "1")
         selectAllTextInField()
 
         app.scrollViews.otherElements.buttons[elementStringIDs.italicButton].tap()
 
         let text = getHTMLContent()
-        let expected = "<em>text</em>"
+        let expected = "<em>1</em>"
         XCTAssertEqual(expected, text)
     }
 
     func testSimpleUnderlineText() {
-        enterTextInField(text: "text")
+        enterTextInField(text: "1")
         selectAllTextInField()
 
         app.scrollViews.otherElements.buttons[elementStringIDs.underlineButton].tap()
 
         let text = getHTMLContent()
-        let expected = "<u>text</u>"
+        let expected = "<u>1</u>"
         XCTAssertEqual(expected, text)
     }
 
     func testSimpleStrikethroughText() {
-        enterTextInField(text: "text")
+        enterTextInField(text: "1")
         selectAllTextInField()
 
         app.scrollViews.otherElements.buttons[elementStringIDs.strikethroughButton].tap()
 
         let text = getHTMLContent()
-        let expected = "<del>text</del>"
+        let expected = "<del>1</del>"
         XCTAssertEqual(expected, text)
     }
 
     func testSimpleBlockquoteText() {
-        enterTextInField(text: "text")
+        enterTextInField(text: "1")
         selectAllTextInField()
 
         app.scrollViews.otherElements.buttons[elementStringIDs.blockquoteButton].tap()
 
         let text = getHTMLContent()
-        let expected = "<blockquote>text</blockquote>"
+        let expected = "<blockquote>1</blockquote>"
         XCTAssertEqual(expected, text)
     }
 
     // Enable this test after unordered lists are fully implemented
     func testSimpleUnorderedListText() {
-        enterTextInField(text: "text")
+        enterTextInField(text: "1")
         selectAllTextInField()
 
         app.scrollViews.otherElements.buttons[elementStringIDs.unorderedlistButton].tap()
 
         let text = getHTMLContent()
-        let expected = "<ul><li>text</li></ul>"
+        let expected = "<ul><li>1</li></ul>"
         XCTAssertEqual(expected, text)
     }
 
     // Enable this test after ordered lists are fully implemented
     func testSimpleOrderedListText() {
-        enterTextInField(text: "text")
+        enterTextInField(text: "1")
         selectAllTextInField()
 
         app.scrollViews.otherElements.buttons[elementStringIDs.orderedlistButton].tap()
 
         let text = getHTMLContent()
-        let expected = "<ol><li>text</li></ol>"
+        let expected = "<ol><li>1</li></ol>"
         XCTAssertEqual(expected, text)
     }
 
     func testSimpleLinkedText() {
-        enterTextInField(text: "text")
+        enterTextInField(text: "1")
         selectAllTextInField()
 
         // Copy link to be auto-filled in URL field
@@ -113,14 +116,11 @@ class AztecSimpleTextFormattingTests: XCTestCase {
         app.alerts.buttons[elementStringIDs.insertLinkConfirmButton].tap()
 
         let text = getHTMLContent()
-        let expected = "<a href=\"https://wordpress.com/\">text</a>"
+        let expected = "<a href=\"https://wordpress.com/\">1</a>"
         XCTAssertEqual(expected, text)
     }
 
     func testHorizontalRuler() {
-        let richTextField = app.textViews[elementStringIDs.richTextField]
-        richTextField.tap()
-
         app.scrollViews.otherElements.buttons[elementStringIDs.horizontalrulerButton].tap()
 
         let text = getHTMLContent()
@@ -128,10 +128,17 @@ class AztecSimpleTextFormattingTests: XCTestCase {
         XCTAssertEqual(expected, text)
     }
 
-    func testMoreTag() {
-        let richTextField = app.textViews[elementStringIDs.richTextField]
-        richTextField.tap()
+    func testHorizontalRulerWithText() {
+        enterTextInField(text: "1\n")
+        app.scrollViews.otherElements.buttons[elementStringIDs.horizontalrulerButton].tap()
+        enterTextInField(text: "\n2")
 
+        let text = getHTMLContent()
+        let expected = "1<br><hr><br>2"
+        XCTAssertEqual(expected, text)
+    }
+
+    func testMoreTag() {
         app.scrollViews.otherElements.buttons[elementStringIDs.moreButton].tap()
 
         let text = getHTMLContent()
@@ -139,44 +146,54 @@ class AztecSimpleTextFormattingTests: XCTestCase {
         XCTAssertEqual(expected, text)
     }
 
+    func testMoreTagWithText() {
+        enterTextInField(text: "1\n")
+        app.scrollViews.otherElements.buttons[elementStringIDs.moreButton].tap()
+        enterTextInField(text: "\n2")
+
+        let text = getHTMLContent()
+        let expected = "1<br><!--more--><br>2"
+        XCTAssertEqual(expected, text)
+    }
+
     func testHeadingOneText() {
-        enterTextInField(text: "text")
+        enterTextInField(text: "1")
         selectAllTextInField()
 
         app.scrollViews.otherElements.buttons[elementStringIDs.headerButton].tap()
         app.tables.staticTexts[elementStringIDs.header1Button].tap()
 
         let text = getHTMLContent()
-        let expected = "<h1>text</h1>"
+        let expected = "<h1>1</h1>"
         XCTAssertEqual(expected, text)
     }
 
     func testHeadingTwoText() {
-        enterTextInField(text: "text")
+        enterTextInField(text: "1")
         selectAllTextInField()
 
         app.scrollViews.otherElements.buttons[elementStringIDs.headerButton].tap()
         app.tables.staticTexts[elementStringIDs.header2Button].tap()
 
         let text = getHTMLContent()
-        let expected = "<h2>text</h2>"
+        let expected = "<h2>1</h2>"
         XCTAssertEqual(expected, text)
     }
 
     func testHeadingThreeText() {
-        enterTextInField(text: "text")
+        enterTextInField(text: "1")
         selectAllTextInField()
 
         app.scrollViews.otherElements.buttons[elementStringIDs.headerButton].tap()
         app.tables.staticTexts[elementStringIDs.header3Button].tap()
 
         let text = getHTMLContent()
-        let expected = "<h3>text</h3>"
+        let expected = "<h3>1</h3>"
         XCTAssertEqual(expected, text)
     }
 
     func testHeadingFourText() {
-        enterTextInField(text: "text")
+        enterTextInField(text: "1")
         selectAllTextInField()
 
         app.scrollViews.otherElements.buttons[elementStringIDs.headerButton].tap()
@@ -184,12 +201,12 @@ class AztecSimpleTextFormattingTests: XCTestCase {
         app.tables.staticTexts[elementStringIDs.header4Button].tap()
 
         let text = getHTMLContent()
-        let expected = "<h4>text</h4>"
+        let expected = "<h4>1</h4>"
         XCTAssertEqual(expected, text)
     }
 
     func testHeadingFiveText() {
-        enterTextInField(text: "text")
+        enterTextInField(text: "1")
         selectAllTextInField()
 
         app.scrollViews.otherElements.buttons[elementStringIDs.headerButton].tap()
@@ -197,12 +214,12 @@ class AztecSimpleTextFormattingTests: XCTestCase {
         app.tables.staticTexts[elementStringIDs.header5Button].tap()
 
         let text = getHTMLContent()
-        let expected = "<h5>text</h5>"
+        let expected = "<h5>1</h5>"
         XCTAssertEqual(expected, text)
     }
 
     func testHeadingSixText() {
-        enterTextInField(text: "text")
+        enterTextInField(text: "1")
         selectAllTextInField()
 
         app.scrollViews.otherElements.buttons[elementStringIDs.headerButton].tap()
@@ -210,7 +227,7 @@ class AztecSimpleTextFormattingTests: XCTestCase {
         app.tables.staticTexts[elementStringIDs.header6Button].tap()
 
         let text = getHTMLContent()
-        let expected = "<h6>text</h6>"
+        let expected = "<h6>1</h6>"
         XCTAssertEqual(expected, text)
     }
 }
diff --git a/Example/AztecUITests/XCTest+Extensions.swift b/Example/AztecUITests/XCTest+Extensions.swift
index d38dc412d..29ea34515 100644
--- a/Example/AztecUITests/XCTest+Extensions.swift
+++ b/Example/AztecUITests/XCTest+Extensions.swift
@@ -42,10 +42,7 @@ extension XCTest {
         let app = XCUIApplication()
         let richTextField = app.textViews[elementStringIDs.richTextField]
 
-        // Paste text to avoid autocorrection
-        UIPasteboard.general.string = text
-        richTextField.press(forDuration: 1.2)
-        app.menuItems.element(boundBy: 0).tap()
+        richTextField.typeText(text)
     }
 
     /**
@@ -66,7 +63,6 @@ extension XCTest {
         let app = XCUIApplication()
 
         app.buttons[elementStringIDs.sourcecodeButton].tap()
-
         let htmlContentTextView = app.textViews[elementStringIDs.htmlTextField]
         let text = htmlContentTextView.value as! String
         return text

From aaabe3e8d98fbec0231ab0b8a7360956c7ddef83 Mon Sep 17 00:00:00 2001
From: rachelmcr <rachel@automattic.com>
Date: Wed, 19 Apr 2017 10:30:31 +0100
Subject: [PATCH 7/7] Disable list tests for now

---
 Example/AztecUITests/AztecUITests.swift | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Example/AztecUITests/AztecUITests.swift b/Example/AztecUITests/AztecUITests.swift
index 42362bd43..accbd5514 100644
--- a/Example/AztecUITests/AztecUITests.swift
+++ b/Example/AztecUITests/AztecUITests.swift
@@ -83,6 +83,7 @@ class AztecSimpleTextFormattingTests: XCTestCase {
     }
 
     // Enable this test after unordered lists are fully implemented
+    /*
     func testSimpleUnorderedListText() {
         enterTextInField(text: "1")
         selectAllTextInField()
@@ -93,8 +94,10 @@ class AztecSimpleTextFormattingTests: XCTestCase {
         let expected = "<ul><li>1</li></ul>"
         XCTAssertEqual(expected, text)
     }
+    */
 
     // Enable this test after ordered lists are fully implemented
+    /*
     func testSimpleOrderedListText() {
         enterTextInField(text: "1")
         selectAllTextInField()
@@ -105,6 +108,7 @@ class AztecSimpleTextFormattingTests: XCTestCase {
         let expected = "<ol><li>1</li></ol>"
         XCTAssertEqual(expected, text)
     }
+    */
 
     func testSimpleLinkedText() {
         enterTextInField(text: "1")