fix(firefox): properly cleanup networkmanager (puppeteer#4024)

kiku-jw · Apr 6, 2019 · eb1184d · eb1184d
1 parent a5683fd
commit eb1184d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/experimental/puppeteer-firefox/lib/NetworkManager.js b/experimental/puppeteer-firefox/lib/NetworkManager.js
@@ -18,6 +18,10 @@ class NetworkManager extends EventEmitter {
     ];
   }
 
+  dispose() {
+    helper.removeEventListeners(this._eventListeners);
+  }
+
   setFrameManager(frameManager) {
     this._frameManager = frameManager;
   }
@@ -57,10 +61,6 @@ class NetworkManager extends EventEmitter {
       this._requests.delete(request._id);
     this.emit(Events.NetworkManager.RequestFinished, request);
   }
-
-  dispose() {
-    helper.removeEventListeners(this._eventListeners);
-  }
 }
 
 /**

diff --git a/experimental/puppeteer-firefox/lib/Page.js b/experimental/puppeteer-firefox/lib/Page.js
@@ -570,6 +570,7 @@ class Page extends EventEmitter {
   _onClosed() {
     this._isClosed = true;
     this._frameManager.dispose();
+    this._networkManager.dispose();
     helper.removeEventListeners(this._eventListeners);
     this.emit(Events.Page.Close);
   }

diff --git a/test/navigation.spec.js b/test/navigation.spec.js
@@ -256,7 +256,7 @@ module.exports.addTests = function({testRunner, expect, Errors, CHROME}) {
       process.removeListener('warning', warningHandler);
       expect(warning).toBe(null);
     });
-    it_fails_ffox('should not leak listeners during bad navigation', async({page, server}) => {
+    it('should not leak listeners during bad navigation', async({page, server}) => {
       let warning = null;
       const warningHandler = w => warning = w;
       process.on('warning', warningHandler);