Performance improvements for the integration tests

integration-tests/cypress/e2e/healthcheck.cy.ts

@@ -8,7 +8,7 @@ describe("the healthcheck", () => {
     // wait until text on the start screen is visible
     cy.contains("If you see this text, Neovim is ready!")
 
-    cy.typeIntoTerminal(":checkhealth yazi{enter}")
+    cy.runExCommand({ command: "checkhealth yazi" })
 
     // the version of yazi.nvim itself should be shown
     cy.readFile("../.release-please-manifest.json").then(

integration-tests/cypress/e2e/using-ya-to-read-events/hover-highlights.cy.ts

@@ -221,18 +221,18 @@ describe("highlighting the buffer with 'hover' events", () => {
       )
 
       cy.typeIntoTerminal("q")
-      cy.typeIntoTerminal(":messages{enter}")
-
-      // Hovering a new file should have triggered the integration
-      //
-      // the main message from the integration in the
-      // startupScriptModifications script should be visible. Check the file
-      // to see the full integration.
-      cy.contains("Just received a YaziDDSHover event!")
-
-      // some event data should be visible. See the lua type YaziHoverEvent for
-      // the structure
-      cy.contains(`type = "hover"`)
+      cy.runExCommand({ command: "messages" }).then((result) => {
+        // Hovering a new file should have triggered the integration
+        //
+        // the main message from the integration in the
+        // startupScriptModifications script should be visible. Check the file
+        // to see the full integration.
+        expect(result.value).to.contain("Just received a YaziDDSHover event!")
+
+        // some event data should be visible. See the lua type YaziHoverEvent for
+        // the structure
+        expect(result.value).to.contain(`type = "hover"`)
+      })
     })
   })
 

integration-tests/cypress/e2e/using-ya-to-read-events/integrations.cy.ts

@@ -57,7 +57,7 @@ describe("grug-far integration (search and replace)", () => {
       cy.typeIntoTerminal("{esc}")
 
       // close the split on the right so we can get some more space
-      cy.typeIntoTerminal(":only{enter}")
+      cy.runExCommand({ command: "only" })
 
       // the selected files should be visible in the view, used as the files to
       // whitelist into the search and replace operation

integration-tests/cypress/e2e/using-ya-to-read-events/opening-directories.cy.ts

@@ -34,8 +34,9 @@ describe("opening directories", () => {
       cy.typeIntoTerminal("q")
       cy.contains("-- TERMINAL --").should("not.exist")
 
-      cy.typeIntoTerminal(":CountBuffers{enter}")
-      cy.contains("Number of open buffers: 2")
+      cy.runExCommand({ command: "CountBuffers" }).then((result) => {
+        expect(result.value).to.equal("Number of open buffers: 2")
+      })
     })
   })
 

integration-tests/cypress/e2e/using-ya-to-read-events/opening-files.cy.ts

@@ -1,3 +1,4 @@
+import type { MyTestDirectoryFile } from "MyTestDirectory"
 import {
   isFileNotSelectedInYazi,
   isFileSelectedInYazi,
@@ -84,7 +85,7 @@ describe("opening files", () => {
         // match some text from inside the file
         "Hello",
       )
-      cy.typeIntoTerminal(":tabnext{enter}")
+      cy.runExCommand({ command: "tabnext" })
 
       cy.contains("If you see this text, Neovim is ready!")
 
@@ -174,9 +175,9 @@ describe("opening files", () => {
         cy.typeIntoTerminal("q")
 
         // the file should now be renamed - ask neovim to confirm this
-        cy.typeIntoTerminal(":buffers{enter}")
-
-        cy.contains("renamed-file.txt")
+        cy.runExCommand({ command: "buffers" }).then((result) => {
+          expect(result.value).to.contain("renamed-file.txt")
+        })
       })
     })
   })
@@ -260,9 +261,11 @@ describe("opening files", () => {
       // the file to verify this.
       // NOTE: the test-setup configures the `"` register to be the clipboard
       cy.typeIntoTerminal("o{enter}{esc}")
-      cy.typeIntoTerminal(':normal ""p{enter}')
-
-      cy.contains("routes/posts.$postId/adjacent-file.txt")
+      cy.runLuaCode({ luaCode: `return vim.fn.getreg('"')` }).then((result) => {
+        expect(result.value).to.contain(
+          "routes/posts.$postId/adjacent-file.txt" satisfies MyTestDirectoryFile,
+        )
+      })
     })
   })
 
@@ -299,12 +302,17 @@ describe("opening files", () => {
       // the file to verify this.
       // NOTE: the test-setup configures the `"` register to be the clipboard
       cy.typeIntoTerminal("o{enter}{esc}")
-      cy.typeIntoTerminal(':normal ""p{enter}')
-
-      // all selected files should now be visible
-      cy.contains("routes/posts.$postId/adjacent-file.txt")
-      cy.contains("routes/posts.$postId/route.tsx")
-      cy.contains("routes/posts.$postId/adjacent-file.txt")
+      cy.runLuaCode({ luaCode: `return vim.fn.getreg('"')` }).then((result) => {
+        expect(result.value).to.eql(
+          (
+            [
+              "routes/posts.$postId/adjacent-file.txt",
+              "routes/posts.$postId/route.tsx",
+              "routes/posts.$postId/should-be-excluded-file.txt",
+            ] satisfies MyTestDirectoryFile[]
+          ).join("\n"),
+        )
+      })
     })
   })
 
