[fenix] Closes https://github.com/mozilla-mobile/fenix/issues/17473: Intermittent failues of PwaOnboardingObserver

app/src/main/java/org/mozilla/fenix/shortcut/PwaOnboardingObserver.kt

@@ -4,6 +4,7 @@
 
 package org.mozilla.fenix.shortcut
 
+import androidx.annotation.VisibleForTesting
 import androidx.lifecycle.LifecycleOwner
 import androidx.navigation.NavController
 import kotlinx.coroutines.CoroutineScope
@@ -47,9 +48,7 @@ class PwaOnboardingObserver(
                 if (webAppUseCases.isInstallable() && !settings.userKnowsAboutPwas) {
                     settings.incrementVisitedInstallableCount()
                     if (settings.shouldShowPwaCfr) {
-                        val directions =
+                        navigateToPwaOnboarding()
-                            BrowserFragmentDirections.actionBrowserFragmentToPwaOnboardingDialogFragment()
-                        navController.nav(R.id.browserFragment, directions)
                         settings.lastCfrShownTimeInMillis = System.currentTimeMillis()
                         settings.userKnowsAboutPwas = true
                     }
@@ -61,4 +60,12 @@ class PwaOnboardingObserver(
     fun stop() {
         scope?.cancel()
     }
+
+    @VisibleForTesting
+    internal fun navigateToPwaOnboarding() {
+        navController.nav(
+            R.id.browserFragment,
+            BrowserFragmentDirections.actionBrowserFragmentToPwaOnboardingDialogFragment()
+        )
+    }
 }

app/src/test/java/org/mozilla/fenix/shortcut/PwaOnboardingObserverTest.kt

@@ -10,6 +10,7 @@ import androidx.lifecycle.LifecycleRegistry
 import androidx.navigation.NavController
 import io.mockk.every
 import io.mockk.mockk
+import io.mockk.spyk
 import io.mockk.verify
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.TestCoroutineDispatcher
@@ -24,9 +25,6 @@ import org.junit.After
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
-import org.mozilla.fenix.R
-import org.mozilla.fenix.browser.BrowserFragmentDirections
-import org.mozilla.fenix.ext.nav
 import org.mozilla.fenix.utils.Settings
 
 @ExperimentalCoroutinesApi
@@ -54,17 +52,19 @@ class PwaOnboardingObserverTest {
             )
         )
         lifecycleOwner = MockedLifecycleOwner(Lifecycle.State.STARTED)
+
         navigationController = mockk(relaxed = true)
         settings = mockk(relaxed = true)
         webAppUseCases = mockk(relaxed = true)
 
-        pwaOnboardingObserver = PwaOnboardingObserver(
+        pwaOnboardingObserver = spyk(PwaOnboardingObserver(
             store = store,
             lifecycleOwner = lifecycleOwner,
             navController = navigationController,
             settings = settings,
             webAppUseCases = webAppUseCases
-        )
+        ))
+        every { pwaOnboardingObserver.navigateToPwaOnboarding() } returns Unit
     }
 
     @After
@@ -81,10 +81,7 @@ class PwaOnboardingObserverTest {
 
         store.dispatch(ContentAction.UpdateWebAppManifestAction("1", mockk())).joinBlocking()
         verify { settings.incrementVisitedInstallableCount() }
-        verify(exactly = 0) { navigationController.nav(
+        verify(exactly = 0) { pwaOnboardingObserver.navigateToPwaOnboarding() }
-            R.id.browserFragment,
-            BrowserFragmentDirections.actionBrowserFragmentToPwaOnboardingDialogFragment())
-        }
     }
 
     @Test
@@ -96,10 +93,7 @@ class PwaOnboardingObserverTest {
 
         store.dispatch(ContentAction.UpdateWebAppManifestAction("1", mockk())).joinBlocking()
         verify { settings.incrementVisitedInstallableCount() }
-        verify { navigationController.nav(
+        verify { pwaOnboardingObserver.navigateToPwaOnboarding() }
-            R.id.browserFragment,
-            BrowserFragmentDirections.actionBrowserFragmentToPwaOnboardingDialogFragment())
-        }
     }
 
     @Test
@@ -111,10 +105,7 @@ class PwaOnboardingObserverTest {
 
         store.dispatch(ContentAction.UpdateWebAppManifestAction("1", mockk())).joinBlocking()
         verify(exactly = 0) { settings.incrementVisitedInstallableCount() }
-        verify(exactly = 0) { navigationController.nav(
+        verify(exactly = 0) { pwaOnboardingObserver.navigateToPwaOnboarding() }
-            R.id.browserFragment,
-            BrowserFragmentDirections.actionBrowserFragmentToPwaOnboardingDialogFragment())
-        }
     }
 
     internal class MockedLifecycleOwner(initialState: Lifecycle.State) : LifecycleOwner {