Allow SessionUseCases to be invoked with session ID

mozilla-mobile · Feb 15, 2021 · 4a649aa · 4a649aa
1 parent c25f24b
commit 4a649aa
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 3 deletions.
diff --git a/...nents/feature/session/src/main/java/mozilla/components/feature/session/SessionUseCases.kt b/...nents/feature/session/src/main/java/mozilla/components/feature/session/SessionUseCases.kt
@@ -173,7 +173,16 @@ class SessionUseCases(
                 return
             }
 
-            store.state.findTabOrCustomTab(session.id)
+            invoke(session.id)
+        }
+
+        /**
+         * Stops the current URL of the provided session from loading.
+         *
+         * @param sessionId the ID of the session for which loading should be stopped.
+         */
+        operator fun invoke(sessionId: String) {
+            store.state.findTabOrCustomTab(sessionId)
                 ?.engineState
                 ?.engineSession
                 ?.stopLoading()
@@ -219,8 +228,15 @@ class SessionUseCases(
                 return
             }
 
+            invoke(session.id)
+        }
+
+        /**
+         * Navigates forward in the history of the provided session.
+         */
+        operator fun invoke(sessionId: String) {
             store.dispatch(EngineAction.GoForwardAction(
-                session.id
+                sessionId
             ))
         }
     }
@@ -293,8 +309,15 @@ class SessionUseCases(
                 return
             }
 
+            invoke(enable, session.id)
+        }
+
+        /**
+         * Requests the desktop version of the provides session and reloads the page.
+         */
+        operator fun invoke(enable: Boolean, sessionId: String) {
             store.dispatch(EngineAction.ToggleDesktopModeAction(
-                session.id,
+                sessionId,
                 enable
             ))
         }

diff --git a/...s/feature/session/src/test/java/mozilla/components/feature/session/SessionUseCasesTest.kt b/...s/feature/session/src/test/java/mozilla/components/feature/session/SessionUseCasesTest.kt
@@ -45,6 +45,7 @@ class SessionUseCasesTest {
         whenever(selectedSession.id).thenReturn(selectedSessionId)
         whenever(sessionManager.selectedSessionOrThrow).thenReturn(selectedSession)
         whenever(sessionManager.selectedSession).thenReturn(selectedSession)
+        whenever(sessionManager.findSessionById(selectedSessionId)).thenReturn(selectedSession)
     }
 
     @Test
@@ -136,6 +137,9 @@ class SessionUseCasesTest {
 
         useCases.stopLoading(selectedSession)
         verify(engineSession, times(2)).stopLoading()
+
+        useCases.stopLoading(selectedSession.id)
+        verify(engineSession, times(3)).stopLoading()
     }
 
     @Test
@@ -148,6 +152,9 @@ class SessionUseCasesTest {
 
         useCases.goBack()
         verify(store, times(2)).dispatch(EngineAction.GoBackAction(selectedSessionId))
+
+        useCases.goBack(selectedSession.id)
+        verify(store, times(3)).dispatch(EngineAction.GoBackAction(selectedSessionId))
     }
 
     @Test
@@ -160,6 +167,9 @@ class SessionUseCasesTest {
 
         useCases.goForward()
         verify(store, times(2)).dispatch(EngineAction.GoForwardAction(selectedSessionId))
+
+        useCases.goForward(selectedSession.id)
+        verify(store, times(3)).dispatch(EngineAction.GoForwardAction(selectedSessionId))
     }
 
     @Test
@@ -187,6 +197,12 @@ class SessionUseCasesTest {
 
         useCases.requestDesktopSite(false)
         verify(store).dispatch(EngineAction.ToggleDesktopModeAction(selectedSessionId, false))
+
+        useCases.requestDesktopSite(true, selectedSessionId)
+        verify(store, times(2)).dispatch(EngineAction.ToggleDesktopModeAction(selectedSessionId, true))
+
+        useCases.requestDesktopSite(false, selectedSessionId)
+        verify(store, times(2)).dispatch(EngineAction.ToggleDesktopModeAction(selectedSessionId, false))
     }
 
     @Test