fix: fix the exit method not working

arianrhodsandlot · Jan 23, 2025 · 8d12600 · 8d12600
1 parent f287b0c
commit 8d12600
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 6 deletions.
diff --git a/playground/activate.ts b/playground/activate.ts
@@ -106,6 +106,10 @@ const handlers = {
   exit() {
     nostalgist.exit()
   },
+
+  exitWithoutRemovingCanvas() {
+    nostalgist.exit({ removeCanvas: false })
+  },
 }
 
 export function activate(mod: typeof Nostalgist_) {

diff --git a/playground/index.html b/playground/index.html
@@ -64,6 +64,7 @@ <h3>Instance Methods</h3>
       <button type="button">pressStart</button>
       <button type="button">screenshot</button>
       <button type="button">exit</button>
+      <button type="button">exitWithoutRemovingCanvas</button>
     </div>
 
     <script type="module">

diff --git a/src/classes/emulator-file-system.ts b/src/classes/emulator-file-system.ts
@@ -62,10 +62,6 @@ export class EmulatorFileSystem {
     return emulatorFileSystem
   }
 
-  dispose() {
-    this.FS.unmount('/home')
-  }
-
   mkdirTree(directory: string) {
     const { FS } = this
     FS.mkdirTree(directory)

diff --git a/src/classes/emulator.ts b/src/classes/emulator.ts
@@ -83,8 +83,6 @@ export class Emulator {
       exit(statusCode)
       JSEvents.removeAllEventListeners()
     } catch {}
-
-    this.fs.dispose()
   }
 
   getEmscripten() {

diff --git a/tests/e2e/instance-ra-common.ts b/tests/e2e/instance-ra-common.ts
@@ -116,4 +116,30 @@ export function tests() {
     await page.getByText('screenshot', { exact: true }).click()
     await expect(screenshot).toHaveScreenshot('screenshot.png')
   })
+
+  test('exit', async ({ page }) => {
+    const canvas = page.locator('#canvas')
+    await expect(canvas).not.toBeAttached()
+
+    await page.getByText('nes', { exact: true }).click()
+    await page.waitForLoadState('networkidle')
+    await page.waitForTimeout(500)
+    await expect(canvas).toBeAttached()
+
+    await page.getByText('exit', { exact: true }).click()
+    await expect(canvas).not.toBeAttached()
+  })
+
+  test('exit without removing the canvas', async ({ page }) => {
+    const canvas = page.locator('#canvas')
+    await expect(canvas).not.toBeAttached()
+
+    await page.getByText('nes', { exact: true }).click()
+    await page.waitForLoadState('networkidle')
+    await page.waitForTimeout(500)
+    await expect(canvas).toBeAttached()
+
+    await page.getByText('exitWithoutRemovingCanvas', { exact: true }).click()
+    await expect(canvas).toBeAttached()
+  })
 }