test: fix ios browserstack appium set up

Author: nattb8

.github/workflows/ui-tests.yml

@@ -141,35 +141,6 @@ jobs:
       - name: Build iOS app
         working-directory: sample
         run: ./build_ios.sh
-      - name: Install jq (if not installed)
-        run: |
-          if ! command -v jq &> /dev/null; then
-            echo "jq not found, installing..."
-            brew install jq
-          else
-            echo "jq is already installed"
-          fi
-      - name: Upload iOS app to BrowserStack
-        working-directory: sample/Tests
-        env:
-          BROWSERSTACK_USERNAME: ${{ secrets.BROWSERSTACK_USERNAME }}
-          BROWSERSTACK_ACCESS_KEY: ${{ secrets.BROWSERSTACK_ACCESS_KEY }}
-        run: |
-          curl -u "${{ secrets.BROWSERSTACK_USERNAME }}:${{ secrets.BROWSERSTACK_ACCESS_KEY }}" \
-          -X POST "https://api-cloud.browserstack.com/app-automate/upload" \
-          -F "[email protected]"
-
-          # Extract app_url from the response using jq
-          app_url=$(echo "$response" | jq -r '.app_url')
-
-          if [ -z "$app_url" ]; then
-            echo "Error: app_url is not found in the response"
-            exit 1  # Fail the workflow if app_url is not present
-          fi
-
-          echo "app_url: $app_url"
-
-          echo "APP_URL=$app_url" >> $GITHUB_ENV
       - uses: actions/setup-python@v4
         with:
           python-version: "3.10"
@@ -180,6 +151,6 @@ jobs:
           MAILSLURP_API_KEY: ${{ secrets.MAILSLURP_API_KEY }}
           BROWSERSTACK_USERNAME: ${{ secrets.BROWSERSTACK_USERNAME }}
           BROWSERSTACK_ACCESS_KEY: ${{ secrets.BROWSERSTACK_ACCESS_KEY }}
-        working-directory: sample/Tests
-        run: browserstack-sdk pytest -s ./test/test_ios.py --browserstack.config "browserstack.ios.yml"
+        working-directory: sample/Tests/test/ios
+        run: browserstack-sdk pytest -xs ./test_ios.py --browserstack.config "browserstack.ios.yml"
 

sample/Assets/Scenes/Passport/ZkEvm/ZkEvmSendTransaction.unity

@@ -1288,7 +1288,7 @@ MonoBehaviour:
   m_TargetGraphic: {fileID: 1741513414}
   m_HandleRect: {fileID: 1741513413}
   m_Direction: 2
-  m_Value: 1
+  m_Value: 0
   m_Size: 1
   m_NumberOfSteps: 0
   m_OnValueChanged:
@@ -1368,7 +1368,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 432.63553, y: 0}
+  m_AnchoredPosition: {x: 427.93484, y: 0}
   m_SizeDelta: {x: 0, y: 60}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &885137217
@@ -2046,7 +2046,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   Output: {fileID: 1253661940}
   ConfirmToggle: {fileID: 1782090444}
-  GetTrasactionReceiptToggle: {fileID: 1873101809}
+  GetTransactionReceiptToggle: {fileID: 1873101809}
   ToInputField: {fileID: 649013321}
   ValueInputField: {fileID: 1901422923}
   DataInputField: {fileID: 1391622483}
