-
Notifications
You must be signed in to change notification settings - Fork 1.2k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[Payment Methods] Support optional card type and error handling for payment methods #596
Merged
Merged
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
eafac2e
Optional card type, payment methods load error
ifbarrera ecc13d2
Merge branch 'feature-payment-methods' of https://github.com/kickstar…
ifbarrera 3d5b941
Merge branch 'feature-payment-methods' of https://github.com/kickstar…
ifbarrera 39f9ce0
Optional support for imageName
ifbarrera d3fb550
Fix accessibility label
ifbarrera 3c7e257
Fix merge conflict spacing
ifbarrera 78c3cc0
Swiftlint
ifbarrera 37d5b37
Implementing PR suggestions
ifbarrera File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
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
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,107 @@ | ||
| import XCTest | ||
| @testable import KsApi | ||
|
|
||
| final class GraphUserCreditCardTests: XCTestCase { | ||
|
|
||
| func testCreditCardsDecoding_noCards() { | ||
| let jsonString = """ | ||
| { | ||
| "storedCards": { | ||
| "nodes": [], | ||
| "totalCount": 0 | ||
| } | ||
| } | ||
| """ | ||
| let data = jsonString.data(using: .utf8) | ||
|
|
||
| do { | ||
| //swiftlint:disable force_unwrapping | ||
| let cards = try JSONDecoder().decode(GraphUserCreditCard.self, from: data!) | ||
|
|
||
| XCTAssertEqual(cards.storedCards.nodes.count, 0) | ||
| } catch { | ||
| XCTFail("Failed to decode GraphUserCreditCard") | ||
| } | ||
| } | ||
|
|
||
| func testCreditCardsDecoding_hasCards() { | ||
| let jsonString = """ | ||
| { | ||
| "storedCards": { | ||
| "nodes": [ | ||
| { | ||
| "expirationDate": "2023-02-01", | ||
| "lastFour": "4242", | ||
| "id": "3021", | ||
| "type": "VISA" | ||
| }, | ||
| { | ||
| "expirationDate": "2020-02-01", | ||
| "lastFour": "1111", | ||
| "id": "2768", | ||
| "type": "VISA" | ||
| } | ||
| ], | ||
| "totalCount": 0 | ||
| } | ||
| } | ||
| """ | ||
|
|
||
| let data = jsonString.data(using: .utf8) | ||
|
|
||
| do { | ||
| //swiftlint:disable force_unwrapping | ||
| let cards = try JSONDecoder().decode(GraphUserCreditCard.self, from: data!) | ||
|
|
||
| XCTAssertEqual(cards.storedCards.nodes.count, 2) | ||
|
|
||
| guard let firstCard = cards.storedCards.nodes.first else { | ||
| XCTFail("Failed to decode GraphUserCreditCard") | ||
| return | ||
| } | ||
|
|
||
| XCTAssertEqual(firstCard.type, GraphUserCreditCard.CreditCardType.visa) | ||
| XCTAssertEqual(firstCard.lastFour, "4242") | ||
| XCTAssertEqual(firstCard.expirationDate, "2023-02-01") | ||
| XCTAssertEqual(firstCard.id, "3021") | ||
| } catch { | ||
| XCTFail("Failed to decode GraphUserCreditCard") | ||
| } | ||
| } | ||
|
|
||
| func testCreditCardsDecoding_unknownCard() { | ||
| let jsonString = """ | ||
| { | ||
| "storedCards": { | ||
| "nodes": [ | ||
| { | ||
| "expirationDate": "2020-02-01", | ||
| "lastFour": "1111", | ||
| "id": "2768", | ||
| } | ||
| ], | ||
| "totalCount": 0 | ||
| } | ||
| } | ||
| """ | ||
|
|
||
| let data = jsonString.data(using: .utf8) | ||
|
|
||
| do { | ||
| //swiftlint:disable force_unwrapping | ||
| let cards = try JSONDecoder().decode(GraphUserCreditCard.self, from: data!) | ||
|
|
||
| guard let card = cards.storedCards.nodes.first else { | ||
| XCTFail("Failed to decode GraphUserCreditCard") | ||
| return | ||
| } | ||
|
|
||
| XCTAssertNil(card.type) | ||
| XCTAssertEqual(card.lastFour, "1111") | ||
| XCTAssertEqual(card.expirationDate, "2020-02-01") | ||
| XCTAssertEqual(card.id, "2768") | ||
| } catch { | ||
| XCTFail("Failed to decode GraphUserCreditCard") | ||
| } | ||
| } | ||
| } |
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
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
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.
Are you getting a Swiftlint warning here? Is this by any chance a newer version of Swiftlint than what we're using (I think we hardcoded the build script to use
0.29.2).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.
I'm not, but that's because swiftlint is currently broken 😬 once its fixed, this line is needed