mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

fix: BrowserWindow.fromBrowserView in multiple-BrowserView windows (#26493)

Browse source
This commit is contained in:
Jeremy Rose 2020-11-17 11:12:02 -08:00 • committed by GitHub
parent 040ee66678
commit 7c2ac6b7c1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

18
spec-main/api-browser-window-spec.ts
View file

@ -1634,7 +1634,7 @@ describe('BrowserWindow module', () => {
describe('BrowserWindow.fromBrowserView(browserView)', () => {
afterEach(closeAllWindows);
it('returns the window with the browserView', () => {
it('returns the window with the BrowserView', () => {
const w = new BrowserWindow({ show: false });
const bv = new BrowserView();
w.setBrowserView(bv);
@ -1645,6 +1645,22 @@ describe('BrowserWindow module', () => {
expect(BrowserWindow.fromBrowserView(bv)!.id).to.equal(w.id);
});
it('returns the window when there are multiple BrowserViews', () => {
const w = new BrowserWindow({ show: false });
const bv1 = new BrowserView();
w.addBrowserView(bv1);
const bv2 = new BrowserView();
w.addBrowserView(bv2);
defer(() => {
w.removeBrowserView(bv1);
w.removeBrowserView(bv2);
(bv1.webContents as any).destroy();
(bv2.webContents as any).destroy();
});
expect(BrowserWindow.fromBrowserView(bv1)!.id).to.equal(w.id);
expect(BrowserWindow.fromBrowserView(bv2)!.id).to.equal(w.id);
});
it('returns undefined if not attached', () => {
const bv = new BrowserView();
defer(() => {