Merge branch 'list-item-loading' of https://github.com/Adyen/adyen-ios …

…into list-item-loading
Adyen · Oct 6, 2023 · 03ccc97 · 03ccc97
2 parents 9fcb077 + 524736d
commit 03ccc97
Show file tree

Hide file tree

Showing 48 changed files with 456 additions and 277 deletions.
diff --git a/.github/workflows/pr_scan.yml b/.github/workflows/pr_scan.yml
@@ -9,7 +9,7 @@ jobs:
   build:
     env:
       sonarToken: ${{ secrets.SONAR_TOKEN }}
-    runs-on: macos-12
+    runs-on: macos-13-xl
 
     steps:
     - uses: actions/checkout@v4
@@ -20,7 +20,7 @@ jobs:
     - name: Select latest Xcode
       uses: maxim-lobanov/setup-xcode@v1
       with:
-        xcode-version: latest-stable
+        xcode-version: '14.3'
 
     - name: Install Tools
       run: |
@@ -36,15 +36,15 @@ jobs:
       run: |
         Scripts/validate-Adyen-SDK-version.sh
 
-    - name: Build and test
+    - name: Clean Build and Test
       run: |
         xcodebuild -version
-        xcodebuild clean build test -project "${project}" -scheme "${scheme}" ${params} -destination "${destination}" -skipPackagePluginValidation | xcpretty --utf --color && exit ${PIPESTATUS[0]}
+        xcodebuild clean build test -project "${project}" -scheme "${scheme}" ${params} -destination "${destination}" | xcpretty --utf --color && exit ${PIPESTATUS[0]}
       env:
         project: 'Adyen.xcodeproj'
-        params: '-derivedDataPath ./DerivedData -enableCodeCoverage YES'
+        params: '-derivedDataPath ./DerivedData -enableCodeCoverage YES -skipPackagePluginValidation'
         scheme: 'AdyenUIHost'
-        destination: 'name=iPhone 14'
+        destination: 'name=iPhone 14,OS=16.4'
 
     - name: Code Coverage
       run: |

diff --git a/Adyen.xcodeproj/project.pbxproj b/Adyen.xcodeproj/project.pbxproj
diff --git a/Adyen.xcodeproj/xcshareddata/xcschemes/AdyenUIHost.xcscheme b/Adyen.xcodeproj/xcshareddata/xcschemes/AdyenUIHost.xcscheme
@@ -55,28 +55,7 @@
             </BuildableReference>
          </TestableReference>
          <TestableReference
-            skipped = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "F9615FAE252DDA4800FA8EDD"
-               BuildableName = "AdyenSwiftUITests.xctest"
-               BlueprintName = "AdyenSwiftUITests"
-               ReferencedContainer = "container:Adyen.xcodeproj">
-            </BuildableReference>
-         </TestableReference>
-         <TestableReference
-            skipped = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "F9CCA3B4296ECB3E00AD643D"
-               BuildableName = "AdyenUIHostUITests.xctest"
-               BlueprintName = "AdyenUIHostUITests"
-               ReferencedContainer = "container:Adyen.xcodeproj">
-            </BuildableReference>
-         </TestableReference>
-         <TestableReference
-            skipped = "NO"
-            parallelizable = "YES">
+            skipped = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "F9CCA3B4296ECB3E00AD643D"

diff --git a/Adyen.xcodeproj/xcshareddata/xcschemes/AdyenUIHostUITests.xcscheme b/Adyen.xcodeproj/xcshareddata/xcschemes/AdyenUIHostUITests.xcscheme
@@ -57,6 +57,15 @@
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
       debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "F9CCA3B4296ECB3E00AD643D"
+            BuildableName = "AdyenUIHostUITests.xctest"
+            BlueprintName = "AdyenUIHostUITests"
+            ReferencedContainer = "container:Adyen.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
    </ProfileAction>
    <AnalyzeAction
       buildConfiguration = "Debug">

diff --git a/Adyen.xcodeproj/xcshareddata/xcschemes/AdyenUIKitTests.xcscheme b/Adyen.xcodeproj/xcshareddata/xcschemes/AdyenUIKitTests.xcscheme
@@ -5,6 +5,22 @@
    <BuildAction
       parallelizeBuildables = "YES"
       buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "NO"
+            buildForProfiling = "NO"
+            buildForArchiving = "NO"
+            buildForAnalyzing = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "E2C0E03B22097917008616F6"
+               BuildableName = "AdyenUIKitTests.xctest"
+               BlueprintName = "AdyenUIKitTests"
+               ReferencedContainer = "container:Adyen.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
    </BuildAction>
    <TestAction
       buildConfiguration = "Debug"
@@ -28,17 +44,6 @@
                ReferencedContainer = "container:Adyen.xcodeproj">
             </BuildableReference>
          </TestableReference>
