test: add test for level persistence

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

Hide file tree

Showing 3 changed files with 12 additions and 10 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();
 }

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', () => {