fix(fullstack): tests broken on ubuntu

ulixee · Jan 11, 2022 · 7bd9ff9 · 7bd9ff9
1 parent d6dde28
commit 7bd9ff9
Show file tree

Hide file tree

Showing 13 changed files with 365 additions and 407 deletions.
diff --git a/core/injected-scripts/MouseEvents.ts b/core/injected-scripts/MouseEvents.ts
@@ -7,6 +7,10 @@ class MouseEvents {
   private static targetNodeId: number;
   private static containerOffset: { x: number; y: number } = { x: 0, y: 0 };
 
+  public static init() {
+    this.onMousedown = this.onMousedown.bind(this);
+  }
+
   public static listenFor(
     nodeId: number,
     containerOffset: { x: number; y: number },
@@ -32,10 +36,6 @@ class MouseEvents {
     return visibility;
   }
 
-  public static init() {
-    this.onMousedown = this.onMousedown.bind(this);
-  }
-
   public static didTrigger(nodeId: number) {
     try {
       if (this.targetNodeId !== nodeId) {

diff --git a/core/lib/GlobalPool.ts b/core/lib/GlobalPool.ts
@@ -90,6 +90,10 @@ export default class GlobalPool {
       closePromises.push(puppetBrowser.close().catch(err => err));
     }
     MitmProxy.close();
+    if (this.mitmStartPromise) {
+      this.mitmStartPromise.then(x => x.close()).catch(() => null);
+      this.mitmStartPromise = null;
+    }
     if (this.mitmServer) {
       this.mitmServer.close();
       this.mitmServer = null;