Skip to content

Commit 4ee870a

Browse files
Fix crash in Auth when running unit tests (#4)
1 parent 9a25ebf commit 4ee870a

File tree

2 files changed

+26
-12
lines changed

2 files changed

+26
-12
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,3 +106,4 @@ scripts
106106

107107
#xcodebuild log
108108
xcodebuild.log
109+

Tests/Unit/InstanceTests.swift

Lines changed: 25 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,26 @@ import XCTest
1919

2020
@available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *)
2121
class InstanceTests: XCTestCase {
22-
var defaultApp: FirebaseApp?
23-
var appTwo: FirebaseApp?
22+
static var defaultApp: FirebaseApp?
23+
static var appTwo: FirebaseApp?
24+
25+
static var options: FirebaseOptions = {
26+
let options = FirebaseOptions(googleAppID: "0:0000000000000:ios:0000000000000000",
27+
gcmSenderID: "00000000000000000-00000000000-000000000")
28+
options.projectID = "fdc-test"
29+
options.apiKey = "testDummyApiKey"
30+
return options
31+
}()
32+
33+
static var optionsTwo: FirebaseOptions = {
34+
let optionsTwo = FirebaseOptions(
35+
googleAppID: "0:0000000000001:ios:0000000000000001",
36+
gcmSenderID: "00000000000000000-00000000000-000000001"
37+
)
38+
optionsTwo.projectID = "fdc-test"
39+
optionsTwo.apiKey = "testDummyApiKey2"
40+
return optionsTwo
41+
}()
2442

2543
var fakeConnectorConfigOne = ConnectorConfig(
2644
serviceId: "dataconnect",
@@ -33,18 +51,10 @@ class InstanceTests: XCTestCase {
3351
connector: "blogs"
3452
)
3553

36-
override func setUp() {
37-
let options = FirebaseOptions(googleAppID: "0:0000000000000:ios:0000000000000000",
38-
gcmSenderID: "00000000000000000-00000000000-000000000")
39-
options.projectID = "fdc-test"
54+
override class func setUp() {
4055
FirebaseApp.configure(options: options)
4156
defaultApp = FirebaseApp.app()
4257

43-
let optionsTwo = FirebaseOptions(
44-
googleAppID: "0:0000000000001:ios:0000000000000001",
45-
gcmSenderID: "00000000000000000-00000000000-000000001"
46-
)
47-
optionsTwo.projectID = "fdc-test"
4858
FirebaseApp.configure(name: "app-two", options: optionsTwo)
4959
appTwo = FirebaseApp.app(name: "app-two")
5060
}
@@ -62,7 +72,10 @@ class InstanceTests: XCTestCase {
6272
// same connector config, different apps, instances should be different
6373
func testDifferentInstanceDifferentApps() throws {
6474
let dcOne = DataConnect.dataConnect(connectorConfig: fakeConnectorConfigOne)
65-
let dcTwo = DataConnect.dataConnect(app: appTwo, connectorConfig: fakeConnectorConfigTwo)
75+
let dcTwo = DataConnect.dataConnect(
76+
app: InstanceTests.appTwo,
77+
connectorConfig: fakeConnectorConfigTwo
78+
)
6679

6780
let isDifferent = dcOne !== dcTwo
6881
XCTAssertTrue(isDifferent)

0 commit comments

Comments
 (0)