Skip to content
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.

Sign up for GitHub

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

cleanup test jsons #4647

Draft
wants to merge 6 commits into
base: master
Choose a base branch
from
Draft

cleanup test jsons #4647

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e565bd6
centralized test jsons
joyceqin-stripe Mar 10, 2025
e73b929
merge master
joyceqin-stripe Mar 10, 2025
41c7cdf
revert forced throw
joyceqin-stripe Mar 10, 2025
29248c4
non optional
joyceqin-stripe Mar 10, 2025
f77ec98
remove space
joyceqin-stripe Mar 10, 2025
8d1994c
Merge branch 'master' into joyceqin/cleanup-test-jsons
joyceqin-stripe Mar 10, 2025
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
36 changes: 1 addition & 35 deletions ...pePaymentSheet/StripePaymentSheetTests/PaymentSheet/PaymentSheetAnalyticsHelperTest.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,45 +149,11 @@ final class PaymentSheetAnalyticsHelperTest: XCTestCase {
// Reset the analytics client for each iteration
analyticsClient._testLogHistory.removeAll()

let testCardJSON = [
"id": "pm_123card",
"type": "card",
"card": [
"last4": "4242",
"brand": "visa",
"fingerprint": "B8XXs2y2JsVBtB9f",
"networks": ["available": ["visa"]],
"exp_month": "01",
"exp_year": "2040",
],
] as [AnyHashable: Any]
let testUSBankAccountJSON = [
"id": "pm_123bank",
"type": "us_bank_account",
"us_bank_account": [
"account_holder_type": "individual",
"account_type": "checking",
"bank_name": "STRIPE TEST BANK",
"fingerprint": "ickfX9sbxIyAlbuh",
"last4": "6789",
"networks": [
"preferred": "ach",
"supported": [
"ach",
],
] as [String: Any],
"routing_number": "110000000",
] as [String: Any],
"billing_details": [
"name": "Sam Stripe",
"email": "[email protected]",
] as [String: Any],
] as [AnyHashable: Any]
// Load started -> succeeded
sut.logLoadStarted()
sut.logLoadSucceeded(
intent: ._testValue(),
elementsSession: ._testDefaultCardValue(defaultPaymentMethod: STPPaymentMethod._testCard().stripeId, paymentMethods: [testCardJSON, testUSBankAccountJSON]),
elementsSession: ._testDefaultCardValue(defaultPaymentMethod: STPPaymentMethod._testCard().stripeId, paymentMethods: [STPPaymentMethod._testCardJSON, STPPaymentMethod._testUSBankAccountJSON]),
defaultPaymentMethod: .saved(paymentMethod: STPPaymentMethod._testCard()),
orderedPaymentMethodTypes: [.stripe(.card), .stripe(.USBankAccount)]
)
Expand Down
24 changes: 2 additions & 22 deletions StripePaymentSheet/StripePaymentSheetTests/PaymentSheet/STPElementsSessionTest.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -504,28 +504,8 @@ class STPElementsSessionTest: XCTestCase {
let allowsSetAsDefault = elementsSession.paymentMethodSyncDefaultForCustomerSheet
XCTAssertFalse(allowsSetAsDefault)
}
private let testCardJSON = [
"id": "pm_123card",
"type": "card",
"card": [
"last4": "4242",
"brand": "visa",
"fingerprint": "B8XXs2y2JsVBtB9f",
"networks": ["available": ["visa"]],
"exp_month": "01",
"exp_year": "2040",
],
] as [AnyHashable: Any]
private let testCardAmexJSON = [
"id": "pm_123amexcard",
"type": "card",
"card": [
"last4": "0005",
"brand": "amex",
],
] as [AnyHashable: Any]
func testElementsCustomerDefaultPaymentMethod() {
let elementsSession = STPElementsSession._testDefaultCardValue(defaultPaymentMethod: "pm_123card", paymentMethods: [testCardAmexJSON, testCardJSON])
let elementsSession = STPElementsSession._testDefaultCardValue(defaultPaymentMethod: "pm_123card", paymentMethods: [STPPaymentMethod._testCardAmexJSON, STPPaymentMethod._testCardJSON])
let customer = elementsSession.customer
XCTAssertNotNil(customer)
let defaultPaymentMethodId = customer?.defaultPaymentMethod
Expand All @@ -536,7 +516,7 @@ class STPElementsSessionTest: XCTestCase {
XCTAssertEqual(defaultPaymentMethod?.stripeId, "pm_123card")
}
func testElementsCustomerNoDefaultPaymentMethodHasSavedPaymentMethods() {
let elementsSession = STPElementsSession._testDefaultCardValue(defaultPaymentMethod: nil, paymentMethods: [testCardAmexJSON, testCardJSON])
let elementsSession = STPElementsSession._testDefaultCardValue(defaultPaymentMethod: nil, paymentMethods: [STPPaymentMethod._testCardAmexJSON, STPPaymentMethod._testCardJSON])
let customer = elementsSession.customer
XCTAssertNotNil(customer)
let defaultPaymentMethodId = customer?.defaultPaymentMethod
Expand Down
89 changes: 48 additions & 41 deletions StripePaymentSheet/StripePaymentSheetTests/PaymentSheet/STPFixtures+PaymentSheet.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,15 +308,18 @@ extension STPPaymentMethod {
],
])!
}

