Fixed tests

wultra · Nov 18, 2024 · becf3eb · becf3eb
1 parent 45df228
commit becf3eb
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 18 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -28,4 +28,5 @@ jobs:
           OP_URL: ${{ secrets.TESTS_OP_URL }}
           ER_URL: ${{ secrets.TESTS_ER_URL }}
           IN_URL: ${{ secrets.TESTS_IN_URL }}
-        run: ./scripts/test.sh -destination "platform=iOS Simulator,OS=17.0.1,name=iPhone 15" -sdkconfig "$SDK_CONFIG" -er "$ER_URL" -op "$OP_URL" -in "$IN_URL" -cl "$CL_URL" -clu "$CL_LGN" -clp "$CL_PWD" -cla "$CL_AID"
+          PU_URL: ${{ secrets.TESTS_PU_URL }}
+        run: ./scripts/test.sh -destination "platform=iOS Simulator,OS=17.0.1,name=iPhone 15" -sdkconfig "$SDK_CONFIG" -er "$ER_URL" -op "$OP_URL" -in "$IN_URL" -cl "$CL_URL" -clu "$CL_LGN" -clp "$CL_PWD" -cla "$CL_AID" -pu "$PU_URL"
diff --git a/WultraMobileTokenSDK/Common/WMTProvisioningUtils.swift b/WultraMobileTokenSDK/Common/WMTProvisioningUtils.swift
@@ -63,17 +63,6 @@ class WMTProvisioningUtils {
             return nil
         }
     }
-
-    static func getApnsEnvironment(profile: WMTProvision?) -> WMTPushRegistrationEnvironment? {
-        switch profile?.entitlements.apsEnvironment {
-        case .development:
-            return  .development
-        case .production:
-            return .production
-        case nil:
-            return nil
-        }
-    }
 }
 
 /// Provisioning profile plist structure. Note that we need only entitlements for now.

diff --git a/WultraMobileTokenSDK/Push/Model/WMTPushRegistrationData.swift b/WultraMobileTokenSDK/Push/Model/WMTPushRegistrationData.swift
@@ -40,3 +40,16 @@ enum WMTPushRegistrationEnvironment: String, Codable {
     case production
     case development
 }
+
+extension WMTProvision {
+    var apnsEnvironment: WMTPushRegistrationEnvironment? {
+        switch entitlements.apsEnvironment {
+        case .development:
+            return  .development
+        case .production:
+            return .production
+        case nil:
+            return nil
+        }
+    }
+}
diff --git a/WultraMobileTokenSDK/Push/Service/WMTPushImpl.swift b/WultraMobileTokenSDK/Push/Service/WMTPushImpl.swift
@@ -124,12 +124,9 @@ class WMTPushImpl: WMTPush, WMTService {
 
     private func getPushEnvironment(environment: WMTPushAPNSEnvironment) -> WMTPushRegistrationEnvironment? {
         switch environment {
-        case .development:
-            return .development
-        case .production:
-            return .production
-        case .automatic:
-            return WMTProvisioningUtils.getApnsEnvironment(profile: WMTProvisioningUtils.getMainProvisioningProfile())
+        case .development: return .development
+        case .production: return .production
+        case .automatic: return WMTProvisioningUtils.getMainProvisioningProfile()?.apnsEnvironment
         }
     }
 }

diff --git a/scripts/test.sh b/scripts/test.sh
@@ -14,6 +14,7 @@ CL_LGN=""
 CL_PWD=""
 CL_AID=""
 ER_URL=""
+PU_URL=""
 OP_URL=""
 IN_URL=""
 SDKCONFIG=""
@@ -57,6 +58,11 @@ do
 			shift
 			shift
 			;;
+		-pu)
+			PU_URL="$2"
+			shift
+			shift
+			;;
         -in)
             IN_URL="$2"
             shift
@@ -89,6 +95,7 @@ echo """{
     \"cloudApplicationId\"    : \"${CL_AID}\",
     \"enrollmentServerUrl\"   : \"${ER_URL}\",
     \"operationsServerUrl\"   : \"${OP_URL}\",
+    \"pushServerUrl\".        : \"${PU_URL}\",
     \"inboxServerUrl\"        : \"${IN_URL}\",
     \"sdkConfig\"             : \"${SDKCONFIG}\"
 }""" > "WultraMobileTokenSDKTests/Configs/config.json"