@@ -3406,8 +3406,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 885.5994, y: 0}
-  m_SizeDelta: {x: 1771.1991, y: 0}
+  m_AnchoredPosition: {x: 1153.199, y: 0}
+  m_SizeDelta: {x: 2306.398, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1833965463
 MonoBehaviour:
@@ -4341,8 +4341,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 885.59955, y: 0}
-  m_SizeDelta: {x: 1771.1991, y: 0}
+  m_AnchoredPosition: {x: 1153.199, y: 0}
+  m_SizeDelta: {x: 2306.398, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &2131064088
 MonoBehaviour:

sample/Assets/Scripts/Passport/ZkEvm/ZkEvmSendTransactionScript.cs

@@ -6,14 +6,15 @@
 using Immutable.Passport;
 using Immutable.Passport.Model;
 using Cysharp.Threading.Tasks;
+using UnityEngine.Serialization;
 
 public class ZkEvmSendTransactionScript : MonoBehaviour
 {
 #pragma warning disable CS8618
     [SerializeField] private Text Output;
 
     [SerializeField] private Toggle ConfirmToggle;
-    [SerializeField] private Toggle GetTrasactionReceiptToggle;
+    [SerializeField] private Toggle GetTransactionReceiptToggle;
     [SerializeField] private InputField ToInputField;
     [SerializeField] private InputField ValueInputField;
     [SerializeField] private InputField DataInputField;
@@ -31,7 +32,7 @@ void Start()
             // Show get transaction receipt option if send transaction with confirmation toggle is off
             ConfirmToggle.onValueChanged.AddListener(delegate
             {
-                GetTrasactionReceiptToggle.gameObject.SetActive(!ConfirmToggle.isOn);
+                GetTransactionReceiptToggle.gameObject.SetActive(!ConfirmToggle.isOn);
             });
         }
         else
@@ -73,7 +74,7 @@ public async void SendTransaction()
                 string transactionHash = await Passport.ZkEvmSendTransaction(request);
 
                 // Check if receipt is requested
-                if (GetTrasactionReceiptToggle.isOn)
+                if (GetTransactionReceiptToggle.isOn)
                 {
                     // Poll for the receipt and display transaction status
                     string? status = await PollStatus(transactionHash);

sample/ProjectSettings/ProjectSettings.asset

@@ -157,13 +157,13 @@ PlayerSettings:
   applicationIdentifier:
     Android: com.immutable.ImmutableSample
     Standalone: com.immutable.Immutable-Sample
-    iPhone: com.immutable.Immutable-Sample
+    iPhone: com.immutable.Immutable-Sample-GameSDK
   buildNumber:
     Standalone: 0
     VisionOS: 0
     iPhone: 0
     tvOS: 0
-  overrideDefaultApplicationIdentifier: 0
+  overrideDefaultApplicationIdentifier: 1
   AndroidBundleVersionCode: 1
   AndroidMinSdkVersion: 26
   AndroidTargetSdkVersion: 33

sample/Tests/requirements-mobile.txt

@@ -7,4 +7,7 @@ pytest==8.2.2
 requests==2.32.3
 mailslurp-client==15.19.22
 Appium-Python-Client
-browserstack-sdk
+browserstack-sdk
+browserstack-local
+pytest-variables
+pytest-selenium

sample/Tests/browserstack.ios.yml renamed to sample/Tests/test/ios/browserstack.ios.yml

@@ -21,7 +21,7 @@ buildName: iOS build
 # Read more about buildIdentifiers here -> https://www.browserstack.com/docs/automate/selenium/organize-tests
 buildIdentifier: '#${BUILD_NUMBER}' # Supports strings along with either/both ${expression}
 framework: pytest
-source: pytest-browserstack:sample-sdk:v1.0
+source: pytest-appium-browserstack:sample-sdk:v1.0
 
 # Set `app` to define the app that is to be used for testing.
 # It can either take the id of any uploaded app or the path of the app directly.
@@ -35,9 +35,9 @@ app: ./Payload.ipa #For running local tests
 # Entire list available here -> (https://www.browserstack.com/list-of-browsers-and-platforms/automate)
 
 platforms:
-  - platformName: ios
-    deviceName: iPhone 14 Pro Max
-    platformVersion: 16
+  - deviceName: iPhone 14 Pro
+    osVersion: 16
+    platformName: ios
 
 # =======================
 # Parallels per Platform
@@ -57,10 +57,10 @@ parallelsPerPlatform: 1
 # Set browserStackLocal to true if your website under test is not accessible publicly over the internet
 # Learn more about how BrowserStack Local works here -> https://www.browserstack.com/docs/automate/selenium/local-testing-introduction
 browserstackLocal: true # <boolean> (Default false)
-browserStackLocalOptions:
+# browserStackLocalOptions:
   #Options to be passed to BrowserStack local in-case of advanced configurations
   #  localIdentifier: # <string> (Default: null) Needed if you need to run multiple instances of local.
-  forceLocal: true  # <boolean> (Default: false) Set to true if you need to resolve all your traffic via BrowserStack Local tunnel.
+  # forceLocal: true  # <boolean> (Default: false) Set to true if you need to resolve all your traffic via BrowserStack Local tunnel.
 # Entire list of arguments available here -> https://www.browserstack.com/docs/automate/selenium/manage-incoming-connections
 
 # ===================
@@ -70,4 +70,3 @@ debug: false # <boolean> # Set to true if you need screenshots for every seleniu
 networkLogs: false # <boolean> Set to true to enable HAR logs capturing
 consoleLogs: errors # <string> Remote browser's console debug levels to be printed (Default: errors)
 # Available options are `disable`, `errors`, `warnings`, `info`, `verbose` (Default: errors)
-acceptInsecureCerts: true

sample/Tests/test/ios/conftest.py

@@ -0,0 +1,21 @@
+import pytest
+from appium import webdriver
+from alttester import *
+
+@pytest.fixture(scope='function')
+def setWebdriver(request, session_capabilities):
+    session_capabilities["autoAcceptAlerts"] = True
+    remoteURL = "https://hub.browserstack.com/wd/hub"
+    driver = webdriver.Remote(remoteURL, session_capabilities)
+
+    altdriver = AltDriver(timeout=120)
+
+    request.instance.driver = driver
+    request.instance.altdriver = altdriver
+
+    request.node._driver = driver
+
+    yield driver
+
+    driver.quit()
+    altdriver.stop()