Merge pull request #491 from immutable/test/mac-pkce-ui-test

nattb8 · web-flow · commit 55c422db7710 · 2025-06-18T15:57:03.000+12:00
[ID-3586] test: mac pkce UI test
diff --git a/.gitignore b/.gitignore
@@ -107,4 +107,6 @@ sample/Assets/Vuplex*
 
 __pycache__/
 *.pyc
-.pytest_cache/
+.pytest_cache/
+
+xcuserdata/
diff --git a/Plugins/Mac/Sources/ImmutableWebView.mm b/Plugins/Mac/Sources/ImmutableWebView.mm
@@ -424,5 +424,5 @@ void _CImmutableWebViewPlugin_LaunchAuthURL(void *instance, const char *url, con
     if (instance == NULL)
         return;
     CWebViewPlugin *webViewPlugin = (__bridge CWebViewPlugin *)instance;
-    [webViewPlugin launchAuthURL:url redirectUri: redirectUri];
+    [webViewPlugin launchAuthURL:url redirectUri:redirectUri];
 }
diff --git a/Plugins/Mac/install.sh b/Plugins/Mac/install.sh
@@ -6,4 +6,3 @@ mkdir -p $DSTDIR
 
 cp -r DerivedData/ImmutableWebView.bundle $DSTDIR
 rm -rf DerivedData
-cp *.bundle.meta $DSTDIR
diff --git a/sample/Assets/Editor/MacBuilder.cs b/sample/Assets/Editor/MacBuilder.cs
@@ -38,6 +38,12 @@ private static void BuildPlayer(string defaultBuildPath, BuildOptions buildOptio
             {
                 // Clean up AltTester settings after build
                 AltBuilder.RemoveAltTesterFromScriptingDefineSymbols(BuildTargetGroup.Standalone);
+
+                // Clean up custom e2e testing define
+                var defineSymbols = PlayerSettings.GetScriptingDefineSymbolsForGroup(BuildTargetGroup.Standalone);
+                defineSymbols = defineSymbols.Replace("IMMUTABLE_E2E_TESTING;", "").Replace(";IMMUTABLE_E2E_TESTING", "").Replace("IMMUTABLE_E2E_TESTING", "");
+                PlayerSettings.SetScriptingDefineSymbolsForGroup(BuildTargetGroup.Standalone, defineSymbols);
+
                 RemoveAltFromScene(buildPlayerOptions.scenes[0]);
             }
         }
