Merge pull request #14 from stripe-ios/davidme/fix-STPPaymentIntentSe…

…tupFutureUsage

Fix STPPaymentIntentSetupFutureUsage, add test

Stripe/STPPaymentIntentParams.swift

@@ -71,8 +71,21 @@ public class STPPaymentIntentParams: NSObject {
 
   /// When provided, this property indicates how you intend to use the payment method that your customer provides after the current payment completes.
   /// If applicable, additional authentication may be performed to comply with regional legislation or network rules required to enable the usage of the same payment method for additional payments.
+  public var setupFutureUsage: STPPaymentIntentSetupFutureUsage?
+
+  /// When provided, this property indicates how you intend to use the payment method that your customer provides after the current payment completes.
+  /// If applicable, additional authentication may be performed to comply with regional legislation or network rules required to enable the usage of the same payment method for additional payments.
+  /// This property should only be used in Objective-C. In Swift, use `setupFutureUsage`.
   /// - seealso: STPPaymentIntentSetupFutureUsage for more details on what values you can provide.
-  @objc public var setupFutureUsage: NSNumber?
+  @available(swift, obsoleted: 1.0, renamed: "setupFutureUsage")
+  @objc(setupFutureUsage) public var setupFutureUsage_objc: NSNumber? {
+    get {
+      setupFutureUsage?.rawValue as NSNumber?
+    }
+    set {
+      setupFutureUsage = newValue.map { STPPaymentIntentSetupFutureUsage(rawValue: Int(truncating: $0)) } as? STPPaymentIntentSetupFutureUsage
+    }
+  }
 
   /// A boolean number to indicate whether you intend to use the Stripe SDK's functionality to handle any PaymentIntent next actions.
   /// If set to false, STPPaymentIntent.nextAction will only ever contain a redirect url that can be opened in a webview or mobile browser.

Tests/Tests/STPPaymentIntentFunctionalTest.m

@@ -917,6 +917,14 @@ - (void)testConfirmPaymentIntentWithPayPal {
     [self waitForExpectationsWithTimeout:STPTestingNetworkRequestTimeout handler:nil];
 }
 
+#pragma mark - Test Objective-C setupFutureUsage
+
+- (void)testObjectiveCSetupFutureUsage {
+  STPPaymentIntentParams *params = [[STPPaymentIntentParams alloc] init];
+  params.setupFutureUsage = @(STPPaymentIntentSetupFutureUsageOnSession);
+  XCTAssertEqualObjects(params.setupFutureUsageRawString, @"on_session");
+}
+
 #pragma mark - Helpers
 
 - (STPSourceParams *)cardSourceParams {

Tests/Tests/STPPaymentIntentParamsTest.swift

@@ -131,7 +131,7 @@ class STPPaymentIntentParamsTest: XCTestCase {
     params.paymentMethodId = "test_payment_method_id"
     params.savePaymentMethod = NSNumber(value: true)
     params.returnURL = "fake://testing_only"
-    params.setupFutureUsage = NSNumber(value: 1)
+    params.setupFutureUsage = STPPaymentIntentSetupFutureUsage(rawValue: Int(truncating: NSNumber(value: 1)))
     params.useStripeSDK = NSNumber(value: true)
     params.mandateData = STPMandateDataParams(
       customerAcceptance: STPMandateCustomerAcceptanceParams(type: .offline, onlineParams: nil)!)
@@ -151,6 +151,7 @@ class STPPaymentIntentParamsTest: XCTestCase {
     XCTAssertEqual(params.mandateData, paramsCopy.mandateData)
     XCTAssertEqual(params.shipping, paramsCopy.shipping)
 
+    XCTAssertEqual(params.setupFutureUsage, STPPaymentIntentSetupFutureUsage.none)
     XCTAssertEqual(params.savePaymentMethod, paramsCopy.savePaymentMethod)
     XCTAssertEqual(params.returnURL, paramsCopy.returnURL)
     XCTAssertEqual(params.useStripeSDK, paramsCopy.useStripeSDK)