-         <TestableReference
-            skipped = "NO"
-            parallelizable = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "F9CCA3B4296ECB3E00AD643D"
-               BuildableName = "AdyenUIHostUITests.xctest"
-               BlueprintName = "AdyenUIHostUITests"
-               ReferencedContainer = "container:Adyen.xcodeproj">
-            </BuildableReference>
-         </TestableReference>
       </Testables>
    </TestAction>
    <LaunchAction
@@ -51,16 +56,15 @@
       debugDocumentVersioning = "YES"
       debugServiceExtension = "internal"
       allowLocationSimulation = "YES">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
+      <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "E2C0E07C220B0399008616F6"
             BuildableName = "AdyenUIHost.app"
             BlueprintName = "AdyenUIHost"
             ReferencedContainer = "container:Adyen.xcodeproj">
          </BuildableReference>
-      </BuildableProductRunnable>
+      </MacroExpansion>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

diff --git a/Adyen/UI/Form/Items/Button/FormButtonItemView.swift b/Adyen/UI/Form/Items/Button/FormButtonItemView.swift
@@ -43,7 +43,7 @@ internal final class FormButtonItemView: FormItemView<FormButtonItem> {
         return submitButton
     }()
 
-    @objc private func didSelectSubmitButton() {
+    @objc internal func didSelectSubmitButton() {
         item.buttonSelectionHandler?()
     }
 

diff --git a/AdyenActions/UI/View Controllers/QR Code/QRCodeView.swift b/AdyenActions/UI/View Controllers/QR Code/QRCodeView.swift
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2022 Adyen N.V.
+// Copyright (c) 2023 Adyen N.V.
 //
 // This file is open source and available under the MIT license. See the LICENSE file for more info.
 //
@@ -158,7 +158,7 @@ internal final class QRCodeView: UIView, Localizable, AdyenObserver {
         return button
     }()
 
-    private lazy var logo: NetworkImageView = {
+    internal lazy var logo: NetworkImageView = {
         let logo = NetworkImageView()
         let logoSize = CGSize(width: 74.0, height: 48.0)
         logo.adyen.round(using: model.style.logoCornerRounding)
@@ -218,7 +218,7 @@ internal final class QRCodeView: UIView, Localizable, AdyenObserver {
         return progressView
     }()
 
-    private lazy var expirationLabel: UILabel = {
+    internal lazy var expirationLabel: UILabel = {
         let expirationLabel = UILabel(style: model.style.expirationLabel)
         expirationLabel.numberOfLines = 0
         expirationLabel.accessibilityIdentifier = ViewIdentifierBuilder.build(scopeInstance: self, postfix: "expirationLabel")

diff --git a/AdyenActions/UI/View Controllers/Voucher/VoucherView.swift b/AdyenActions/UI/View Controllers/Voucher/VoucherView.swift
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2022 Adyen N.V.
+// Copyright (c) 2023 Adyen N.V.
 //
 // This file is open source and available under the MIT license. See the LICENSE file for more info.
 //
@@ -209,7 +209,7 @@ internal final class VoucherView: UIView, Localizable {
         }
     }
 
-    internal func showCopyCodeConfirmation() {
+    internal func showCopyCodeConfirmation(resetAfter resetDelay: DispatchTimeInterval = .seconds(4)) {
         UIView.transition(
             with: secondaryButton,
             duration: 0.5,
@@ -222,7 +222,7 @@ internal final class VoucherView: UIView, Localizable {
                 )
             }, completion: { _ in
                 DispatchQueue.main.asyncAfter(
-                    deadline: .now() + .seconds(4)
+                    deadline: .now() + resetDelay
                 ) {
                     self.returnSecondaryButtonToNormalState()
                 }

diff --git a/Scripts/test-carthage-integration.sh b/Scripts/test-carthage-integration.sh
@@ -127,7 +127,10 @@ cp "../Tests/Card Tests/3DS2 Component/ThreeDS2PlusDACoreActionHandlerTests.swif
 cp "../Tests/Card Tests/3DS2 Component/AnyADYServiceMock.swift" Tests/AnyADYServiceMock.swift
 cp "../Tests/Card Tests/3DS2 Component/AuthenticationServiceMock.swift" Tests/AuthenticationServiceMock.swift
 cp "../Tests/Card Tests/3DS2 Component/ThreeDSResultExtension.swift" Tests/ThreeDSResultExtension.swift
-cp "../Tests/Helpers/XCTestCaseExtensions.swift" Tests/XCTestCaseExtensions.swift
+cp "../Tests/Helpers/XCTestCase+RootViewController.swift" Tests/XCTestCase+RootViewController.swift
+cp "../Tests/Helpers/XCTestCase+Wait.swift" Tests/XCTestCase+Wait.swift
+cp "../Tests/Helpers/UIViewController+Search.swift" Tests/UIViewController+Search.swift
+cp "../Tests/Adyen Tests/Analytics/AnalyticsProviderMock.swift" Tests/AnalyticsProviderMock.swift
 cp "../Tests/DummyData/Dummy.swift" Tests/Dummy.swift
 cp -a "../Demo/Common" Source/
 cp -a "../Demo/UIKit" Source/