IOS Sign Up E2E Test #2422
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| // | ||
| // Copyright (c) Microsoft Corporation. | ||
| // All rights reserved. | ||
| // | ||
| // This code is licensed under the MIT License. | ||
| // | ||
| // Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| // of this software and associated documentation files(the "Software"), to deal | ||
| // in the Software without restriction, including without limitation the rights | ||
| // to use, copy, modify, merge, publish, distribute, sublicense, and / or sell | ||
| // copies of the Software, and to permit persons to whom the Software is | ||
| // furnished to do so, subject to the following conditions : | ||
| // | ||
| // The above copyright notice and this permission notice shall be included in | ||
| // all copies or substantial portions of the Software. | ||
| // | ||
| // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| // IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| // FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| // AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||
| // THE SOFTWARE. | ||
|
|
||
|
|
||
| import Foundation | ||
|
|
||
| enum AuthorityURLFormat { | ||
| case tenantSubdomainShortVersion | ||
| case tenantSubdomainLongVersion | ||
| case tenantSubdomainTenantId | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -125,4 +125,130 @@ final class MSALNativeAuthSignInUsernameEndToEndTests: MSALNativeAuthEndToEndBas | |||||
| XCTAssertNotNil(signInVerifyCodeDelegateSpy.result?.idToken) | ||||||
| XCTAssertEqual(signInVerifyCodeDelegateSpy.result?.account.username, username) | ||||||
| } | ||||||
|
|
||||||
| // Sign In - Verify Custom URL Domain - "https://<tenantName>.ciamlogin.com/<tenantName>.onmicrosoft.com" | ||||||
| func test_signInCustomDomain1InSuccess() async throws { | ||||||
|
There was a problem hiding this comment. Can you please include the name of the authority URL format in use instead of a number? Same comment applies for other tests |
||||||
| guard let sut = initialisePublicClientApplication(clientIdType: .code, customAuthorityURLFormat: AuthorityURLFormat.tenantSubdomainLongVersion), let username = retrieveUsernameForSignInCode() else { | ||||||
|
There was a problem hiding this comment. nit: you can avoid specifying the Enum name here :)
Suggested change
|
||||||
| XCTFail("Missing information") | ||||||
| return | ||||||
| } | ||||||
|
|
||||||
| let signInExpectation = expectation(description: "signing in") | ||||||
| let signInDelegateSpy = SignInStartDelegateSpy(expectation: signInExpectation) | ||||||
|
|
||||||
| sut.signIn(username: username, correlationId: correlationId, delegate: signInDelegateSpy) | ||||||
|
|
||||||
| await fulfillment(of: [signInExpectation]) | ||||||
|
|
||||||
| guard signInDelegateSpy.onSignInCodeRequiredCalled else { | ||||||
| XCTFail("onSignInCodeRequired not called") | ||||||
| return | ||||||
| } | ||||||
|
|
||||||
| XCTAssertNotNil(signInDelegateSpy.newStateCodeRequired) | ||||||
| XCTAssertNotNil(signInDelegateSpy.sentTo) | ||||||
|
|
||||||
| // Now submit the code.. | ||||||
|
|
||||||
| guard let code = await retrieveCodeFor(email: username) else { | ||||||
| XCTFail("OTP code could not be retrieved") | ||||||
| return | ||||||
| } | ||||||
|
|
||||||
| let verifyCodeExpectation = expectation(description: "verifying code") | ||||||
| let signInVerifyCodeDelegateSpy = SignInVerifyCodeDelegateSpy(expectation: verifyCodeExpectation) | ||||||
|
|
||||||
| signInDelegateSpy.newStateCodeRequired?.submitCode(code: code, delegate: signInVerifyCodeDelegateSpy) | ||||||
|
|
||||||
| await fulfillment(of: [verifyCodeExpectation]) | ||||||
|
|
||||||
| XCTAssertTrue(signInVerifyCodeDelegateSpy.onSignInCompletedCalled) | ||||||
| XCTAssertNotNil(signInVerifyCodeDelegateSpy.result) | ||||||
| XCTAssertNotNil(signInVerifyCodeDelegateSpy.result?.idToken) | ||||||
| XCTAssertEqual(signInVerifyCodeDelegateSpy.result?.account.username, username) | ||||||
| } | ||||||
|
|
||||||
| // Sign In - Verify Custom URL Domain - "https://<tenantName>.ciamlogin.com/<tenantId>" | ||||||
| func test_signInCustomDomain2InSuccess() async throws { | ||||||
| guard let sut = initialisePublicClientApplication(clientIdType: .code, customAuthorityURLFormat: AuthorityURLFormat.tenantSubdomainTenantId), let username = retrieveUsernameForSignInCode() else { | ||||||
| XCTFail("Missing information") | ||||||
| return | ||||||
| } | ||||||
|
|
||||||
| let signInExpectation = expectation(description: "signing in") | ||||||
| let signInDelegateSpy = SignInStartDelegateSpy(expectation: signInExpectation) | ||||||
|
|
||||||
| sut.signIn(username: username, correlationId: correlationId, delegate: signInDelegateSpy) | ||||||
|
|
||||||
| await fulfillment(of: [signInExpectation]) | ||||||
|
|
||||||
| guard signInDelegateSpy.onSignInCodeRequiredCalled else { | ||||||
| XCTFail("onSignInCodeRequired not called") | ||||||
| return | ||||||
| } | ||||||
|
|
||||||
| XCTAssertNotNil(signInDelegateSpy.newStateCodeRequired) | ||||||
| XCTAssertNotNil(signInDelegateSpy.sentTo) | ||||||
|
|
||||||
| // Now submit the code.. | ||||||
|
|
||||||
| guard let code = await retrieveCodeFor(email: username) else { | ||||||
| XCTFail("OTP code could not be retrieved") | ||||||
| return | ||||||
| } | ||||||
|
|
||||||
| let verifyCodeExpectation = expectation(description: "verifying code") | ||||||
| let signInVerifyCodeDelegateSpy = SignInVerifyCodeDelegateSpy(expectation: verifyCodeExpectation) | ||||||
|
|
||||||
| signInDelegateSpy.newStateCodeRequired?.submitCode(code: code, delegate: signInVerifyCodeDelegateSpy) | ||||||
|
|
||||||
| await fulfillment(of: [verifyCodeExpectation]) | ||||||
|
|
||||||
| XCTAssertTrue(signInVerifyCodeDelegateSpy.onSignInCompletedCalled) | ||||||
| XCTAssertNotNil(signInVerifyCodeDelegateSpy.result) | ||||||
| XCTAssertNotNil(signInVerifyCodeDelegateSpy.result?.idToken) | ||||||
| XCTAssertEqual(signInVerifyCodeDelegateSpy.result?.account.username, username) | ||||||
| } | ||||||
|
|
||||||
| // Sign In - Verify Custom URL Domain - "https://<tenantName>.ciamlogin.com/" | ||||||
| func test_signInCustomDomain3InSuccess() async throws { | ||||||
| guard let sut = initialisePublicClientApplication(clientIdType: .code, customAuthorityURLFormat: AuthorityURLFormat.tenantSubdomainShortVersion), let username = retrieveUsernameForSignInCode() else { | ||||||
| XCTFail("Missing information") | ||||||
| return | ||||||
| } | ||||||
|
|
||||||
| let signInExpectation = expectation(description: "signing in") | ||||||
| let signInDelegateSpy = SignInStartDelegateSpy(expectation: signInExpectation) | ||||||
|
|
||||||
| sut.signIn(username: username, correlationId: correlationId, delegate: signInDelegateSpy) | ||||||
|
|
||||||
| await fulfillment(of: [signInExpectation]) | ||||||
|
|
||||||
| guard signInDelegateSpy.onSignInCodeRequiredCalled else { | ||||||
| XCTFail("onSignInCodeRequired not called") | ||||||
| return | ||||||
| } | ||||||
|
|
||||||
| XCTAssertNotNil(signInDelegateSpy.newStateCodeRequired) | ||||||
| XCTAssertNotNil(signInDelegateSpy.sentTo) | ||||||
|
|
||||||
| // Now submit the code.. | ||||||
|
|
||||||
| guard let code = await retrieveCodeFor(email: username) else { | ||||||
| XCTFail("OTP code could not be retrieved") | ||||||
| return | ||||||
| } | ||||||
|
|
||||||
| let verifyCodeExpectation = expectation(description: "verifying code") | ||||||
| let signInVerifyCodeDelegateSpy = SignInVerifyCodeDelegateSpy(expectation: verifyCodeExpectation) | ||||||
|
|
||||||
| signInDelegateSpy.newStateCodeRequired?.submitCode(code: code, delegate: signInVerifyCodeDelegateSpy) | ||||||
|
|
||||||
| await fulfillment(of: [verifyCodeExpectation]) | ||||||
|
|
||||||
| XCTAssertTrue(signInVerifyCodeDelegateSpy.onSignInCompletedCalled) | ||||||
| XCTAssertNotNil(signInVerifyCodeDelegateSpy.result) | ||||||
| XCTAssertNotNil(signInVerifyCodeDelegateSpy.result?.idToken) | ||||||
| XCTAssertEqual(signInVerifyCodeDelegateSpy.result?.account.username, username) | ||||||
| } | ||||||
| } | ||||||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This pull request does not update CHANGELOG.md.
Please consider if this change would be noticeable to a partner or user and either update CHANGELOG.md or resolve this conversation.