@@ -319,11 +327,14 @@ describe("opening files", () => {
       cy.typeIntoTerminal("{control+a}")
       cy.typeIntoTerminal("{enter}")
 
-      cy.typeIntoTerminal(":buffers{enter}")
-
-      // all files should now be visible
-      cy.contains("dir with spaces/file1.txt")
-      cy.contains("dir with spaces/file2.txt")
+      cy.runExCommand({ command: "buffers" }).then((result) => {
+        expect(result.value).to.match(
+          new RegExp("dir with spaces/file1.txt" satisfies MyTestDirectoryFile),
+        )
+        expect(result.value).to.match(
+          new RegExp("dir with spaces/file2.txt" satisfies MyTestDirectoryFile),
+        )
+      })
     })
   })
 

integration-tests/cypress/support/tui-sandbox.ts

@@ -2,9 +2,15 @@
 //
 // This file is autogenerated by tui-sandbox. Do not edit it directly.
 //
-import type { BlockingCommandClientInput } from "@tui-sandbox/library/dist/src/server/server"
+import type {
+  BlockingCommandClientInput,
+  ExCommandClientInput,
+  LuaCodeClientInput,
+} from "@tui-sandbox/library/dist/src/server/server"
 import type {
   BlockingShellCommandOutput,
+  RunExCommandOutput,
+  RunLuaCodeOutput,
   StartNeovimGenericArguments,
 } from "@tui-sandbox/library/dist/src/server/types"
 import type { OverrideProperties } from "type-fest"
@@ -26,6 +32,8 @@ declare global {
     runBlockingShellCommand(
       input: BlockingCommandClientInput,
     ): Promise<BlockingShellCommandOutput>
+    runLuaCode(input: LuaCodeClientInput): Promise<RunLuaCodeOutput>
+    runExCommand(input: ExCommandClientInput): Promise<RunExCommandOutput>
   }
 }
 
@@ -69,6 +77,18 @@ Cypress.Commands.add(
   },
 )
 
+Cypress.Commands.add("runLuaCode", (input: LuaCodeClientInput) => {
+  cy.window().then(async (win) => {
+    return await win.runLuaCode(input)
+  })
+})
+
+Cypress.Commands.add("runExCommand", (input: ExCommandClientInput) => {
+  cy.window().then(async (win) => {
+    return await win.runExCommand(input)
+  })
+})
+
 before(function () {
   // disable Cypress's default behavior of logging all XMLHttpRequests and
   // fetches to the Command Log
@@ -93,6 +113,10 @@ declare global {
       runBlockingShellCommand(
         input: BlockingCommandClientInput,
       ): Chainable<BlockingShellCommandOutput>
+
+      runLuaCode(input: LuaCodeClientInput): Chainable<RunLuaCodeOutput>
+
+      runExCommand(input: ExCommandClientInput): Chainable<RunExCommandOutput>
     }
   }
 }

integration-tests/eslint.config.mjs

@@ -20,6 +20,7 @@ export default [
       "**/test-environment/",
       "eslint.config.mjs",
       "dist/",
+      "cypress/support/tui-sandbox.ts",
     ],
   },
   ...compat.extends(

integration-tests/package.json

@@ -5,7 +5,7 @@
   "type": "module",
   "scripts": {
     "cy:run": "concurrently --success command-cypress --kill-others --names 'app,cypress' --prefix-colors 'blue,yellow' 'pnpm tui start'  'wait-on --timeout 60000 http://127.0.0.1:3000 && npx cypress run'",
-    "dev": "concurrently --kill-others --names 'app,cypress' --prefix-colors 'blue,yellow' 'pnpm tui start'  'pnpm cypress open --e2e'",
+    "dev": "concurrently --kill-others --names 'app,cypress' --prefix-colors 'blue,yellow' 'pnpm tui start'  'pnpm cypress open --e2e --browser=electron'",
     "eslint": "eslint --max-warnings=0 ."
   },
   "dependencies": {
@@ -15,7 +15,7 @@
     "zod": "3.23.8"
   },
   "devDependencies": {
-    "@tui-sandbox/library": "6.1.0",
+    "@tui-sandbox/library": "7.2.0",
     "@types/node": "22.9.1",
     "@types/tinycolor2": "1.4.6",
     "@typescript-eslint/eslint-plugin": "8.15.0",
@@ -27,6 +27,6 @@
     "prettier-plugin-organize-imports": "4.1.0",
     "tinycolor2": "1.6.0",
     "type-fest": "4.27.0",
-    "typescript": "5.6.3"
+    "typescript": "5.7.2"
   }
 }

package.json

@@ -16,7 +16,7 @@
     "@umbrelladocs/linkspector": "0.3.13",
     "markdownlint-cli2": "0.15.0",
     "prettier": "3.3.3",
-    "prettier-plugin-packagejson": "2.5.3"
+    "prettier-plugin-packagejson": "2.5.5"
   },
   "packageManager": "[email protected]"
 }