static let _testCardAmexJSON = [
"id": "pm_123card",
"type": "card",
"card": [
"last4": "0005",
"brand": "amex",
],
] as [AnyHashable: Any]

static func _testCardAmex() -> STPPaymentMethod {
return STPPaymentMethod.decodedObject(fromAPIResponse: [
"id": "pm_123card",
"type": "card",
"card": [
"last4": "0005",
"brand": "amex",
],
])!
return STPPaymentMethod.decodedObject(fromAPIResponse: _testCardAmexJSON)!
}

static func _testCardCoBranded(brand: String = "visa", displayBrand: String? = nil, networks: [String] = ["visa", "amex"]) -> STPPaymentMethod {
Expand All @@ -337,43 +340,47 @@ extension STPPaymentMethod {
return STPPaymentMethod.decodedObject(fromAPIResponse: apiResponse)!
}

static func _testUSBankAccount() -> STPPaymentMethod {
return STPPaymentMethod.decodedObject(fromAPIResponse: [
"id": "pm_123",
"type": "us_bank_account",
"us_bank_account": [
"account_holder_type": "individual",
"account_type": "checking",
"bank_name": "STRIPE TEST BANK",
"fingerprint": "ickfX9sbxIyAlbuh",
"last4": "6789",
"networks": [
"preferred": "ach",
"supported": [
"ach",
],
] as [String: Any],
"routing_number": "110000000",
static let _testUSBankAccountJSON = [
"id": "pm_123",
"type": "us_bank_account",
"us_bank_account": [
"account_holder_type": "individual",
"account_type": "checking",
"bank_name": "STRIPE TEST BANK",
"fingerprint": "ickfX9sbxIyAlbuh",
"last4": "6789",
"networks": [
"preferred": "ach",
"supported": [
"ach",
],
] as [String: Any],
"billing_details": [
"name": "Sam Stripe",
"email": "[email protected]",
] as [String: Any],
])!
"routing_number": "110000000",
] as [String: Any],
"billing_details": [
"name": "Sam Stripe",
"email": "[email protected]",
] as [String: Any],
] as [AnyHashable: Any]

static func _testUSBankAccount() -> STPPaymentMethod {
return STPPaymentMethod.decodedObject(fromAPIResponse: _testUSBankAccountJSON)!
}

static let _testSEPAJSON = [
"id": "pm_123",
"type": "sepa_debit",
"sepa_debit": [
"last4": "1234",
],
"billing_details": [
"name": "Sam Stripe",
"email": "[email protected]",
] as [String: Any],
] as [AnyHashable: Any]

static func _testSEPA() -> STPPaymentMethod {
return STPPaymentMethod.decodedObject(fromAPIResponse: [
"id": "pm_123",
"type": "sepa_debit",
"sepa_debit": [
"last4": "1234",
],
"billing_details": [
"name": "Sam Stripe",
"email": "[email protected]",
] as [String: Any],
])!
return STPPaymentMethod.decodedObject(fromAPIResponse: _testSEPAJSON)!
}
}

Expand Down
47 changes: 1 addition & 46 deletions ...StripePaymentSheetTests/PaymentSheet/SavedPaymentOptionsViewControllerSnapshotTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ final class SavedPaymentOptionsViewControllerSnapshotTests: STPSnapshotTestCase
paymentSheetConfiguration: PaymentSheet.Configuration(),
intent: intent,
appearance: appearance,
elementsSession: showDefaultPMBadge ? ._testDefaultCardValue(defaultPaymentMethod: paymentMethods.first?.stripeId ?? STPPaymentMethod._testCard().stripeId, paymentMethods: [testCardJSON, testUSBankAccountJSON, testSEPAJSON]) : .emptyElementsSession,
elementsSession: showDefaultPMBadge ? ._testDefaultCardValue(defaultPaymentMethod: paymentMethods.first?.stripeId ?? STPPaymentMethod._testCard().stripeId, paymentMethods: [STPPaymentMethod._testCardJSON, STPPaymentMethod._testUSBankAccountJSON, STPPaymentMethod._testSEPAJSON]) : .emptyElementsSession,
analyticsHelper: ._testValue())
let testWindow = UIWindow()
testWindow.isHidden = false
Expand All @@ -64,49 +64,4 @@ final class SavedPaymentOptionsViewControllerSnapshotTests: STPSnapshotTestCase
STPSnapshotVerifyView(sut.view)
}

