Fix tests

configcat · May 3, 2018 · 9217a54 · 9217a54
1 parent 861ad68
commit 9217a54
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 20 deletions.
diff --git a/Tests/AutoPollingTests.swift b/Tests/AutoPollingTests.swift
@@ -8,7 +8,7 @@ class AutoPollingTests: XCTestCase {
         mockSession.enqueueResponse(response: Response(body: "test", statusCode: 200))
         mockSession.enqueueResponse(response: Response(body: "test2", statusCode: 200))
 
-        let fetcher = ConfigFetcher(session: mockSession, projectSecret: "")
+        let fetcher = ConfigFetcher(session: mockSession, apiKey: "")
         let policy = AutoPollingPolicy(cache: InMemoryConfigCache(), fetcher: fetcher, autoPollIntervalInSeconds: 2)
 
         sleep(1)
@@ -25,7 +25,7 @@ class AutoPollingTests: XCTestCase {
         mockSession.enqueueResponse(response: Response(body: "test", statusCode: 200))
         mockSession.enqueueResponse(response: Response(body: "test2", statusCode: 500))
 
-        let fetcher = ConfigFetcher(session: mockSession, projectSecret: "")
+        let fetcher = ConfigFetcher(session: mockSession, apiKey: "")
         let policy = AutoPollingPolicy(cache: InMemoryConfigCache(), fetcher: fetcher, autoPollIntervalInSeconds: 2)
 
         sleep(1)
@@ -42,7 +42,7 @@ class AutoPollingTests: XCTestCase {
         mockSession.enqueueResponse(response: Response(body: "test", statusCode: 200))
         mockSession.enqueueResponse(response: Response(body: "test2", statusCode: 200))
 
-        let fetcher = ConfigFetcher(session: mockSession, projectSecret: "")
+        let fetcher = ConfigFetcher(session: mockSession, apiKey: "")
         let policy = AutoPollingPolicy(cache: FailingCache(), fetcher: fetcher, autoPollIntervalInSeconds: 2)
 
         sleep(1)
@@ -60,7 +60,7 @@ class AutoPollingTests: XCTestCase {
         mockSession.enqueueResponse(response: Response(body: "test2", statusCode: 200))
 
         var newConfig = ""
-        let fetcher = ConfigFetcher(session: mockSession, projectSecret: "")
+        let fetcher = ConfigFetcher(session: mockSession, apiKey: "")
         let policy = AutoPollingPolicy(cache: InMemoryConfigCache(), fetcher: fetcher, autoPollIntervalInSeconds: 2,
         onConfigChanged: { (config, parser) in
             newConfig = config

diff --git a/Tests/ConfigCatClientTests.swift b/Tests/ConfigCatClientTests.swift
@@ -125,9 +125,9 @@ class ConfigCatClientTests: XCTestCase {
     func testForceRefresh() {
         mockSession.enqueueResponse(response: Response(body: "{ \"fakeKey\":\"test\" }", statusCode: 200))
         mockSession.enqueueResponse(response: Response(body: "{ \"fakeKey\":\"test2\" }", statusCode: 200))
-        let fetcher = ConfigFetcher(session: self.mockSession, projectSecret: "")
+        let fetcher = ConfigFetcher(session: self.mockSession, apiKey: "")
         let policy = ExpiringCachePolicy(cache: InMemoryConfigCache(), fetcher: fetcher, cacheRefreshIntervalInSeconds: 120, useAsyncRefresh: false)
-        let client = ConfigCatClient(projectSecret: "test", policyFactory: { (cache, fetcher) -> RefreshPolicy in
+        let client = ConfigCatClient(apiKey: "test", policyFactory: { (cache, fetcher) -> RefreshPolicy in
             policy
         })
 
@@ -139,9 +139,9 @@ class ConfigCatClientTests: XCTestCase {
     }
 
     private func createClient() -> ConfigCatClient {
-        let fetcher = ConfigFetcher(session: self.mockSession, projectSecret: "")
+        let fetcher = ConfigFetcher(session: self.mockSession, apiKey: "")
         let policy = ManualPollingPolicy(cache: InMemoryConfigCache(), fetcher: fetcher)
-        return ConfigCatClient(projectSecret: "test", policyFactory: { (cache, fetcher) -> RefreshPolicy in
+        return ConfigCatClient(apiKey: "test", policyFactory: { (cache, fetcher) -> RefreshPolicy in
             policy
         })
     }

diff --git a/Tests/ConfigFetcherTests.swift b/Tests/ConfigFetcherTests.swift
@@ -8,15 +8,15 @@ class ConfigFetcherTests: XCTestCase {
         let mockSession = MockURLSession()
         mockSession.enqueueResponse(response: Response(body: testBody, statusCode: 200))
 
-        let fetcher = ConfigFetcher(session: mockSession, projectSecret: "")
+        let fetcher = ConfigFetcher(session: mockSession, apiKey: "")
         XCTAssertEqual(testBody, try fetcher.getConfigurationJson().get().body)
     }
 
     func testSimpleFetchNotModified() throws {
         let mockSession = MockURLSession()
         mockSession.enqueueResponse(response: Response(body: "", statusCode: 304))
 
-        let fetcher = ConfigFetcher(session: mockSession, projectSecret: "")
+        let fetcher = ConfigFetcher(session: mockSession, apiKey: "")
         let response = try fetcher.getConfigurationJson().get()
         XCTAssertTrue(response.isNotModified())
         XCTAssertTrue(response.body.isEmpty)
@@ -26,7 +26,7 @@ class ConfigFetcherTests: XCTestCase {
         let mockSession = MockURLSession()
         mockSession.enqueueResponse(response: Response(body: "", statusCode: 404))
 
-        let fetcher = ConfigFetcher(session: mockSession, projectSecret: "")
+        let fetcher = ConfigFetcher(session: mockSession, apiKey: "")
         let response = try fetcher.getConfigurationJson().get()
         XCTAssertTrue(response.isFailed())
         XCTAssertTrue(response.body.isEmpty)
@@ -38,7 +38,7 @@ class ConfigFetcherTests: XCTestCase {
         mockSession.enqueueResponse(response: Response(body: "", statusCode: 200, headers: ["Etag": etag]))
         mockSession.enqueueResponse(response: Response(body: "", statusCode: 304))
 
-        let fetcher = ConfigFetcher(session: mockSession, projectSecret: "")
+        let fetcher = ConfigFetcher(session: mockSession, apiKey: "")
         var response = try fetcher.getConfigurationJson().get()
         XCTAssertTrue(response.isFetched())
         response = try fetcher.getConfigurationJson().get()

diff --git a/Tests/ExpiringCacheAsyncTests.swift b/Tests/ExpiringCacheAsyncTests.swift
@@ -8,7 +8,7 @@ class ExpiringCacheAsyncTests: XCTestCase {
         mockSession.enqueueResponse(response: Response(body: "test", statusCode: 200))
         mockSession.enqueueResponse(response: Response(body: "test2", statusCode: 200, delay: 2))
 
-        let fetcher = ConfigFetcher(session: mockSession, projectSecret: "")
+        let fetcher = ConfigFetcher(session: mockSession, apiKey: "")
         let policy = ExpiringCachePolicy(cache: InMemoryConfigCache(), fetcher: fetcher, cacheRefreshIntervalInSeconds: 5, useAsyncRefresh: true)
 
         XCTAssertEqual("test", try policy.getConfiguration().get())
@@ -32,7 +32,7 @@ class ExpiringCacheAsyncTests: XCTestCase {
         mockSession.enqueueResponse(response: Response(body: "test", statusCode: 200))
         mockSession.enqueueResponse(response: Response(body: "test2", statusCode: 500))
 
-        let fetcher = ConfigFetcher(session: mockSession, projectSecret: "")
+        let fetcher = ConfigFetcher(session: mockSession, apiKey: "")
         let policy = ExpiringCachePolicy(cache: InMemoryConfigCache(), fetcher: fetcher, cacheRefreshIntervalInSeconds: 5, useAsyncRefresh: true)
 
         XCTAssertEqual("test", try policy.getConfiguration().get())

diff --git a/Tests/ExpiringCacheSyncTests.swift b/Tests/ExpiringCacheSyncTests.swift
@@ -8,7 +8,7 @@ class ExpiringCacheSyncTests: XCTestCase {
         mockSession.enqueueResponse(response: Response(body: "test", statusCode: 200))
         mockSession.enqueueResponse(response: Response(body: "test2", statusCode: 200, delay: 2))
 
-        let fetcher = ConfigFetcher(session: mockSession, projectSecret: "")
+        let fetcher = ConfigFetcher(session: mockSession, apiKey: "")
         let policy = ExpiringCachePolicy(cache: InMemoryConfigCache(), fetcher: fetcher, cacheRefreshIntervalInSeconds: 2, useAsyncRefresh: false)
 
         XCTAssertEqual("test", try policy.getConfiguration().get())
@@ -26,7 +26,7 @@ class ExpiringCacheSyncTests: XCTestCase {
         mockSession.enqueueResponse(response: Response(body: "test", statusCode: 200))
         mockSession.enqueueResponse(response: Response(body: "test2", statusCode: 500))
 
-        let fetcher = ConfigFetcher(session: mockSession, projectSecret: "")
+        let fetcher = ConfigFetcher(session: mockSession, apiKey: "")
         let policy = ExpiringCachePolicy(cache: InMemoryConfigCache(), fetcher: fetcher, cacheRefreshIntervalInSeconds: 2, useAsyncRefresh: false)
 
         XCTAssertEqual("test", try policy.getConfiguration().get())
@@ -44,7 +44,7 @@ class ExpiringCacheSyncTests: XCTestCase {
         mockSession.enqueueResponse(response: Response(body: "test", statusCode: 200))
         mockSession.enqueueResponse(response: Response(body: "test2", statusCode: 200))
 
-        let fetcher = ConfigFetcher(session: mockSession, projectSecret: "")
+        let fetcher = ConfigFetcher(session: mockSession, apiKey: "")
         let policy = ExpiringCachePolicy(cache: FailingCache(), fetcher: fetcher, cacheRefreshIntervalInSeconds: 2, useAsyncRefresh: false)
 
         XCTAssertEqual("test", try policy.getConfiguration().get())

diff --git a/Tests/ManualPollingTests.swift b/Tests/ManualPollingTests.swift
@@ -8,7 +8,7 @@ class ManualPollingTests: XCTestCase {
         mockSession.enqueueResponse(response: Response(body: "test", statusCode: 200))
         mockSession.enqueueResponse(response: Response(body: "test2", statusCode: 200, delay: 2))
 
-        let fetcher = ConfigFetcher(session: mockSession, projectSecret: "")
+        let fetcher = ConfigFetcher(session: mockSession, apiKey: "")
         let policy = ManualPollingPolicy(cache: InMemoryConfigCache(), fetcher: fetcher)
 
         XCTAssertEqual("test", try policy.getConfiguration().get())
@@ -20,7 +20,7 @@ class ManualPollingTests: XCTestCase {
         mockSession.enqueueResponse(response: Response(body: "test", statusCode: 200))
         mockSession.enqueueResponse(response: Response(body: "test2", statusCode: 500))
 
-        let fetcher = ConfigFetcher(session: mockSession, projectSecret: "")
+        let fetcher = ConfigFetcher(session: mockSession, apiKey: "")
         let policy = ManualPollingPolicy(cache: InMemoryConfigCache(), fetcher: fetcher)
 
         XCTAssertEqual("test", try policy.getConfiguration().get())
@@ -32,7 +32,7 @@ class ManualPollingTests: XCTestCase {
         mockSession.enqueueResponse(response: Response(body: "test", statusCode: 200))
         mockSession.enqueueResponse(response: Response(body: "test2", statusCode: 200))
 
-        let fetcher = ConfigFetcher(session: mockSession, projectSecret: "")
+        let fetcher = ConfigFetcher(session: mockSession, apiKey: "")
         let policy = ManualPollingPolicy(cache: FailingCache(), fetcher: fetcher)
 
         XCTAssertEqual("test", try policy.getConfiguration().get())