Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import XCTest

@testable import BitwardenShared
@testable import BitwardenSharedMocks

class IdentityTokenRequestModelTests: BitwardenTestCase {
// MARK: Properties
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import TestHelpers
import XCTest

@testable import BitwardenShared
@testable import BitwardenSharedMocks

class KeyConnectorUserKeyResponseModelTests: BitwardenTestCase {
// MARK: - Tests
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import TestHelpers
import XCTest

@testable import BitwardenShared
@testable import BitwardenSharedMocks

// MARK: - KnownDeviceResponseModelTests

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import TestHelpers
import XCTest

@testable import BitwardenShared
@testable import BitwardenSharedMocks

@MainActor
class AuthRepositoryTests: BitwardenTestCase { // swiftlint:disable:this type_body_length
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import TestHelpers
import XCTest

@testable import BitwardenShared
@testable import BitwardenSharedMocks

class AuthAPIServiceTests: BitwardenTestCase {
// MARK: Properties
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import TestHelpers

extension APITestData {
// swiftlint:disable missing_docs

public extension APITestData {
// MARK: Identity Token

static let authRequestSuccess = loadFromJsonBundle(resource: "AuthRequest")
Expand Down Expand Up @@ -30,3 +32,5 @@ extension APITestData {
resource: "IdentityTokenEncryptionKeyMigrationError",
)
}

// swiftlint:enable missing_docs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import TestHelpers
import XCTest

@testable import BitwardenShared
@testable import BitwardenSharedMocks

class IdentityTokenRequestTests: BitwardenTestCase {
// MARK: Properties
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
import Foundation
import TestHelpers

extension APITestData {
// swiftlint:disable missing_docs

public extension APITestData {
// MARK: Known Device

static let knownDeviceTrue = APITestData(data: Data("true".utf8))
static let knownDeviceFalse = APITestData(data: Data("false".utf8))
}

// swiftlint:enable missing_docs
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
import TestHelpers

extension APITestData {
// swiftlint:disable missing_docs

public extension APITestData {
static let keyConnectorUserKey = loadFromJsonBundle(resource: "KeyConnectorUserKey")
}

// swiftlint:enable missing_docs
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import TestHelpers

extension APITestData {
// swiftlint:disable missing_docs

public extension APITestData {
static let organizationAutoEnrollStatus = loadFromJsonBundle(resource: "OrganizationAutoEnrollStatus")
static let organizationAutoEnrollStatusDisabled = loadFromJsonBundle(
resource: "OrganizationAutoEnrollStatusDisabled",
Expand All @@ -19,3 +21,5 @@ extension APITestData {
resource: "SingleSignOnDomainsVerifiedMultiple",
)
}

// swiftlint:enable missing_docs
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import TestHelpers
import XCTest

@testable import BitwardenShared
@testable import BitwardenSharedMocks

// MARK: - AuthServiceTests

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import TestHelpers
import XCTest

@testable import BitwardenShared
@testable import BitwardenSharedMocks

// MARK: - BiometricsRepositoryTests

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import TestHelpers
import XCTest

@testable import BitwardenShared
@testable import BitwardenSharedMocks

@MainActor
class ChangeKdfServiceTests: BitwardenTestCase {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import BitwardenSdk
import Foundation

@testable import BitwardenShared
@testable import BitwardenSharedMocks

class MockAuthService: AuthService {
var answerLoginRequestApprove: Bool?
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import BitwardenSdk
// MARK: MockTrustDeviceService

@testable import BitwardenShared
@testable import BitwardenSharedMocks

class MockTrustDeviceService: TrustDeviceService {
var getDeviceKeyResult: Result<String, Error> = .success("DEVICE_KEY")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import TestHelpers
import XCTest

@testable import BitwardenShared
@testable import BitwardenSharedMocks

// MARK: - AuthServiceTests

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import BitwardenSdk
import XCTest

@testable import BitwardenShared
@testable import BitwardenSharedMocks

// MARK: - GetAssertionRequest

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import BitwardenSdk
import XCTest

@testable import BitwardenShared
@testable import BitwardenSharedMocks

class ASPasskeyCredentialRequestExtensionsTests: BitwardenTestCase {
// MARK: Tests
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import TestHelpers
import XCTest

@testable import BitwardenShared
@testable import BitwardenSharedMocks

/// The tests for `DefaultAutofillCredentialService` when the app context is `.appExtension`.
/// This new file is needed given that the app context is necesary on `DefaultAutofillCredentialService`
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import TestHelpers
import XCTest

@testable import BitwardenShared
@testable import BitwardenSharedMocks

@MainActor
class AutofillCredentialServiceTests: BitwardenTestCase { // swiftlint:disable:this type_body_length
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,16 @@ class ActionExtensionHelperTests: BitwardenTestCase { // swiftlint:disable:this

var subject: ActionExtensionHelper!

let pageDetailsJsonData = APITestData.loadFromJsonBundle(
resource: "pageDetails",
bundle: .bitwardenSharedMocks,
).data

let pageDetailsWithoutPasswordJsonData = APITestData.loadFromJsonBundle(
resource: "pageDetailsWithoutPassword",
bundle: .bitwardenSharedMocks,
).data

// MARK: Setup & Teardown

override func setUp() {
Expand All @@ -30,7 +40,6 @@ class ActionExtensionHelperTests: BitwardenTestCase { // swiftlint:disable:this
/// `canAutofill` returns true if the provider type is supported and the page details contains a
/// password field.
func test_canAutofill() throws {
let pageDetailsJsonData = APITestData.loadFromJsonBundle(resource: "pageDetails").data
let pageDetailsJson = try XCTUnwrap(String(data: pageDetailsJsonData, encoding: .utf8))

let extensionItem = NSExtensionItem()
Expand Down Expand Up @@ -70,8 +79,7 @@ class ActionExtensionHelperTests: BitwardenTestCase { // swiftlint:disable:this

/// `canAutofill` returns false if the page details doesn't contain a password field.
func test_canAutofill_noPasswordField() throws {
let pageDetailsJsonData = APITestData.loadFromJsonBundle(resource: "pageDetailsWithoutPassword").data
let pageDetailsJson = String(data: pageDetailsJsonData, encoding: .utf8)
let pageDetailsJson = String(data: pageDetailsWithoutPasswordJsonData, encoding: .utf8)

let extensionItem = NSExtensionItem()
extensionItem.attachments = [
Expand Down Expand Up @@ -168,7 +176,6 @@ class ActionExtensionHelperTests: BitwardenTestCase { // swiftlint:disable:this
/// returns the data necessary to autofill the selected cipher on the web page.
func test_processInputItems_findLoginBrowserProvider_dictionary() throws {
// swiftlint:disable:previous function_body_length
let pageDetailsJsonData = APITestData.loadFromJsonBundle(resource: "pageDetails").data
let pageDetailsJson = String(data: pageDetailsJsonData, encoding: .utf8)
let pageDetails = try JSONDecoder().decode(PageDetails.self, from: pageDetailsJsonData)

Expand Down Expand Up @@ -313,7 +320,6 @@ class ActionExtensionHelperTests: BitwardenTestCase { // swiftlint:disable:this
/// `processInputItems(_:)` processes the input items for a web URL provider and returns the
/// data necessary to autofill the selected cipher on the web page.
func test_processInputItems_webUrlProvider() throws { // swiftlint:disable:this function_body_length
let pageDetailsJsonData = APITestData.loadFromJsonBundle(resource: "pageDetails").data
let pageDetailsJson = try XCTUnwrap(String(data: pageDetailsJsonData, encoding: .utf8))

let extensionItem = NSExtensionItem()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import AuthenticationServices
import XCTest

@testable import BitwardenShared
@testable import BitwardenSharedMocks

class CredentialProviderContextTests: BitwardenTestCase { // swiftlint:disable:this type_body_length
// MARK: Tests
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import XCTest

@testable import BitwardenShared
@testable import BitwardenSharedMocks

class AccountEncryptionKeysTests: BitwardenTestCase {
// MARK: Tests
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import XCTest

@testable import BitwardenShared
@testable import BitwardenSharedMocks

class AccountTests: BitwardenTestCase {
// MARK: Tests
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import XCTest

@testable import BitwardenShared
@testable import BitwardenSharedMocks

class StateTests: BitwardenTestCase {
// MARK: Tests
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import TestHelpers
import XCTest

@testable import BitwardenShared
@testable import BitwardenSharedMocks

class SettingsRepositoryTests: BitwardenTestCase {
// MARK: Properties
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import Combine
import Foundation

@testable import BitwardenShared
@testable import BitwardenSharedMocks

class MockSettingsRepository: SettingsRepository {
var addedFolderName: String?
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import TestHelpers
import XCTest

@testable import BitwardenShared
@testable import BitwardenSharedMocks

class AccountTokenProviderTests: BitwardenTestCase {
// MARK: Properties
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import TestHelpers
import XCTest

@testable import BitwardenShared
@testable import BitwardenSharedMocks

class ConfigAPIServiceTests: BitwardenTestCase {
// MARK: Properties
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ import TestHelpers
/// `APITestData` helpers that load the resource from the `BitwardenShared` bundle.
extension APITestData {
static func loadFromBundle(resource: String, extension: String) -> APITestData {
loadFromBundle(resource: resource, extension: `extension`, bundle: .bitwardenShared)
loadFromBundle(resource: resource, extension: `extension`, bundle: .bitwardenSharedMocks)
}

static func loadFromJsonBundle(resource: String) -> APITestData {
loadFromJsonBundle(resource: resource, bundle: .bitwardenShared)
loadFromJsonBundle(resource: resource, bundle: .bitwardenSharedMocks)
}
}

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import Foundation

class BitwardenSharedMocksBundleFinder {
static let bundle = Bundle(for: BitwardenSharedMocksBundleFinder.self)
}

public extension Bundle {
/// The `Bundle` instance for the `BitwardenSharedMocks` target.
static let bitwardenSharedMocks = BitwardenSharedMocksBundleFinder.bundle
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import TestHelpers
import XCTest

@testable import BitwardenShared
@testable import BitwardenSharedMocks

final class AuthenticatorSyncServiceTests: BitwardenTestCase { // swiftlint:disable:this type_body_length
var authBridgeItemService: MockAuthenticatorBridgeItemService!
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import TestHelpers
import XCTest

@testable import BitwardenShared
@testable import BitwardenSharedMocks

// swiftlint:disable file_length

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import BitwardenSdk
import XCTest

@testable import BitwardenShared
@testable import BitwardenSharedMocks

class CryptoClientProtocolExtensionsTests: BitwardenTestCase {
// MARK: Properties
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import BitwardenKitMocks
import XCTest

@testable import BitwardenShared
@testable import BitwardenSharedMocks

class EnvironmentServiceTests: XCTestCase {
// MARK: Properties
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import TestHelpers
import XCTest

@testable import BitwardenShared
@testable import BitwardenSharedMocks

class EventServiceTests: XCTestCase {
// MARK: Properties
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import TestHelpers
import XCTest

@testable import BitwardenShared
@testable import BitwardenSharedMocks

class KeyConnectorServiceTests: BitwardenTestCase { // swiftlint:disable:this type_body_length
// MARK: Properties
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import BitwardenKitMocks
import XCTest

@testable import BitwardenShared
@testable import BitwardenSharedMocks

class MigrationServiceTests: BitwardenTestCase { // swiftlint:disable:this type_body_length
// MARK: Properties
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import TestHelpers
import XCTest

@testable import BitwardenShared
@testable import BitwardenSharedMocks

class NotificationServiceTests: BitwardenTestCase { // swiftlint:disable:this type_body_length
// MARK: Properties
Expand Down
Loading