Merge remote-tracking branch 'upstream/master' into fix_5181

xtermjs · Oct 4, 2024 · d329893 · d329893
2 parents f9cf9b9 + a5fc111
commit d329893
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/addons/addon-web-links/test/WebLinksAddon.test.ts b/addons/addon-web-links/test/WebLinksAddon.test.ts
@@ -34,7 +34,10 @@ test.describe('WebLinksAddon', () => {
 
   test.beforeEach(async () => {
     await ctx.page.evaluate(`
-      window.term.reset()
+      window.term.reset();
+    `);
+    await timeout(50);
+    await ctx.page.evaluate(`
       window._linkaddon?.dispose();
       window._linkaddon = new WebLinksAddon();
       window.term.loadAddon(window._linkaddon);

diff --git a/bin/test_integration.js b/bin/test_integration.js
@@ -62,6 +62,8 @@ async function run() {
       console.error(run.error);
       process.exit(run.status ?? -1);
     }
+
+    process.exit(run.status);
   }
 }
 run();
diff --git a/test/playwright/Terminal.test.ts b/test/playwright/Terminal.test.ts
@@ -690,7 +690,7 @@ test.describe('API Integration Tests', () => {
       window.term = new Terminal();
       window.term.dispose();
     `);
-    strictEqual(await ctx.page.evaluate(`window.term._core._isDisposed`), true);
+    strictEqual(await ctx.page.evaluate(`window.term._core._store._isDisposed`), true);
   });
 
   test('dispose (opened)', async () => {
@@ -702,7 +702,7 @@ test.describe('API Integration Tests', () => {
         } catch {}
       }
     `);
-    strictEqual(await ctx.page.evaluate(`window.term._core._isDisposed`), true);
+    strictEqual(await ctx.page.evaluate(`window.term._core._store._isDisposed`), true);
   });
 
   test('render when visible after hidden', async () => {