Reenable UI tests

Author: bcylin

.travis.yml

@@ -7,12 +7,14 @@ cache:
     - Pods
 before_install:
   - export LANG=en_US.UTF-8
+  - xcrun instruments -s devices
+  - xcrun instruments -w "iPhone 7 (10.3.1) [" || true
 install:
   - make install
 before_script:
   - xcodebuild -workspace ICInputAccessory.xcworkspace -list
 script:
-  - bundle exec rake ci:build
+  - bundle exec rake ci:test
   - make -B carthage
   - make -B docs
 after_script:

ICInputAccessory.xcodeproj/project.pbxproj

@@ -28,6 +28,7 @@
 		B548C5EE1C8EB9E2009D5AEE /* ICKeyboardDismissTextField.swift in Sources */ = {isa = PBXBuildFile; fileRef = B548C5ED1C8EB9E2009D5AEE /* ICKeyboardDismissTextField.swift */; };
 		B56BC42E1C89A7EA00C20AD6 /* ICInputAccessory.h in Headers */ = {isa = PBXBuildFile; fileRef = B56BC42D1C89A7EA00C20AD6 /* ICInputAccessory.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		B56BC4361C89A8D800C20AD6 /* ICKeyboardDismissAccessoryView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B56BC4351C89A8D800C20AD6 /* ICKeyboardDismissAccessoryView.swift */; };
+		B5E619CB1F44A05B005200E1 /* ICInputAccessory.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = B56BC42A1C89A7EA00C20AD6 /* ICInputAccessory.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -47,6 +48,20 @@
 		};
 /* End PBXContainerItemProxy section */
 
+/* Begin PBXCopyFilesBuildPhase section */
+		B5E619CA1F44A04A005200E1 /* Embed Frameworks */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = "";
+			dstSubfolderSpec = 10;
+			files = (
+				B5E619CB1F44A05B005200E1 /* ICInputAccessory.framework in Embed Frameworks */,
+			);
+			name = "Embed Frameworks";
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXCopyFilesBuildPhase section */
+
 /* Begin PBXFileReference section */
 		05C165FF29CCF16E184D992C /* Pods-Example.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Example.release.xcconfig"; path = "Pods/Target Support Files/Pods-Example/Pods-Example.release.xcconfig"; sourceTree = "<group>"; };
 		2BF6D42E3926584426ECDFE2 /* Pods_Example.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Example.framework; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -229,6 +244,7 @@
 				B53376861F4436D000230739 /* Resources */,
 				9192772A7DBF8B1D3D564448 /* [CP] Embed Pods Frameworks */,
 				B00B735ECB485DFE7B769A68 /* [CP] Copy Pods Resources */,
+				B5E619CA1F44A04A005200E1 /* Embed Frameworks */,
 			);
 			buildRules = (
 			);

ICInputAccessoryUITests/ICKeyboardDismissTextFieldUITests.swift

@@ -28,40 +28,24 @@ import XCTest
 
 class ICKeyboardDismissTextFieldUITests: XCTestCase {
 
+  private lazy var app = XCUIApplication()
+
   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.
     XCUIApplication().launch()
   }
 
-  override func tearDown() {
-    // Put teardown code here. This method is called after the invocation of each test method in the class.
-    super.tearDown()
-  }
-
   func testKeyboardDismissing() {
-    let app = XCUIApplication()
-    app.tables.cells.textFields["ICKeyboardDismissTextField"].tap()
-
-    let keyboardWindow = app.children(matching: .window).element(boundBy: 1)
-    let accessory = keyboardWindow.children(matching: .other).element.children(matching: .other).element.children(matching: .other).element(boundBy: 0)
-    accessory.children(matching: .button).element.tap()
+    app.tables.textFields["ICKeyboardDismissTextField"].tap()
+    app.buttons["Dismiss Keyboard"].tap()
   }
 
   func testStoryboard() {
-    let app = XCUIApplication()
-    let tablesQuery = app.tables
-
-    tablesQuery.buttons["Storyboard"].tap()
-    tablesQuery.textFields["Storyboard ICKeyboardDismissTextField"].tap()
-
-    let keyboardWindow = app.children(matching: .window).element(boundBy: 1)
-    let accessory = keyboardWindow.children(matching: .other).element.children(matching: .other).element.children(matching: .other).element(boundBy: 0)
-    accessory.children(matching: .button).element.tap()
-
-    tablesQuery.buttons["Back to Code"].tap()
+    app.tables.buttons["Storyboard"].tap()
+    app.tables.textFields["Storyboard ICKeyboardDismissTextField"].tap()
+    app.buttons["Dismiss Keyboard"].tap()
+    app.tables.buttons["Back to Code"].tap()
   }
 
 }

ICInputAccessoryUITests/ICTokenFieldUITests.swift

@@ -30,17 +30,10 @@ class ICTokenFieldUITests: XCTestCase {
 
   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.
     XCUIApplication().launch()
   }
 
-  override func tearDown() {
-    // Put teardown code here. This method is called after the invocation of each test method in the class.
-    super.tearDown()
-  }
-
   func testTokenField() {
     let app = XCUIApplication()
     let tablesQuery = app.tables

Source/KeyboardDismissTextField/ICKeyboardDismissAccessoryView.swift

@@ -48,6 +48,7 @@ open class ICKeyboardDismissAccessoryView: UIView {
     _button.layer.cornerRadius = 4
     _button.layer.shouldRasterize = true
     _button.layer.rasterizationScale = UIScreen.main.scale
+    _button.accessibilityLabel = "Dismiss Keyboard"
     return _button
   }()
 

Source/KeyboardDismissTextField/ICKeyboardDismissTextField.swift

@@ -73,7 +73,9 @@ open class ICKeyboardDismissTextField: UITextField {
 
   private func setUpAccessoryView() {
     if keyboardAccessoryView == nil {
-      keyboardAccessoryView = ICKeyboardDismissAccessoryView()
+      // Set an initial frame for the button to appear during UI testing.
+      let frame = CGRect(x: 0, y: 0, width: 320, height: 60)
+      keyboardAccessoryView = ICKeyboardDismissAccessoryView(frame: frame)
     }
   }