test: add test for level persistence

electron · Jun 22, 2021 · fd6b251 · fd6b251
1 parent bf37970
commit fd6b251
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 16 deletions.
diff --git a/shell/browser/api/electron_api_base_window.cc b/shell/browser/api/electron_api_base_window.cc
@@ -563,10 +563,6 @@ std::string BaseWindow::GetAlwaysOnTopLevel() {
   return window_->GetAlwaysOnTopLevel();
 }
 
-int BaseWindow::GetZOrderLevel() {
-  return static_cast<int>(window_->GetZOrderLevel());
-}
-
 void BaseWindow::Center() {
   window_->Center();
 }
@@ -1234,8 +1230,6 @@ void BaseWindow::BuildPrototype(v8::Isolate* isolate,
       .SetMethod("isClosable", &BaseWindow::IsClosable)
       .SetMethod("setAlwaysOnTop", &BaseWindow::SetAlwaysOnTop)
       .SetMethod("isAlwaysOnTop", &BaseWindow::IsAlwaysOnTop)
-      .SetMethod("getAlwaysOnTopLevel", &BaseWindow::GetAlwaysOnTopLevel)
-      .SetMethod("getZOrderLevel", &BaseWindow::GetZOrderLevel)
       .SetMethod("center", &BaseWindow::Center)
       .SetMethod("setPosition", &BaseWindow::SetPosition)
       .SetMethod("getPosition", &BaseWindow::GetPosition)
@@ -1280,16 +1274,21 @@ void BaseWindow::BuildPrototype(v8::Isolate* isolate,
                  &BaseWindow::SetVisibleOnAllWorkspaces)
       .SetMethod("isVisibleOnAllWorkspaces",
                  &BaseWindow::IsVisibleOnAllWorkspaces)
-      .SetMethod("setVibrancy", &BaseWindow::SetVibrancy)
-      .SetMethod("_setTouchBarItems", &BaseWindow::SetTouchBar)
-      .SetMethod("_refreshTouchBarItem", &BaseWindow::RefreshTouchBarItem)
-      .SetMethod("_setEscapeTouchBarItem", &BaseWindow::SetEscapeTouchBarItem)
 #if defined(OS_MAC)
+      .SetMethod("getAlwaysOnTopLevel", &BaseWindow::GetAlwaysOnTopLevel)
       .SetMethod("setAutoHideCursor", &BaseWindow::SetAutoHideCursor)
+#endif
+      .SetMethod("setVibrancy", &BaseWindow::SetVibrancy)
+#if defined(OS_MAC)
       .SetMethod("setTrafficLightPosition",
                  &BaseWindow::SetTrafficLightPosition)
       .SetMethod("getTrafficLightPosition",
                  &BaseWindow::GetTrafficLightPosition)
+#endif
+      .SetMethod("_setTouchBarItems", &BaseWindow::SetTouchBar)
+      .SetMethod("_refreshTouchBarItem", &BaseWindow::RefreshTouchBarItem)
+      .SetMethod("_setEscapeTouchBarItem", &BaseWindow::SetEscapeTouchBarItem)
+#if defined(OS_MAC)
       .SetMethod("selectPreviousTab", &BaseWindow::SelectPreviousTab)
       .SetMethod("selectNextTab", &BaseWindow::SelectNextTab)
       .SetMethod("mergeAllWindows", &BaseWindow::MergeAllWindows)

diff --git a/shell/browser/api/electron_api_base_window.h b/shell/browser/api/electron_api_base_window.h
@@ -143,7 +143,6 @@ class BaseWindow : public gin_helper::TrackableObject<BaseWindow>,
   void SetAlwaysOnTop(bool top, gin_helper::Arguments* args);
   bool IsAlwaysOnTop();
   std::string GetAlwaysOnTopLevel();
-  int GetZOrderLevel();
   void Center();
   void SetPosition(int x, int y, gin_helper::Arguments* args);
   std::vector<int> GetPosition();

diff --git a/spec-main/api-browser-window-spec.ts b/spec-main/api-browser-window-spec.ts
@@ -1430,15 +1430,12 @@ describe('BrowserWindow module', () => {
   describe('BrowserWindow.setAlwaysOnTop(flag, level)', () => {
     let w = null as unknown as BrowserWindow;
 
+    afterEach(closeAllWindows);
+
     beforeEach(() => {
       w = new BrowserWindow({ show: true });
     });
 
-    afterEach(async () => {
-      await closeWindow(w);
-      w = null as unknown as BrowserWindow;
-    });
-
     it('sets the window as always on top', () => {
       expect(w.isAlwaysOnTop()).to.be.false('is alwaysOnTop');
       w.setAlwaysOnTop(true, 'screen-saver');
@@ -1466,6 +1463,16 @@ describe('BrowserWindow module', () => {
       const [, alwaysOnTop] = await alwaysOnTopChanged;
       expect(alwaysOnTop).to.be.true('is not alwaysOnTop');
     });
+
+    ifit(process.platform === 'darwin')('honors the alwaysOnTop level of a child window', () => {
+      w = new BrowserWindow({ show: false });
+      const c = new BrowserWindow({ parent: w });
+      c.setAlwaysOnTop(true, 'screen-saver');
+
+      expect(w.isAlwaysOnTop()).to.be.false();
+      expect(c.isAlwaysOnTop()).to.be.true('child is not always on top');
+      expect((c as any).getAlwaysOnTopLevel()).to.equal('screen-saver');
+    });
   });
 
   describe('preconnect feature', () => {