Merge pull request #18 from bcylin/feature/ui-tests

bcylin · web-flow · commit 6c002a1979d1 · 2017-10-06T11:08:40.000-05:00
Reenable UI Tests
diff --git a/.travis.yml b/.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:
diff --git a/Example.xcodeproj/project.pbxproj b/Example.xcodeproj/project.pbxproj
diff --git a/Example.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/Example.xcodeproj/project.xcworkspace/contents.xcworkspacedata
diff --git a/Example/Info.plist b/Example/Info.plist
@@ -4,6 +4,8 @@
 <dict>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
+	<key>CFBundleDisplayName</key>
+	<string>ICInputAccessoryExample</string>
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
@@ -35,7 +37,6 @@
 		<string>UIInterfaceOrientationPortrait</string>
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
-		<string>UIInterfaceOrientationPortraitUpsideDown</string>
 	</array>
 </dict>
 </plist>
diff --git a/ICInputAccessory.xcodeproj/project.pbxproj b/ICInputAccessory.xcodeproj/project.pbxproj
diff --git a/ICInputAccessory.xcodeproj/xcshareddata/xcschemes/Example.xcscheme b/ICInputAccessory.xcodeproj/xcshareddata/xcschemes/Example.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0820"
+   LastUpgradeVersion = "0830"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -14,10 +14,10 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "B5E9F8FA1C8D3B6E00443DC7"
+               BlueprintIdentifier = "B53376871F4436D000230739"
                BuildableName = "Example.app"
                BlueprintName = "Example"
-               ReferencedContainer = "container:Example.xcodeproj">
+               ReferencedContainer = "container:ICInputAccessory.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
       </BuildActionEntries>
@@ -32,20 +32,20 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "B548C5C11C8E91B0009D5AEE"
+               BlueprintIdentifier = "B533769A1F4436D000230739"
                BuildableName = "ICInputAccessoryUITests.xctest"
                BlueprintName = "ICInputAccessoryUITests"
-               ReferencedContainer = "container:Example.xcodeproj">
+               ReferencedContainer = "container:ICInputAccessory.xcodeproj">
             </BuildableReference>
          </TestableReference>
       </Testables>
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "B5E9F8FA1C8D3B6E00443DC7"
+            BlueprintIdentifier = "B53376871F4436D000230739"
             BuildableName = "Example.app"
             BlueprintName = "Example"
-            ReferencedContainer = "container:Example.xcodeproj">
+            ReferencedContainer = "container:ICInputAccessory.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
       <AdditionalOptions>
@@ -65,10 +65,10 @@
          runnableDebuggingMode = "0">
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "B5E9F8FA1C8D3B6E00443DC7"
+            BlueprintIdentifier = "B53376871F4436D000230739"
             BuildableName = "Example.app"
             BlueprintName = "Example"
-            ReferencedContainer = "container:Example.xcodeproj">
+            ReferencedContainer = "container:ICInputAccessory.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
       <AdditionalOptions>
@@ -84,10 +84,10 @@
          runnableDebuggingMode = "0">
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "B5E9F8FA1C8D3B6E00443DC7"
+            BlueprintIdentifier = "B53376871F4436D000230739"
             BuildableName = "Example.app"
             BlueprintName = "Example"
-            ReferencedContainer = "container:Example.xcodeproj">
+            ReferencedContainer = "container:ICInputAccessory.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
    </ProfileAction>
diff --git a/ICInputAccessory.xcworkspace/contents.xcworkspacedata b/ICInputAccessory.xcworkspace/contents.xcworkspacedata
diff --git a/ICInputAccessoryUITests/ICKeyboardDismissTextFieldUITests.swift b/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()
   }
 
 }
diff --git a/ICInputAccessoryUITests/ICTokenFieldUITests.swift b/ICInputAccessoryUITests/ICTokenFieldUITests.swift
@@ -28,24 +28,15 @@ import XCTest
 
 class ICTokenFieldUITests: 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()
+    app.launch()
   }
 
