Merge pull request venmo#46 from brockboland/testfix

Improve collapse test, and reset view state after basic flow test

VENTokenFieldSampleTests/VENTokenFieldSampleTests.m

@@ -36,6 +36,15 @@ - (void)testBasicFlow
     [tester enterTextIntoCurrentFirstResponder:@"\b"];
     [tester enterTextIntoCurrentFirstResponder:@"\b"];
     [tester waitForAbsenceOfViewWithAccessibilityLabel:@"Octocat,"];
+
+    // Clear remaining names to reset state for next test
+    [tester tapViewWithAccessibilityLabel:@"To"];
+    [tester enterTextIntoCurrentFirstResponder:@"\b"];
+    [tester enterTextIntoCurrentFirstResponder:@"\b"];
+    [tester enterTextIntoCurrentFirstResponder:@"\b"];
+    [tester enterTextIntoCurrentFirstResponder:@"\b"];
+    [tester enterTextIntoCurrentFirstResponder:@"\b"];
+    [tester enterTextIntoCurrentFirstResponder:@"\b"];
 }
 
 - (void)testResignFirstResponder
@@ -49,9 +58,41 @@ - (void)testResignFirstResponderAndCollapse
 {
     [tester tapViewWithAccessibilityLabel:@"To"];
     [tester tapViewWithAccessibilityLabel:@"Resign First Responder"];
+    [tester waitForAbsenceOfKeyboard];
+    [tester tapViewWithAccessibilityLabel:@"Collapse token field"];
+
+    // Confirm the collapse lable
+    [tester waitForViewWithAccessibilityLabel:@"0 people"];
+
+    // Tap on the field and enter names. Lable isn't tappable, so tap the point.
+    UIView *tokenField = [tester waitForViewWithAccessibilityLabel:@"0 people"];
+    [tester tapScreenAtPoint:tokenField.center];
 
+    [tester enterTextIntoCurrentFirstResponder:@"Ayaka\n"];
+    [tester waitForViewWithAccessibilityLabel:@"Ayaka,"];
+
+    [tester enterTextIntoCurrentFirstResponder:@"Mark\n"];
+    [tester waitForViewWithAccessibilityLabel:@"Mark,"];
+
+    [tester enterTextIntoCurrentFirstResponder:@"Neeraj\n"];
+    [tester waitForViewWithAccessibilityLabel:@"Neeraj,"];
+
+    [tester enterTextIntoCurrentFirstResponder:@"Octocat\n"];
+    [tester waitForViewWithAccessibilityLabel:@"Octocat,"];
+
+    [tester tapViewWithAccessibilityLabel:@"Resign First Responder"];
     [tester waitForAbsenceOfKeyboard];
+    [tester tapViewWithAccessibilityLabel:@"Collapse token field"];
 
+    // Confirm the collapse label
+    [tester waitForViewWithAccessibilityLabel:@"4 people"];
+
+    // Remove one name and check again
+    [tester tapScreenAtPoint:tokenField.center];
+    [tester enterTextIntoCurrentFirstResponder:@"\b"];
+    [tester enterTextIntoCurrentFirstResponder:@"\b"];
+    [tester tapViewWithAccessibilityLabel:@"Resign First Responder"];
+    [tester waitForAbsenceOfKeyboard];
     [tester tapViewWithAccessibilityLabel:@"Collapse token field"];
     [tester waitForViewWithAccessibilityLabel:@"3 people"];
 }