Merge branch 'feat/P2' of github.com:demolaf/FirebaseUI-Android into feat/S3

Author: demolaf

auth/src/main/java/com/firebase/ui/auth/compose/configuration/auth_provider/EmailAuthProvider+FirebaseAuthUI.kt

@@ -166,6 +166,8 @@ internal suspend fun FirebaseAuthUI.createOrLinkUserWithEmailAndPassword(
         if (canUpgrade && pendingCredential != null) {
             // Anonymous upgrade collision: emit merge conflict state
             updateAuthState(AuthState.MergeConflict(pendingCredential))
+        } else {
+            updateAuthState(AuthState.Error(authException))
         }
         throw authException
     } catch (e: CancellationException) {
@@ -465,6 +467,8 @@ internal suspend fun FirebaseAuthUI.signInAndLinkWithCredential(
             } else {
                 updateAuthState(AuthState.Error(authException))
             }
+        } else {
+            updateAuthState(AuthState.Error(authException))
         }
         throw authException
     } catch (e: CancellationException) {

auth/src/test/java/com/firebase/ui/auth/testhelpers/TestHelper.java

@@ -76,17 +76,19 @@ public static void initialize() {
     }
 
     private static void spyContextAndResources() {
-        // In Mockito 5.x, we need to avoid spying on objects that are already mocks/spies
+        // In Mockito 5.x with inline mock maker, we can spy on final classes
+        // Use doReturn().when() pattern to avoid calling real methods during stubbing
         if (!org.mockito.Mockito.mockingDetails(CONTEXT).isSpy()) {
             CONTEXT = spy(CONTEXT);
         }
         doReturn(CONTEXT).when(CONTEXT).getApplicationContext();
 
-        Resources resources = CONTEXT.getResources();
-        if (!org.mockito.Mockito.mockingDetails(resources).isSpy()) {
-            resources = spy(resources);
+        // Get and spy on Resources, ensuring the spy is properly returned
+        Resources originalResources = CONTEXT.getResources();
+        if (!org.mockito.Mockito.mockingDetails(originalResources).isSpy()) {
+            Resources spiedResources = spy(originalResources);
+            doReturn(spiedResources).when(CONTEXT).getResources();
         }
-        doReturn(resources).when(CONTEXT).getResources();
     }
 
     private static void initializeApp(Context context) {