-  func testTokenField() {
-    let app = XCUIApplication()
-    let tablesQuery = app.tables
-    let textField = tablesQuery.cells.containing(.staticText, identifier:"ICTokenField").children(matching: .textField).element
-
+  private func typeTexts(in textField: XCUIElement) {
     textField.tap()
     textField.typeText("Try")
     textField.typeText(" ")
@@ -61,58 +52,25 @@ class ICTokenFieldUITests: XCTestCase {
     textField.typeText("TestFlight")
     textField.typeText(",")
 
-    let searchButton = app.buttons["Search"]
-    searchButton.tap()
+    app.buttons["Search"].tap()
+  }
+
+  func testTokenField() {
+    let textField = app.tables.cells.containing(.staticText, identifier:"ICTokenField").children(matching: .textField).element
+    typeTexts(in: textField)
   }
 
   func testCustomizedTokenField() {
-    let app = XCUIApplication()
     app.tables.staticTexts["CustomizedTokenField"].tap()
-
     let tokenField = app.navigationBars["Example.CustomizedTokenView"].scrollViews.children(matching: .textField).element
-    tokenField.typeText("Try")
-    tokenField.typeText(" ")
-    tokenField.typeText("iCook")
-    tokenField.typeText(",")
-    tokenField.typeText("beta")
-    tokenField.typeText(" ")
-
-    let deleteKey = app.keys["delete"]
-    deleteKey.tap()
-    deleteKey.tap()
-
-    tokenField.typeText("TestFlight")
-    tokenField.typeText(",")
-
-    let searchButton = app.buttons["Search"]
-    searchButton.tap()
+    typeTexts(in: tokenField)
   }
 
   func testStoryboard() {
-    let app = XCUIApplication()
-    let tablesQuery = app.tables
-    tablesQuery.buttons["Storyboard"].tap()
-
-    let tokenField = tablesQuery.cells.containing(.staticText, identifier:"Storyboard ICTokenField").children(matching: .textField).element
-    tokenField.tap()
-    tokenField.typeText("Try")
-    tokenField.typeText(" ")
-    tokenField.typeText("iCook")
-    tokenField.typeText(",")
-    tokenField.typeText("beta")
-    tokenField.typeText(" ")
-
-    let deleteKey = app.keys["delete"]
-    deleteKey.tap()
-    deleteKey.tap()
-
-    tokenField.typeText("TestFlight")
-    tokenField.typeText(",")
-
-    let searchButton = app.buttons["Search"]
-    searchButton.tap()
-
-    tablesQuery.buttons["Back to Code"].tap()
+    app.tables.buttons["Storyboard"].tap()
+    let tokenField = app.tables.cells.containing(.staticText, identifier:"Storyboard ICTokenField").children(matching: .textField).element
+    typeTexts(in: tokenField)
+    app.tables.buttons["Back to Code"].tap()
   }
 
 }
diff --git a/Podfile b/Podfile
@@ -2,10 +2,8 @@ platform :ios, "8.0"
 use_frameworks!
 
 workspace "ICInputAccessory"
-project "Example"
+project "ICInputAccessory"
 
 target "Example" do
-  pod "ICInputAccessory/KeyboardDismissTextField", path: "./"
-  pod "ICInputAccessory/TokenField", path: "./"
   pod "SwiftLint", "0.19.0"
 end
diff --git a/Podfile.lock b/Podfile.lock
@@ -1,21 +1,12 @@
 PODS:
-  - ICInputAccessory/KeyboardDismissTextField (1.4.0)
-  - ICInputAccessory/TokenField (1.4.0)
   - SwiftLint (0.19.0)
 
 DEPENDENCIES:
-  - ICInputAccessory/KeyboardDismissTextField (from `./`)
-  - ICInputAccessory/TokenField (from `./`)
   - SwiftLint (= 0.19.0)
 
-EXTERNAL SOURCES:
-  ICInputAccessory:
-    :path: ./
-
 SPEC CHECKSUMS:
-  ICInputAccessory: dace41bea1ed8b0368bf8ffd439a215efa8effd3
   SwiftLint: 3537a05b34060e78e7510f04fb7537d738247803
 
-PODFILE CHECKSUM: 400449a0f6672fe2c72f4d91409a3e8abccb8fab
+PODFILE CHECKSUM: 0709dcae81d808b2c03cbe4911faac9680768b93
 
 COCOAPODS: 1.3.1
diff --git a/Source/KeyboardDismissTextField/ICKeyboardDismissAccessoryView.swift b/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
   }()
 
diff --git a/Source/KeyboardDismissTextField/ICKeyboardDismissTextField.swift b/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)
     }
   }
 
