Add credit card implementation

Kickstarter-iOS/Views/Controllers/AddNewCardViewController.swift

@@ -123,7 +123,7 @@ internal final class AddNewCardViewController: UIViewController, STPPaymentCardT
     self.viewModel.outputs.paymentDetails
       .observeForUI()
       .observeValues { [weak self] cardholderName, cardNumber, expMonth, expYear, cvc in
-        self?.stripeToken(cardholderName: cardholderName,
+        self?.createStripeToken(cardholderName: cardholderName,
                          cardNumber: cardNumber,
                          expirationMonth: expMonth,
                          expirationYear: expYear,
@@ -163,15 +163,15 @@ internal final class AddNewCardViewController: UIViewController, STPPaymentCardT
   }
 
   @objc func cardholderNameTextFieldChanged(_ textField: UITextField) {
-    self.viewModel.inputs.cardholderNameChanged(textField.text ?? "")
+    self.viewModel.inputs.cardholderNameChanged(textField.text)
   }
 
   @objc func cardholderNameTextFieldReturn(_ textField: UITextField
     ) {
     self.viewModel.inputs.cardholderNameTextFieldReturn()
   }
 
-  func paymentCardTextFieldDidChange(_ textField: STPPaymentCardTextField) {
+ internal func paymentCardTextFieldDidChange(_ textField: STPPaymentCardTextField) {
 
     guard let cardnumber = textField.cardNumber, let cvc = textField.cvc else {
       return
@@ -185,7 +185,7 @@ internal final class AddNewCardViewController: UIViewController, STPPaymentCardT
     self.viewModel.inputs.paymentInfo(valid: textField.isValid)
   }
 
-  func stripeToken(cardholderName: String,
+  private func createStripeToken(cardholderName: String,
                    cardNumber: String,
                    expirationMonth: Int,
                    expirationYear: Int,

Library/ViewModels/AddNewCardViewModel.swift

@@ -6,7 +6,7 @@ import Result
 import Stripe
 
 public protocol AddNewCardViewModelInputs {
-  func cardholderNameChanged(_ cardholderName: String)
+  func cardholderNameChanged(_ cardholderName: String?)
   func cardholderNameTextFieldReturn()
   func creditCardChanged(cardNumber: String, expMonth: Int, expYear: Int, cvc: String)
   func paymentInfo(valid: Bool)
@@ -37,7 +37,7 @@ public final class AddNewCardViewModel: AddNewCardViewModelType, AddNewCardViewM
 AddNewCardViewModelOutputs {
 
   public init() {
-    let cardholderName = self.cardholderNameChangedProperty.signal
+    let cardholderName = self.cardholderNameChangedProperty.signal.skipNil()
     let creditCardDetails = self.creditCardChangedProperty.signal.skipNil()
 
     self.cardholderNameBecomeFirstResponder = self.viewDidLoadProperty.signal
@@ -53,12 +53,10 @@ AddNewCardViewModelOutputs {
       .map { cardholderName, creditCardDetails in
         (cardholderName, creditCardDetails.0, creditCardDetails.1, creditCardDetails.2, creditCardDetails.3) }
 
-    let tryAddCardAction = self.saveButtonTappedProperty.signal
-
     self.paymentDetails = paymentInput
       .takeWhen(self.saveButtonTappedProperty.signal)
 
-    self.dismissKeyboard = tryAddCardAction
+    self.dismissKeyboard = self.saveButtonTappedProperty.signal
 
     self.setStripePublishableKey = self.saveButtonIsEnabled
       .filter(isTrue)
@@ -90,14 +88,14 @@ AddNewCardViewModelOutputs {
     )
 
     self.activityIndicatorShouldShow = Signal.merge(
-      tryAddCardAction.signal.mapConst(true),
+      self.saveButtonTappedProperty.signal.mapConst(true),
       self.addNewCardSuccess.mapConst(false),
       self.addNewCardFailure.mapConst(false)
     )
   }
 
-  private let cardholderNameChangedProperty = MutableProperty("")
-  public func cardholderNameChanged(_ cardholderName: String) {
+  private let cardholderNameChangedProperty = MutableProperty<String?>(nil)
+  public func cardholderNameChanged(_ cardholderName: String?) {
     self.cardholderNameChangedProperty.value = cardholderName
   }
 

Library/ViewModels/AddNewCardViewModelTests.swift

@@ -119,8 +119,8 @@ internal final class AddNewCardViewModelTests: TestCase {
   func testBecomeFirstResponderAndSaveEnabled() {
     self.cardholderNameBecomeFirstResponder.assertDidNotEmitValue()
     self.paymentDetailsBecomeFirstResponder.assertDidNotEmitValue()
-    self.saveButtonIsEnabled.assertDidNotEmitValue()
     self.activityIndicatorShouldShow.assertDidNotEmitValue()
+    self.saveButtonIsEnabled.assertDidNotEmitValue()
 
     self.vm.inputs.viewDidLoad()
 
@@ -149,7 +149,21 @@ internal final class AddNewCardViewModelTests: TestCase {
     self.saveButtonIsEnabled.assertValues([false, false, true], "Enabled when form is valid.")
   }
 
-  func testSetPublishableKey_CardInfoInValid() {
+  func testSaveButtonEnabled() {
+    self.saveButtonIsEnabled.assertDidNotEmitValue()
+    self.vm.inputs.viewDidLoad()
+
+    self.vm.inputs.cardholderNameChanged("")
+    self.vm.inputs.paymentInfo(valid: false)
+    self.saveButtonIsEnabled.assertValues([false], "Disabled form is incomplete")
+
+    self.vm.inputs.cardholderNameChanged("Native Squad")
+    self.vm.inputs.paymentInfo(valid: true)
+
+    self.saveButtonIsEnabled.assertValues([false, false, true], "Enabled when form is valid.")
+  }
+
+  func testSetPublishableKey_CardInfoInvalid() {
     withEnvironment(config: .template |> Config.lens.stripePublishableKey .~ "stripePublishableKey") {
       self.vm.inputs.viewDidLoad()