Fix TVDB Tests

pietrocaselani · Mar 25, 2020 · af59e23 · af59e23
1 parent 5b884a0
commit af59e23
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 5 deletions.
diff --git a/CouchTrackerApp/Environment.swift b/CouchTrackerApp/Environment.swift
@@ -145,6 +145,8 @@ public final class Environment {
   }
 
   private static func checkForEmptySecrets() {
+    guard NSClassFromString("XCTestCase") == nil else { return }
+
     let traktClientId = Secrets.Trakt.clientId.isEmpty
     let tmdbAPIKey = Secrets.TMDB.apiKey.isEmpty
     let tvdbAPIKey = Secrets.TVDB.apiKey.isEmpty

diff --git a/TVDBSwift/TVDBTokenRequestInterceptor.swift b/TVDBSwift/TVDBTokenRequestInterceptor.swift
@@ -28,7 +28,7 @@ final class TVDBTokenRequestInterceptor: RequestInterceptor {
       if tvdb.hasValidToken {
         done(.success(request))
       } else {
-        doLogin(target, tvdb, request, endpoint, done)
+        refreshToken(target, tvdb, request, endpoint, done)
       }
     }
   }
@@ -41,6 +41,14 @@ final class TVDBTokenRequestInterceptor: RequestInterceptor {
     requestToken(tvdb, Authentication.login(apiKey: tvdb.apiKey), request, target, done)
   }
 
+  private func refreshToken<T: TVDBType>(_ target: T.Type,
+                                         _ tvdb: TVDB,
+                                         _ request: URLRequest,
+                                         _: Endpoint,
+                                         _ done: @escaping MoyaProvider<T>.RequestResultClosure) {
+    requestToken(tvdb, Authentication.refreshToken, request, target, done)
+  }
+
   private func requestToken<T: TVDBType>(_ tvdb: TVDB,
                                          _ target: Authentication,
                                          _ request: URLRequest,

diff --git a/TVDBSwiftTests/TVDBTests.swift b/TVDBSwiftTests/TVDBTests.swift
@@ -57,7 +57,7 @@ final class TVDBTests: XCTestCase {
         // Then
         responseExpectation.fulfill()
         let requestToken = response.request?.allHTTPHeaderFields!["Authorization"]
-        XCTAssertNotNil(requestToken)
+        XCTAssertEqual(requestToken, "Bearer cooltoken!")
 
         guard let episode = try? response.map(EpisodeResponse.self).episode else {
           XCTFail("Could not decode JSON")

diff --git a/TVDBSwiftTests/TVDBTokenRequestInterceptorTests.swift b/TVDBSwiftTests/TVDBTokenRequestInterceptorTests.swift
@@ -36,7 +36,6 @@ final class TVDBTokenRequestInterceptorTests: XCTestCase {
     interceptor.intercept(target: Episodes.self, endpoint: endpoint) { _ in
       // Then
       resultExpectation.fulfill()
-      XCTAssertNotNil(self.tvdb.token)
       XCTAssertEqual(self.tvdb.token, "cooltoken!")
     }
 
@@ -73,8 +72,7 @@ final class TVDBTokenRequestInterceptorTests: XCTestCase {
     interceptor.intercept(target: Episodes.self, endpoint: endpoint) { _ in
       // Then
       resultExpectation.fulfill()
-      XCTAssertNotNil(self.tvdb.token)
-      XCTAssertEqual(self.tvdb.token, "cooltoken!")
+      XCTAssertEqual(self.tvdb.token, "cool_new_token!")
     }
 
     wait(for: [resultExpectation], timeout: 1)