Skip to content

Commit 0d7d5ba

Browse files
committed
Move Account.mock to its own file for consistency
1 parent 1f47dc7 commit 0d7d5ba

File tree

3 files changed

+24
-11
lines changed

3 files changed

+24
-11
lines changed

ios/MullvadVPN.xcodeproj/project.pbxproj

+4
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
449872E12B7BBC5400094DDC /* TunnelSettingsUpdate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 449872E02B7BBC5400094DDC /* TunnelSettingsUpdate.swift */; };
4444
449872E42B7CB96300094DDC /* TunnelSettingsUpdateTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 449872E32B7CB96300094DDC /* TunnelSettingsUpdateTests.swift */; };
4545
449EB9FD2B95F8AD00DFA4EB /* DeviceMock.swift in Sources */ = {isa = PBXBuildFile; fileRef = 449EB9FC2B95F8AD00DFA4EB /* DeviceMock.swift */; };
46+
449EB9FF2B95FF2500DFA4EB /* AccountMock.swift in Sources */ = {isa = PBXBuildFile; fileRef = 449EB9FE2B95FF2500DFA4EB /* AccountMock.swift */; };
4647
44DD7D242B6CFFD70005F67F /* StartTunnelOperationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 44DD7D232B6CFFD70005F67F /* StartTunnelOperationTests.swift */; };
4748
44DD7D272B6D18FB0005F67F /* MockTunnelInteractor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 44DD7D262B6D18FB0005F67F /* MockTunnelInteractor.swift */; };
4849
44DD7D292B7113CA0005F67F /* MockTunnel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 44DD7D282B7113CA0005F67F /* MockTunnel.swift */; };
@@ -1289,6 +1290,7 @@
12891290
449872E02B7BBC5400094DDC /* TunnelSettingsUpdate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TunnelSettingsUpdate.swift; sourceTree = "<group>"; };
12901291
449872E32B7CB96300094DDC /* TunnelSettingsUpdateTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TunnelSettingsUpdateTests.swift; sourceTree = "<group>"; };
12911292
449EB9FC2B95F8AD00DFA4EB /* DeviceMock.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DeviceMock.swift; sourceTree = "<group>"; };
1293+
449EB9FE2B95FF2500DFA4EB /* AccountMock.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountMock.swift; sourceTree = "<group>"; };
12921294
44DD7D232B6CFFD70005F67F /* StartTunnelOperationTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StartTunnelOperationTests.swift; sourceTree = "<group>"; };
12931295
44DD7D262B6D18FB0005F67F /* MockTunnelInteractor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockTunnelInteractor.swift; sourceTree = "<group>"; };
12941296
44DD7D282B7113CA0005F67F /* MockTunnel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockTunnel.swift; sourceTree = "<group>"; };
@@ -2194,6 +2196,7 @@
21942196
44DD7D252B6D18E90005F67F /* Mocks */ = {
21952197
isa = PBXGroup;
21962198
children = (
2199+
449EB9FE2B95FF2500DFA4EB /* AccountMock.swift */,
21972200
449EB9FC2B95F8AD00DFA4EB /* DeviceMock.swift */,
21982201
44DD7D282B7113CA0005F67F /* MockTunnel.swift */,
21992202
44DD7D262B6D18FB0005F67F /* MockTunnelInteractor.swift */,
@@ -4841,6 +4844,7 @@
48414844
A9A5FA2F2ACB05160083449F /* FixedWidthIntegerArithmeticsTests.swift in Sources */,
48424845
A9A5FA302ACB05160083449F /* InputTextFormatterTests.swift in Sources */,
48434846
F0B0E6972AFE6E7E001DC66B /* XCTest+Async.swift in Sources */,
4847+
449EB9FF2B95FF2500DFA4EB /* AccountMock.swift in Sources */,
48444848
7ADCB2DA2B6A730400C88F89 /* IPOverrideRepositoryStub.swift in Sources */,
48454849
A9A5FA312ACB05160083449F /* MockFileCache.swift in Sources */,
48464850
A9A5FA322ACB05160083449F /* RelayCacheTests.swift in Sources */,

ios/MullvadVPNTests/DeviceCheckOperationTests.swift

-11
Original file line numberDiff line numberDiff line change
@@ -526,17 +526,6 @@ private extension StoredDeviceData {
526526
}
527527
}
528528

529-
private extension Account {
530-
static func mock(expiry: Date = .distantFuture) -> Account {
531-
Account(
532-
id: "account-id",
533-
expiry: expiry,
534-
maxDevices: 5,
535-
canAddDevices: true
536-
)
537-
}
538-
}
539-
540529
private extension KeyRotationStatus {
541530
/// Returns `true` if key rotation status is `.attempted`.
542531
var isAttempted: Bool {
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
//
2+
// AccountMock.swift
3+
// MullvadVPNTests
4+
//
5+
// Created by Andrew Bulhak on 2024-03-04.
6+
// Copyright © 2024 Mullvad VPN AB. All rights reserved.
7+
//
8+
9+
import MullvadTypes
10+
11+
extension Account {
12+
static func mock(expiry: Date = .distantFuture) -> Account {
13+
Account(
14+
id: "account-id",
15+
expiry: expiry,
16+
maxDevices: 5,
17+
canAddDevices: true
18+
)
19+
}
20+
}

0 commit comments

Comments
 (0)