Merge pull request #451 from checkout/hotifx/rename-paymentviewcontroller

okhan-okbay-cko · web-flow · commit 26fde070079f · 2023-08-25T14:12:27.000+01:00
Rename PaymentViewController
diff --git a/Source/UI/PaymentForm/Factory/PaymentFormFactory.swift b/Source/UI/PaymentForm/Factory/PaymentFormFactory.swift
@@ -19,7 +19,7 @@ public enum PaymentFormFactory {
                                                 supportedSchemes: configuration.supportedSchemes)
         viewModel.preventDuplicateCardholderInput()
 
-        let viewController = PaymentViewController(viewModel: viewModel)
+        let viewController = FramesPaymentViewController(viewModel: viewModel)
         viewModel.cardTokenRequested = completionHandler
         logger.log(.paymentFormInitialised(environment: configuration.environment))
         if #available(iOS 13.0, *) {
diff --git a/Source/UI/PaymentForm/ViewController/FramesPaymentViewController.swift b/Source/UI/PaymentForm/ViewController/FramesPaymentViewController.swift
@@ -11,7 +11,7 @@ protocol PaymentViewControllerDelegate: AnyObject {
 }
 
 // swiftlint:disable file_length
-final class PaymentViewController: UIViewController {
+final class FramesPaymentViewController: UIViewController {
 
   // MARK: - Variables
 
@@ -173,7 +173,7 @@ final class PaymentViewController: UIViewController {
 
 // MARK: View Model Integration
 
-extension PaymentViewController {
+extension FramesPaymentViewController {
   private func setupViewModel() {
     delegate = self.viewModel as? PaymentViewControllerDelegate
     updateBackgroundViews()
@@ -323,7 +323,7 @@ extension PaymentViewController {
 
 // MARK: Setup Views
 
-extension PaymentViewController {
+extension FramesPaymentViewController {
   private func setupViewsInOrder() {
     setupScrollView()
     setupStackView()
@@ -387,43 +387,43 @@ extension PaymentViewController {
   }
 }
 
-extension PaymentViewController: SelectionButtonViewDelegate {
+extension FramesPaymentViewController: SelectionButtonViewDelegate {
   func selectionButtonIsPressed() {
     delegate?.addBillingButtonIsPressed(sender: navigationController)
   }
 }
 
-extension PaymentViewController: BillingFormSummaryViewDelegate {
+extension FramesPaymentViewController: BillingFormSummaryViewDelegate {
   func summaryButtonIsPressed() {
     delegate?.editBillingButtonIsPressed(sender: navigationController)
   }
 }
 
-extension PaymentViewController: ExpiryDateViewDelegate {
+extension FramesPaymentViewController: ExpiryDateViewDelegate {
   func update(result: Result<ExpiryDate, ValidationError.ExpiryDate>) {
     delegate?.expiryDateIsUpdated(result: result)
   }
 }
 
-extension PaymentViewController: CardholderDelegate {
+extension FramesPaymentViewController: CardholderDelegate {
   func cardholderUpdated(to cardholderInput: String) {
     delegate?.cardholderIsUpdated(value: cardholderInput)
   }
 }
 
-extension PaymentViewController: SecurityCodeViewDelegate {
+extension FramesPaymentViewController: SecurityCodeViewDelegate {
   func update(securityCode: String) {
     delegate?.securityCodeIsUpdated(to: securityCode)
   }
 }
 
-extension PaymentViewController: ButtonViewDelegate {
+extension FramesPaymentViewController: ButtonViewDelegate {
   func selectionButtonIsPressed(sender: UIView) {
     delegate?.payButtonIsPressed()
   }
 }
 
-extension PaymentViewController: UIScrollViewDelegate {
+extension FramesPaymentViewController: UIScrollViewDelegate {
   func scrollViewDidScroll(_ scrollView: UIScrollView) {
     let contentOffsetY = scrollView.contentOffset.y + scrollView.adjustedContentInset.top
 
diff --git a/Tests/UI/Factory/FramesFactoryTests.swift b/Tests/UI/Factory/FramesFactoryTests.swift
@@ -30,7 +30,7 @@ class FramesFactoryTests: XCTestCase {
     let formConfig = PaymentFormConfiguration(apiKey: "", environment: .sandbox, supportedSchemes: [.visa], billingFormData: billingForm)
     let formStyle = PaymentStyle(paymentFormStyle: paymentFormStyle, billingFormStyle: billingFormStyle)
     let viewController = PaymentFormFactory.buildViewController(configuration: formConfig, style: formStyle) { _ in }
-    let paymentViewController = try XCTUnwrap(viewController as? PaymentViewController)
+    let paymentViewController = try XCTUnwrap(viewController as? FramesPaymentViewController)
     let viewModel = try XCTUnwrap(paymentViewController.viewModel)
 
     XCTAssertNotNil(paymentViewController.viewModel)
diff --git a/Tests/UI/PaymentForm/PaymentViewControllerTests.swift b/Tests/UI/PaymentForm/PaymentViewControllerTests.swift
@@ -10,7 +10,7 @@ import Checkout
 @testable import Frames
 
 class PaymentViewControllerTests: XCTestCase {
-  var viewController: PaymentViewController!
+  var viewController: FramesPaymentViewController!
   var viewModel: DefaultPaymentViewModel!
   let delegate = PaymentViewControllerMockDelegate()
   let stubCheckoutAPIService = StubCheckoutAPIService()
@@ -34,7 +34,7 @@ class PaymentViewControllerTests: XCTestCase {
                                         paymentFormStyle: DefaultPaymentFormStyle(),
                                         billingFormStyle: DefaultBillingFormStyle(),
                                         supportedSchemes: [.discover, .mada])
-    viewController = PaymentViewController(viewModel: viewModel)
+    viewController = FramesPaymentViewController(viewModel: viewModel)
   }
   
   func testPaymentViewsHierarchy() {
@@ -155,7 +155,7 @@ class PaymentViewControllerTests: XCTestCase {
                                                 paymentFormStyle: nil,
                                                 billingFormStyle: nil,
                                                 supportedSchemes: [])
-    let testVC = PaymentViewController(viewModel: testViewModel)
+    let testVC = FramesPaymentViewController(viewModel: testViewModel)
     
     let expect = expectation(description: "Free up main thread in case UI work influences outcome")
     testVC.viewDidLoad()
@@ -183,7 +183,7 @@ class PaymentViewControllerTests: XCTestCase {
                                                 paymentFormStyle: nil,
                                                 billingFormStyle: nil,
                                                 supportedSchemes: [])
-    let testVC = PaymentViewController(viewModel: testViewModel)
+    let testVC = FramesPaymentViewController(viewModel: testViewModel)
     
     XCTAssertTrue(testLogger.addCalledWithMetadataPairs.isEmpty)
     XCTAssertTrue(testLogger.logCalledWithFramesLogEvents.isEmpty)

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ protocol PaymentViewControllerDelegate: AnyObject {`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`// swiftlint:disable file_length`
`14`		`-final class PaymentViewController: UIViewController {`
	`14`	`+final class FramesPaymentViewController: UIViewController {`
`15`	`15`
`16`	`16`	`// MARK: - Variables`
`17`	`17`
`@@ -173,7 +173,7 @@ final class PaymentViewController: UIViewController {`
`173`	`173`
`174`	`174`	`// MARK: View Model Integration`
`175`	`175`
`176`		`-extension PaymentViewController {`
	`176`	`+extension FramesPaymentViewController {`
`177`	`177`	`private func setupViewModel() {`
`178`	`178`	`delegate = self.viewModel as? PaymentViewControllerDelegate`
`179`	`179`	`updateBackgroundViews()`
`@@ -323,7 +323,7 @@ extension PaymentViewController {`
`323`	`323`
`324`	`324`	`// MARK: Setup Views`
`325`	`325`
`326`		`-extension PaymentViewController {`
	`326`	`+extension FramesPaymentViewController {`
`327`	`327`	`private func setupViewsInOrder() {`
`328`	`328`	`setupScrollView()`
`329`	`329`	`setupStackView()`
`@@ -387,43 +387,43 @@ extension PaymentViewController {`
`387`	`387`	`}`
`388`	`388`	`}`
`389`	`389`
`390`		`-extension PaymentViewController: SelectionButtonViewDelegate {`
	`390`	`+extension FramesPaymentViewController: SelectionButtonViewDelegate {`
`391`	`391`	`func selectionButtonIsPressed() {`
`392`	`392`	`delegate?.addBillingButtonIsPressed(sender: navigationController)`
`393`	`393`	`}`
`394`	`394`	`}`
`395`	`395`
`396`		`-extension PaymentViewController: BillingFormSummaryViewDelegate {`
	`396`	`+extension FramesPaymentViewController: BillingFormSummaryViewDelegate {`
`397`	`397`	`func summaryButtonIsPressed() {`
`398`	`398`	`delegate?.editBillingButtonIsPressed(sender: navigationController)`
`399`	`399`	`}`
`400`	`400`	`}`
`401`	`401`
`402`		`-extension PaymentViewController: ExpiryDateViewDelegate {`
	`402`	`+extension FramesPaymentViewController: ExpiryDateViewDelegate {`
`403`	`403`	`func update(result: Result<ExpiryDate, ValidationError.ExpiryDate>) {`
`404`	`404`	`delegate?.expiryDateIsUpdated(result: result)`
`405`	`405`	`}`
`406`	`406`	`}`
`407`	`407`
`408`		`-extension PaymentViewController: CardholderDelegate {`
	`408`	`+extension FramesPaymentViewController: CardholderDelegate {`
`409`	`409`	`func cardholderUpdated(to cardholderInput: String) {`
`410`	`410`	`delegate?.cardholderIsUpdated(value: cardholderInput)`
`411`	`411`	`}`
`412`	`412`	`}`
`413`	`413`
`414`		`-extension PaymentViewController: SecurityCodeViewDelegate {`
	`414`	`+extension FramesPaymentViewController: SecurityCodeViewDelegate {`
`415`	`415`	`func update(securityCode: String) {`
`416`	`416`	`delegate?.securityCodeIsUpdated(to: securityCode)`
`417`	`417`	`}`
`418`	`418`	`}`
`419`	`419`
`420`		`-extension PaymentViewController: ButtonViewDelegate {`
	`420`	`+extension FramesPaymentViewController: ButtonViewDelegate {`
`421`	`421`	`func selectionButtonIsPressed(sender: UIView) {`
`422`	`422`	`delegate?.payButtonIsPressed()`
`423`	`423`	`}`
`424`	`424`	`}`
`425`	`425`
`426`		`-extension PaymentViewController: UIScrollViewDelegate {`
	`426`	`+extension FramesPaymentViewController: UIScrollViewDelegate {`
`427`	`427`	`func scrollViewDidScroll(_ scrollView: UIScrollView) {`
`428`	`428`	`let contentOffsetY = scrollView.contentOffset.y + scrollView.adjustedContentInset.top`
`429`	`429`