combine some registration tests and disable test that fails in ios10 due to broken XCode8 api

//FREEBIE

Author: michaelkirk

SignalUITests/RegistrationUITests.swift

@@ -20,51 +20,44 @@ class RegistrationUITests: UITestCase {
         super.tearDown()
     }
 
-    func testCountryCodeSelectionScreenNavigation() {
+    func DISABLED_testCountryCodeSelectionScreenStandardSelect() {
         app.buttons["Country Code"].tap()
-        
-        XCTAssert(app.staticTexts["Select Country Code"].exists)
-    }
+        app.tables.staticTexts["Bahrain"].tap()
 
-    func testCountryCodeSelectionScreenBackNavigation() {
-        app.buttons["Country Code"].tap()
-        app.navigationBars["Select Country Code"].buttons["btnCancel  white"].tap()
-        
-        XCTAssert(app.staticTexts["Your Phone Number"].exists)
+        // TEST DISABLED because implicit scrolling is broken in XCode8 Beta
+        XCTAssert(app.buttons["Bahrain"].exists)
+        XCTAssert(app.buttons["+33"].exists)
     }
 
     func testCountryCodeSelectionScreenSearch() {
         app.buttons["Country Code"].tap()
+
+        XCTAssert(app.staticTexts["Afghanistan"].exists)
         let searchField = app.tables.children(matching: .searchField).element
         searchField.tap()
         searchField.typeText("Fran")
-        
         XCTAssert(app.staticTexts["France"].exists)
-    }
+        XCTAssert(!app.staticTexts["Afghanistan"].exists)
 
-    func testCountryCodeSelectionScreenStandardSelect() {
-        app.buttons["Country Code"].tap()
         app.tables.staticTexts["France"].tap()
-        
+
         XCTAssert(app.buttons["France"].exists)
         XCTAssert(app.buttons["+33"].exists)
     }
 
-    func testCountryCodeSelectionScreenSearchSelect() {
+    func testCountryCodeSelectionScreenBackNavigation() {
         app.buttons["Country Code"].tap()
-        let searchField = app.tables.children(matching: .searchField).element
-        searchField.tap()
-        searchField.typeText("Fran")
-        app.tables.staticTexts["France"].tap()
-        
-        XCTAssert(app.buttons["France"].exists)
-        XCTAssert(app.buttons["+33"].exists)
+        app.navigationBars["Select Country Code"].buttons["btnCancel  white"].tap()
+
+        XCTAssert(app.staticTexts["Your Phone Number"].exists)
     }
 
     func testVerifyUnsupportedPhoneNumberAlert() {
         app.buttons["Verify This Device"].tap()
-        
-        XCTAssert(app.alerts["Registration Error"].exists)
+
+        let alert = app.alerts["Registration Error"]
+        expectation(for: Predicate(format: "exists == 1"), evaluatedWith: alert, handler: nil)
+        waitForExpectations(withTimeout: 5, handler: nil)
     }
 
     func testVerifySupportedPhoneNumberChangeNumberNavigation() {