Fix UI tests

Author: glm4

ios-base/Home/Views/HomeViewController.swift

@@ -92,6 +92,12 @@ private extension HomeViewController {
       subviews: [welcomeLabel, logOutButton, deleteAccountButton, getProfileButton]
     )
     activateConstraints()
+    setupAccessibility()
+  }
+
+  func setupAccessibility() {
+    getProfileButton.accessibilityIdentifier = "GetMyProfileButton"
+    logOutButton.accessibilityIdentifier = "LogoutButton"
   }
 
   private func activateConstraints() {

ios-base/Onboarding/Views/SignInViewController.swift

@@ -96,6 +96,13 @@ private extension SignInViewController {
     ])
 
     activateConstrains()
+    setupAccessibility()
+  }
+
+  func setupAccessibility() {
+    logInButton.accessibilityIdentifier = "SignInButton"
+    emailField.accessibilityIdentifier = "EmailTextField"
+    passwordField.accessibilityIdentifier = "PasswordTextField"
   }
 
   func activateConstrains() {

ios-base/Onboarding/Views/SignUpViewController.swift

@@ -108,6 +108,14 @@ private extension SignUpViewController {
     ])
 
     activateConstrains()
+    setupAccessibility()
+  }
+
+  func setupAccessibility() {
+    signUpButton.accessibilityIdentifier = "SignUpButton"
+    emailField.accessibilityIdentifier = "EmailTextField"
+    passwordField.accessibilityIdentifier = "PasswordTextField"
+    passwordConfirmationField.accessibilityIdentifier = "ConfirmPasswordTextField"
   }
 
   func activateConstrains() {

ios-baseUITests/NetworkMocker+Stubs.swift

@@ -7,6 +7,7 @@
 //
 
 import Foundation
+import RSSwiftNetworking
 
 internal enum NetworkStub {
   case signUp(success: Bool)
@@ -42,15 +43,38 @@ internal enum NetworkStub {
       return success ? "GetProfileSuccessfully" : "GetProfileFailure"
     }
   }
+
+  var headers: [String: String]? {
+    switch self {
+    case .signUp(let success), .signIn(let success):
+      if success {
+        return [
+          HTTPHeader.uid.rawValue: "uid",
+          HTTPHeader.client.rawValue: "client",
+          HTTPHeader.token.rawValue: "accessToken",
+          HTTPHeader.expiry.rawValue: "\(Date.distantFuture.timeIntervalSinceNow)",
+          HTTPHeader.contentType.rawValue: "application/json"
+        ]
+      }
+      return nil
+    default:
+      return nil
+    }
+  }
 }
 
 extension NetworkMocker {
 
-  func stub(with networkStub: NetworkStub, method: HTTPMethod) {
+  func stub(
+    with networkStub: NetworkStub,
+    method: HTTPMethod,
+    customHeaders: [String: String]? = nil
+  ) {
     stub(
       url: networkStub.urlString,
       responseFilename: networkStub.responseFileName,
-      method: method
+      method: method,
+      customHeaders: customHeaders ?? networkStub.headers
     )
   }
 }

ios-baseUITests/NetworkMocker.swift

@@ -32,23 +32,30 @@ internal class NetworkMocker {
   public func stub(
     url: String,
     responseFilename: String,
-    method: HTTPMethod = .GET
+    method: HTTPMethod = .GET,
+    customHeaders: [String: String]? = nil
   ) {
     let testBundle = Bundle(for: type(of: self))
     let filePath = testBundle.path(forResource: responseFilename, ofType: "json") ?? ""
     let fileURL = URL(fileURLWithPath: filePath)
 
     do {
-      let jsonObject = try Data(contentsOf: fileURL, options: .uncached).jsonObject()
-      guard let jsonObject = jsonObject else {
-        XCTFail("A valid JSON couldn't be parsed")
-        return
-      }
+      let data = try Data(contentsOf: fileURL, options: .uncached)
+      let jsonObject = try data.jsonObject()
 
       let response: ((HttpRequest) -> HttpResponse) = { _ in
-        HttpResponse.ok(.json(jsonObject))
+        if let customHeaders = customHeaders {
+          return HttpResponse.raw(200, "OK", customHeaders) { bodyWriter in
+            try bodyWriter.write(data)
+          }
+        }
+        guard let jsonObject = jsonObject else {
+          XCTFail("A valid JSON couldn't be parsed")
+          return .badRequest(.none)
+        }
+        return HttpResponse.ok(.json(jsonObject))
       }
-
+      
       switch method {
       case .GET: server.GET[url] = response
       case .POST: server.POST[url] = response

ios-baseUITests/Resources/StubResponses/GetProfileFailure.json

@@ -1,3 +1,3 @@
 {
-  "user": {}
+  "id": null
 }

ios-baseUITests/Resources/StubResponses/GetProfileSuccessfully.json

@@ -1,9 +1,7 @@
 {
-  "user": {
-    "id": 1,
-    "email": "[email protected]",
-    "first_name": "FirstName",
-    "last_name": "LastName",
-    "username": "test"
-  }
+  "id": 1,
+  "email": "[email protected]",
+  "first_name": "FirstName",
+  "last_name": "LastName",
+  "username": "test"
 }

ios-baseUITests/Resources/StubResponses/LoginSuccessfully.json

@@ -1,13 +1,9 @@
 {
-  "user": {
-    "id": 1,
-    "email": "[email protected]",
-    "provider": "email",
-    "uid": "[email protected]",
-    "first_name": "FirstName",
-    "last_name": "LastName",
-    "username": "test",
-    "created_at": "2017-02-23T13:54:33.283Z",
-    "updated_at": "2017-02-23T13:54:33.425Z"
-  }
+  "id": 1,
+  "email": "[email protected]",
+  "provider": "email",
+  "uid": "[email protected]",
+  "first_name": "FirstName",
+  "last_name": "LastName",
+  "username": "test"
 }

ios-baseUITests/Resources/StubResponses/SignUpSuccessfully.json

@@ -1,13 +1,9 @@
 {
-  "user": {
-    "id": 1,
-    "email": "[email protected]",
-    "provider": "email",
-    "uid": "[email protected]",
-    "first_name": "FirstName",
-    "last_name": "LastName",
-    "username": "test",
-    "created_at": "2017-02-23T13:54:33.283Z",
-    "updated_at": "2017-02-23T13:54:33.425Z"
-  }
+  "id": 1,
+  "email": "[email protected]",
+  "provider": "email",
+  "uid": "[email protected]",
+  "first_name": "FirstName",
+  "last_name": "LastName",
+  "username": "test"
 }

ios-baseUITests/ios_baseUITests.swift

@@ -14,13 +14,13 @@ class ios_baseUITests: XCTestCase {
 
   let networkMocker = NetworkMocker()
 
-  override func setUp() {
-    super.setUp()
+  override func setUpWithError() throws {
+    try super.setUpWithError()
     app = XCUIApplication()
     app.launchArguments = ["Automation Test"]
 
-    try? networkMocker.setUp()
-    networkMocker.stubLogOut()
+    try networkMocker.setUp()
+    networkMocker.stub(with: .logOut, method: .DELETE)
     app.logOutIfNeeded(in: self)
   }
 
@@ -68,15 +68,15 @@ class ios_baseUITests: XCTestCase {
   func testAccountCreation() {
     app.launch()
 
-    networkMocker.stubSignUp()
+    networkMocker.stub(with: .signUp(success: true), method: .POST)
 
     app.attemptSignUp(
       in: self,
       email: "[email protected]",
       password: "holahola"
     )
 
-    networkMocker.stubGetProfile()
+    networkMocker.stub(with: .profile(success: true), method: .GET)
     let getMyProfile = app.buttons["GetMyProfileButton"]
     waitFor(element: getMyProfile, timeOut: 10)
     getMyProfile.tap()
@@ -92,7 +92,7 @@ class ios_baseUITests: XCTestCase {
   func testSignInSuccess() {
     app.launch()
 
-    networkMocker.stubLogIn()
+    networkMocker.stub(with: .signIn(success: true), method: .POST)
 
     app.attemptSignIn(in: self,
                       with: "[email protected]",
@@ -105,7 +105,7 @@ class ios_baseUITests: XCTestCase {
   func testSignInFailure() {
     app.launch()
 
-    networkMocker.stubLogIn(shouldSucceed: false)
+    networkMocker.stub(with: .signIn(success: false), method: .POST)
 
     app.attemptSignIn(in: self,
                       with: "[email protected]",