1 files changed, 144 insertions, 0 deletions
diff --git a/browser/components/sessionstore/test/marionette/test_restore_manually.py b/browser/components/sessionstore/test/marionette/test_restore_manually.py
new file mode 100644
index 0000000000..e3c0a83607
--- /dev/null
+++ b/browser/components/sessionstore/test/marionette/test_restore_manually.py
@@ -0,0 +1,144 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+import os
+import sys
+
+# add this directory to the path
+sys.path.append(os.path.dirname(__file__))
+
+from session_store_test_case import SessionStoreTestCase
+
+
+def inline(title):
+    return "data:text/html;charset=utf-8,<html><head><title>{}</title></head><body></body></html>".format(
+        title
+    )
+
+
+class TestSessionRestoreManually(SessionStoreTestCase):
+    """
+    Test that window attributes for each window are restored
+    correctly (with manual session restore) in a new session.
+    """
+
+    def setUp(self):
+        super(TestSessionRestoreManually, self).setUp(
+            startup_page=1,
+            include_private=False,
+            restore_on_demand=True,
+            test_windows=set(
+                [
+                    # Window 1
+                    (
+                        inline("lorem ipsom"),
+                        inline("dolor"),
+                    ),
+                    # Window 2
+                    (inline("sit"),),
+                ]
+            ),
+        )
+
+    def test_restore(self):
+        self.marionette.execute_script(
+            """
+            Services.prefs.setBoolPref("browser.sessionstore.persist_closed_tabs_between_sessions", true);
+            """
+        )
+
+        self.wait_for_windows(
+            self.all_windows, "Not all requested windows have been opened"
+        )
+
+        self.assertEqual(
+            len(self.marionette.chrome_window_handles),
+            2,
+            msg="Should have 3 windows open.",
+        )
+        self.marionette.execute_async_script(
+            """
+            function getAllBrowserWindows() {
+                return Array.from(Services.wm.getEnumerator("navigator:browser"));
+            }
+            function promiseResize(value, win) {
+                let deferred = Promise.withResolvers();
+                let id;
+                function listener() {
+                    win.clearTimeout(id);
+                    if (win.innerWidth <= value) {
+                        id = win.setTimeout(() => {
+                            win.removeEventListener("resize", listener);
+                            deferred.resolve()
+                        }, 100);
+                    }
+                }
+                if (win.innerWidth > value) {
+                    win.addEventListener("resize", listener);
+                    win.resizeTo(value, value);
+                } else {
+                    deferred.resolve()
+                }
+                return deferred.promise;
+            }
+
+            let resolve = arguments[0];
+            let windows = getAllBrowserWindows();
+            let value = 500;
+            promiseResize(value, windows[1]).then(resolve);
+            """
+        )
+
+        self.marionette.quit()
+        self.marionette.start_session()
+        self.marionette.set_context("chrome")
+
+        # restore the previous session
+        self.marionette.execute_script(
+            """
+            const lazy = {};
+            ChromeUtils.defineESModuleGetters(lazy, {
+                SessionStore: "resource:///modules/sessionstore/SessionStore.sys.mjs",
+            });
+            function observeClosedObjectsChange() {
+                return new Promise(resolve => {
+                    function observe(subject, topic, data) {
+                        if (topic == "sessionstore-closed-objects-changed") {
+                            Services.obs.removeObserver(this, "sessionstore-closed-objects-changed");
+                            resolve('observed closed objects changed');
+                        };
+                    }
+                    Services.obs.addObserver(observe, "sessionstore-closed-objects-changed");
+                });
+            };
+
+            async function checkForWindowHeight() {
+                let closedWindowsObserver = observeClosedObjectsChange();
+                lazy.SessionStore.restoreLastSession();
+                await closedWindowsObserver;
+            }
+            checkForWindowHeight();
+            """
+        )
+
+        self.assertEqual(
+            len(self.marionette.chrome_window_handles),
+            2,
+            msg="Windows from last session have been restored.",
+        )
+
+        self.assertEqual(
+            self.marionette.execute_script(
+                """
+                const lazy = {};
+                ChromeUtils.defineESModuleGetters(lazy, {
+                    SessionStore: "resource:///modules/sessionstore/SessionStore.sys.mjs",
+                });
+                let state = SessionStore.getCurrentState()
+                return state.windows[1]["height"]
+                """
+            ),
+            500,
+            "Second window has been restored to the correct height.",
+        )