private let testCardJSON = [
"id": "pm_123card",
"type": "card",
"card": [
"last4": "4242",
"brand": "visa",
"fingerprint": "B8XXs2y2JsVBtB9f",
"networks": ["available": ["visa"]],
"exp_month": "01",
"exp_year": "2040",
],
] as [AnyHashable: Any]
private let testUSBankAccountJSON = [
"id": "pm_123bank",
"type": "us_bank_account",
"us_bank_account": [
"account_holder_type": "individual",
"account_type": "checking",
"bank_name": "STRIPE TEST BANK",
"fingerprint": "ickfX9sbxIyAlbuh",
"last4": "6789",
"networks": [
"preferred": "ach",
"supported": [
"ach",
],
] as [String: Any],
"routing_number": "110000000",
] as [String: Any],
"billing_details": [
"name": "Sam Stripe",
"email": "[email protected]",
] as [String: Any],
] as [AnyHashable: Any]
private let testSEPAJSON = [
"id": "pm_123sepa",
"type": "sepa_debit",
"sepa_debit": [
"last4": "1234",
],
"billing_details": [
"name": "Sam Stripe",
"email": "[email protected]",
] as [String: Any],
] as [AnyHashable: Any]
}
14 changes: 1 addition & 13 deletions ...ymentSheetTests/PaymentSheet/VerticalSavedPaymentMethodsViewControllerSnapshotTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ final class VerticalSavedPaymentMethodsViewControllerSnapshotTests: STPSnapshotT
let sut = VerticalSavedPaymentMethodsViewController(configuration: configuration,
selectedPaymentMethod: paymentMethods.first,
paymentMethods: paymentMethods,
elementsSession: showDefaultPMBadge ? ._testDefaultCardValue(defaultPaymentMethod: paymentMethods.first?.stripeId ?? STPPaymentMethod._testCard().stripeId, paymentMethods: [testCardJSON]) : ._testCardValue(),
elementsSession: showDefaultPMBadge ? ._testDefaultCardValue(defaultPaymentMethod: paymentMethods.first?.stripeId ?? STPPaymentMethod._testCard().stripeId, paymentMethods: [STPPaymentMethod._testCardJSON]) : ._testCardValue(),
analyticsHelper: ._testValue(),
defaultPaymentMethod: showDefaultPMBadge ? paymentMethods.first : nil
)
Expand Down Expand Up @@ -90,18 +90,6 @@ final class VerticalSavedPaymentMethodsViewControllerSnapshotTests: STPSnapshotT
STPFixtures.sepaDebitPaymentMethod(), ]
}

private let testCardJSON = [
"id": "pm_123card",
"type": "card",
"card": [
"last4": "4242",
"brand": "visa",
"fingerprint": "B8XXs2y2JsVBtB9f",
"networks": ["available": ["visa"]],
"exp_month": "01",
"exp_year": "2040",
],
] as [AnyHashable: Any]
}

final class StubBottomSheetContentViewController: UIViewController, BottomSheetContentViewController {
Expand Down
Loading