From dfe7f661afcfd15949ce73eb04a7648db551ed8a Mon Sep 17 00:00:00 2001 From: Allison Moyer Date: Mon, 7 Jun 2021 06:52:57 -1000 Subject: [PATCH 1/2] Fix failing tests --- .../SinglePromptSecureEnclaveIntegrationTests.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tests/ValetIntegrationTests/SinglePromptSecureEnclaveIntegrationTests.swift b/Tests/ValetIntegrationTests/SinglePromptSecureEnclaveIntegrationTests.swift index 79844b4a..51581c1a 100644 --- a/Tests/ValetIntegrationTests/SinglePromptSecureEnclaveIntegrationTests.swift +++ b/Tests/ValetIntegrationTests/SinglePromptSecureEnclaveIntegrationTests.swift @@ -75,7 +75,7 @@ class SinglePromptSecureEnclaveIntegrationTests: XCTestCase } try valet().setString(passcode, forKey: key) - let equivalentValet = SecureEnclaveValet.valet(with: valet().identifier, accessControl: .devicePasscode) + let equivalentValet = SinglePromptSecureEnclaveValet.valet(with: valet().identifier, accessControl: .devicePasscode) XCTAssertNotEqual(valet(), equivalentValet) XCTAssertEqual(passcode, try valet().string(forKey: key, withPrompt: "")) XCTAssertThrowsError(try equivalentValet.string(forKey: key, withPrompt: "")) { error in From 552a4219b6475e228d9269f9fc26c55bf6d323d9 Mon Sep 17 00:00:00 2001 From: Allison Moyer Date: Mon, 7 Jun 2021 09:21:30 -1000 Subject: [PATCH 2/2] Update test variables from equivalentValet -> similarValet --- .../SecureEnclaveIntegrationTests.swift | 6 +++--- .../SinglePromptSecureEnclaveIntegrationTests.swift | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Tests/ValetIntegrationTests/SecureEnclaveIntegrationTests.swift b/Tests/ValetIntegrationTests/SecureEnclaveIntegrationTests.swift index 8942c3ac..43df0c37 100644 --- a/Tests/ValetIntegrationTests/SecureEnclaveIntegrationTests.swift +++ b/Tests/ValetIntegrationTests/SecureEnclaveIntegrationTests.swift @@ -62,10 +62,10 @@ class SecureEnclaveIntegrationTests: XCTestCase } try valet.setString(passcode, forKey: key) - let equivalentValet = SecureEnclaveValet.valet(with: valet.identifier, accessControl: .devicePasscode) - XCTAssertNotEqual(valet, equivalentValet) + let similarValet = SecureEnclaveValet.valet(with: valet.identifier, accessControl: .devicePasscode) + XCTAssertNotEqual(valet, similarValet) XCTAssertEqual(passcode, try valet.string(forKey: key, withPrompt: "")) - XCTAssertThrowsError(try equivalentValet.string(forKey: key, withPrompt: "")) { error in + XCTAssertThrowsError(try similarValet.string(forKey: key, withPrompt: "")) { error in XCTAssertEqual(error as? KeychainError, .itemNotFound) } } diff --git a/Tests/ValetIntegrationTests/SinglePromptSecureEnclaveIntegrationTests.swift b/Tests/ValetIntegrationTests/SinglePromptSecureEnclaveIntegrationTests.swift index 51581c1a..e3ee56e7 100644 --- a/Tests/ValetIntegrationTests/SinglePromptSecureEnclaveIntegrationTests.swift +++ b/Tests/ValetIntegrationTests/SinglePromptSecureEnclaveIntegrationTests.swift @@ -75,10 +75,10 @@ class SinglePromptSecureEnclaveIntegrationTests: XCTestCase } try valet().setString(passcode, forKey: key) - let equivalentValet = SinglePromptSecureEnclaveValet.valet(with: valet().identifier, accessControl: .devicePasscode) - XCTAssertNotEqual(valet(), equivalentValet) + let similarValet = SinglePromptSecureEnclaveValet.valet(with: valet().identifier, accessControl: .devicePasscode) + XCTAssertNotEqual(valet(), similarValet) XCTAssertEqual(passcode, try valet().string(forKey: key, withPrompt: "")) - XCTAssertThrowsError(try equivalentValet.string(forKey: key, withPrompt: "")) { error in + XCTAssertThrowsError(try similarValet.string(forKey: key, withPrompt: "")) { error in XCTAssertEqual(error as? KeychainError, .itemNotFound) } }