@@ -66,7 +72,7 @@ private static BuildPlayerOptions CreateBuildPlayerOptions(string buildPath, Bui
         {
             scenes = new[]
             {
-                "Assets/Scenes/Passport/SelectAuthMethod.unity",
+                "Assets/Scenes/Passport/Initialisation.unity",
                 "Assets/Scenes/Passport/UnauthenticatedScene.unity",
                 "Assets/Scenes/Passport/AuthenticatedScene.unity",
                 "Assets/Scenes/Passport/ZkEvm/ZkEvmGetBalance.unity",
@@ -85,6 +91,15 @@ private static BuildPlayerOptions CreateBuildPlayerOptions(string buildPath, Bui
     private static void SetupAltTester(BuildPlayerOptions buildPlayerOptions)
     {
         AltBuilder.AddAltTesterInScriptingDefineSymbolsGroup(BuildTargetGroup.Standalone);
+
+        // Add custom define for e2e testing to enable default browser behavior
+        var defineSymbols = PlayerSettings.GetScriptingDefineSymbolsForGroup(BuildTargetGroup.Standalone);
+        if (!defineSymbols.Contains("IMMUTABLE_E2E_TESTING"))
+        {
+            defineSymbols += ";IMMUTABLE_E2E_TESTING";
+            PlayerSettings.SetScriptingDefineSymbolsForGroup(BuildTargetGroup.Standalone, defineSymbols);
+        }
+
         AltBuilder.CreateJsonFileForInputMappingOfAxis();
 
         var instrumentationSettings = new AltInstrumentationSettings();
diff --git a/sample/Assets/Editor/MobileBuilder.cs b/sample/Assets/Editor/MobileBuilder.cs
@@ -117,7 +117,7 @@ private static BuildPlayerOptions CreateBuildPlayerOptions(string buildPath, Bui
         {
             scenes = new[]
             {
-                "Assets/Scenes/Passport/SelectAuthMethod.unity",
+                "Assets/Scenes/Passport/Initialisation.unity",
                 "Assets/Scenes/Passport/UnauthenticatedScene.unity",
                 "Assets/Scenes/Passport/AuthenticatedScene.unity",
                 "Assets/Scenes/Passport/ZkEvm/ZkEvmGetBalance.unity",
diff --git a/sample/Assets/Editor/WindowsBuilder.cs b/sample/Assets/Editor/WindowsBuilder.cs
@@ -66,7 +66,7 @@ private static BuildPlayerOptions CreateBuildPlayerOptions(string buildPath, Bui
         {
             scenes = new[]
             {
-                "Assets/Scenes/Passport/SelectAuthMethod.unity",
+                "Assets/Scenes/Passport/Initialisation.unity",
                 "Assets/Scenes/Passport/UnauthenticatedScene.unity",
                 "Assets/Scenes/Passport/AuthenticatedScene.unity",
                 "Assets/Scenes/Passport/ZkEvm/ZkEvmGetBalance.unity",
diff --git a/sample/Assets/Scenes/Passport/Initialisation.unity b/sample/Assets/Scenes/Passport/Initialisation.unity
@@ -1128,7 +1128,7 @@ MonoBehaviour:
   m_TargetGraphic: {fileID: 167431872}
   m_HandleRect: {fileID: 167431871}
   m_Direction: 2
-  m_Value: 1
+  m_Value: 0
   m_Size: 1
   m_NumberOfSteps: 0
   m_OnValueChanged:
@@ -1398,8 +1398,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: 1108.9248, y: 0}
-  m_SizeDelta: {x: 2177.8496, y: 0}
+  m_AnchoredPosition: {x: 1801.0891, y: 0}
+  m_SizeDelta: {x: 3562.1782, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1661390145
 MonoBehaviour:
diff --git a/sample/Assets/Scripts/Passport/Login/LoginScript.cs b/sample/Assets/Scripts/Passport/Login/LoginScript.cs
@@ -33,9 +33,9 @@ public async void Login()
             await Passport.Login();
             SceneManager.LoadScene("AuthenticatedScene");
         }
-        catch (OperationCanceledException)
+        catch (OperationCanceledException ex)
         {
-            ShowOutput("Failed to login: cancelled");
+            ShowOutput($"Failed to login: cancelled {ex.Message}\\n{ex.StackTrace}");
         }
         catch (Exception ex)
         {
diff --git a/sample/ProjectSettings/ProjectSettings.asset b/sample/ProjectSettings/ProjectSettings.asset
@@ -76,7 +76,7 @@ PlayerSettings:
   androidFullscreenMode: 1
   defaultIsNativeResolution: 1
   macRetinaSupport: 0
-  runInBackground: 0
+  runInBackground: 1
   captureSingleScreen: 0
   muteOtherAudioSources: 0
   Prepare IOS For Recording: 0
@@ -222,7 +222,8 @@ PlayerSettings:
   iOSDeviceRequirements: []
   iOSURLSchemes:
   - immutablerunner
-  macOSURLSchemes: []
+  macOSURLSchemes:
+  - immutablerunner
   iOSBackgroundModes: 0
   iOSMetalForceHardShadows: 0
   metalEditorSupport: 1
diff --git a/sample/Tests/requirements-desktop.txt b/sample/Tests/requirements-desktop.txt
@@ -1,6 +1,4 @@
-AltTester_Driver==2.1.1
-google_api_python_client==2.136.0
-google_auth_oauthlib==1.2.0
+AltTester-Driver==2.1.1
 protobuf==5.27.2
 selenium==4.22.0
 pytest==8.2.2
diff --git a/sample/Tests/requirements-mobile.txt b/sample/Tests/requirements-mobile.txt
@@ -1,6 +1,4 @@
-AltTester_Driver==2.1.1
-google_api_python_client==2.136.0
-google_auth_oauthlib==1.2.0
+AltTester-Driver==2.1.1
 protobuf==5.27.2
 selenium==4.22.0
 pytest==8.2.2
diff --git a/sample/Tests/test/test.py b/sample/Tests/test/test.py
@@ -93,6 +93,7 @@ def test_2_imx_functions(self):
 
         # Connect to IMX
         self.altdriver.find_object(By.NAME, "ConnectBtn").tap()
+        time.sleep(5)
         text = output.get_text()
         print(f"ConnectBtn output: {text}")
         self.assertEqual("Connected to IMX", text)
diff --git a/sample/Tests/test/test_android.py b/sample/Tests/test/test_android.py
@@ -142,6 +142,7 @@ def test_6_pkce_relogin(self):
 
         # Click Connect to IMX button
         self.altdriver.find_object(By.NAME, "ConnectBtn").tap()
+        time.sleep(5)
         self.assertEqual("Connected to IMX", output.get_text())
 
         self.altdriver.stop()
diff --git a/sample/Tests/test/test_mac.py b/sample/Tests/test/test_mac.py
diff --git a/sample/Tests/test/test_windows.py b/sample/Tests/test/test_windows.py
diff --git a/sample/Tests/test/test_windows_helpers.py b/sample/Tests/test/test_windows_helpers.py
diff --git a/src/Packages/Passport/Runtime/Scripts/Private/PassportImpl.cs b/src/Packages/Passport/Runtime/Scripts/Private/PassportImpl.cs
diff --git a/src/Packages/Passport/Runtime/Scripts/Public/Passport.cs b/src/Packages/Passport/Runtime/Scripts/Public/Passport.cs
diff --git a/src/Packages/Passport/Runtime/ThirdParty/Gree/Assets/Plugins/WebViewObject.cs b/src/Packages/Passport/Runtime/ThirdParty/Gree/Assets/Plugins/WebViewObject.cs

Original file line number	Diff line number	Diff line change
`@@ -424,5 +424,5 @@ void _CImmutableWebViewPlugin_LaunchAuthURL(void instance, const char url, con`
`424`	`424`	`if (instance == NULL)`
`425`	`425`	`return;`
`426`	`426`	`CWebViewPlugin webViewPlugin = (__bridge CWebViewPlugin )instance;`
`427`		`- [webViewPlugin launchAuthURL:url redirectUri: redirectUri];`
	`427`	`+ [webViewPlugin launchAuthURL:url redirectUri:redirectUri];`
`428`	`428`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,4 +6,3 @@ mkdir -p $DSTDIR`
`6`	`6`
`7`	`7`	`cp -r DerivedData/ImmutableWebView.bundle $DSTDIR`
`8`	`8`	`rm -rf DerivedData`
`9`		`-cp *.bundle.meta $DSTDIR`
Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,7 @@ private static BuildPlayerOptions CreateBuildPlayerOptions(string buildPath, Bui`
`117`	`117`	`{`
`118`	`118`	`scenes = new[]`
`119`	`119`	`{`
`120`		`- "Assets/Scenes/Passport/SelectAuthMethod.unity",`
	`120`	`+ "Assets/Scenes/Passport/Initialisation.unity",`
`121`	`121`	`"Assets/Scenes/Passport/UnauthenticatedScene.unity",`
`122`	`122`	`"Assets/Scenes/Passport/AuthenticatedScene.unity",`
`123`	`123`	`"Assets/Scenes/Passport/ZkEvm/ZkEvmGetBalance.unity",`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ private static BuildPlayerOptions CreateBuildPlayerOptions(string buildPath, Bui`
`66`	`66`	`{`
`67`	`67`	`scenes = new[]`
`68`	`68`	`{`
`69`		`- "Assets/Scenes/Passport/SelectAuthMethod.unity",`
	`69`	`+ "Assets/Scenes/Passport/Initialisation.unity",`
`70`	`70`	`"Assets/Scenes/Passport/UnauthenticatedScene.unity",`
`71`	`71`	`"Assets/Scenes/Passport/AuthenticatedScene.unity",`
`72`	`72`	`"Assets/Scenes/Passport/ZkEvm/ZkEvmGetBalance.unity",`
Original file line number	Diff line number	Diff line change
`@@ -33,9 +33,9 @@ public async void Login()`
`33`	`33`	`await Passport.Login();`
`34`	`34`	`SceneManager.LoadScene("AuthenticatedScene");`
`35`	`35`	`}`
`36`		`- catch (OperationCanceledException)`
	`36`	`+ catch (OperationCanceledException ex)`
`37`	`37`	`{`
`38`		`- ShowOutput("Failed to login: cancelled");`
	`38`	`+ ShowOutput($"Failed to login: cancelled {ex.Message}\\n{ex.StackTrace}");`
`39`	`39`	`}`
`40`	`40`	`catch (Exception ex)`
`41`	`41`	`{`