From 5c17f5ea3c5b1389b9aecd515d0b3dec0413b36d Mon Sep 17 00:00:00 2001
From: Annie Huang <annie.huang921002@gmail.com>
Date: Thu, 8 Feb 2024 17:49:05 +0800
Subject: [PATCH] typescript initial edit

---
 .../e2e/{UItests.cy.js => UItests.cy.ts}      |  1 -
 ...pleteQuests.cy.js => completeQuests.cy.ts} |  1 -
 .../support/{commands.js => commands.ts}      | 56 ++++++++++++++++---
 tests/package.json                            |  3 +
 tests/tsconfig.json                           |  8 +++
 yarn.lock                                     |  1 +
 6 files changed, 60 insertions(+), 10 deletions(-)
 rename tests/cypress/e2e/{UItests.cy.js => UItests.cy.ts} (99%)
 rename tests/cypress/e2e/{completeQuests.cy.js => completeQuests.cy.ts} (96%)
 rename tests/cypress/support/{commands.js => commands.ts} (70%)
 create mode 100644 tests/tsconfig.json

diff --git a/tests/cypress/e2e/UItests.cy.js b/tests/cypress/e2e/UItests.cy.ts
similarity index 99%
rename from tests/cypress/e2e/UItests.cy.js
rename to tests/cypress/e2e/UItests.cy.ts
index c2ecfd7..9d0050f 100644
--- a/tests/cypress/e2e/UItests.cy.js
+++ b/tests/cypress/e2e/UItests.cy.ts
@@ -1,4 +1,3 @@
-/// <reference types="cypress" />
 export default function checkLoginUI() {
   cy.get('#title').should('contain', 'Linux Odyssey').and('be.visible')
   cy.CheckPlaceholder('#password', '密碼', 'Password')
diff --git a/tests/cypress/e2e/completeQuests.cy.js b/tests/cypress/e2e/completeQuests.cy.ts
similarity index 96%
rename from tests/cypress/e2e/completeQuests.cy.js
rename to tests/cypress/e2e/completeQuests.cy.ts
index 3ef0aab..57ba8e2 100644
--- a/tests/cypress/e2e/completeQuests.cy.js
+++ b/tests/cypress/e2e/completeQuests.cy.ts
@@ -1,4 +1,3 @@
-/// <reference types="cypress" />
 describe('Complete quests with only commands', () => {
   beforeEach(() => {
     cy.PrepareForGame()
diff --git a/tests/cypress/support/commands.js b/tests/cypress/support/commands.ts
similarity index 70%
rename from tests/cypress/support/commands.js
rename to tests/cypress/support/commands.ts
index 9428779..eb62a5f 100644
--- a/tests/cypress/support/commands.js
+++ b/tests/cypress/support/commands.ts
@@ -1,12 +1,52 @@
-import '@testing-library/cypress/add-commands'
+// import '@testing-library/cypress/add-commands'
+declare global {
+  declare namespace Cypress {
+    interface Chainable {
+      // 確保你有正確的泛型參數
+      fillWith(
+        account: string,
+        password: string
+      ): Chainable<JQuery<HTMLElement>>
+      LoginWithPassword(
+        username: string,
+        password: string
+      ): Chainable<JQuery<HTMLElement>>
+      PrepareForGame(): Chainable<JQuery<HTMLElement>>
+      InitTerminal(): Chainable<JQuery<HTMLElement>>
+      typeInCommand(command: string): Chainable<JQuery<HTMLElement>>
+      getQuestInfo(id: string): Chainable<JQuery<HTMLElement>>
+      checkHint(index: number, total: number): Chainable<JQuery<HTMLElement>> // 修改類型
+      checkTaskInit(): Chainable<JQuery<HTMLElement>>
+      waitUntilActive(last: boolean): Chainable<JQuery<HTMLElement>> // 注意小寫boolean，並且變量名應該是小寫
+      checkPending(): Chainable<JQuery<HTMLElement>>
+      CompleteStageWithCommands(
+        stagename: string
+      ): Chainable<JQuery<HTMLElement>>
+      CheckTextElement(
+        id: string,
+        chText: string,
+        enText: string
+      ): Chainable<JQuery<HTMLElement>>
+      CheckPlaceholder(
+        id: string,
+        chText: string,
+        enText: string
+      ): Chainable<JQuery<HTMLElement>>
+      CheckTreeElement(element: string): Chainable<JQuery<HTMLElement>>
+    }
+  }
+}
 
-Cypress.Commands.add('LoginWithPassword', (username, password) => {
-  cy.clearAllCookies({ domain: null })
-  cy.visit('/login')
-  cy.get('#username').type(username)
-  cy.get('#password').type(password)
-  cy.get('#LogInOrSignUp').click()
-})
+Cypress.Commands.add(
+  'LoginWithPassword',
+  (username: string, password: string) => {
+    cy.clearAllCookies({ domain: null })
+    cy.visit('/login')
+    cy.get('#username').type(username)
+    cy.get('#password').type(password)
+    cy.get('#LogInOrSignUp').click()
+  }
+)
 Cypress.Commands.add('PrepareForGame', () => {
   cy.visit('/')
   // make sure the login page is loaded
diff --git a/tests/package.json b/tests/package.json
index 46b0294..68157d1 100644
--- a/tests/package.json
+++ b/tests/package.json
@@ -13,5 +13,8 @@
     "@testing-library/cypress": "^10.0.1",
     "cypress": "^13.5.1",
     "dotenv": "^16.3.1"
+  },
+  "devDependencies": {
+    "typescript": "^5.3.3"
   }
 }
diff --git a/tests/tsconfig.json b/tests/tsconfig.json
new file mode 100644
index 0000000..18edb19
--- /dev/null
+++ b/tests/tsconfig.json
@@ -0,0 +1,8 @@
+{
+  "compilerOptions": {
+    "target": "es5",
+    "lib": ["es5", "dom"],
+    "types": ["cypress", "node"]
+  },
+  "include": ["**/*.ts"]
+}
diff --git a/yarn.lock b/yarn.lock
index 81241b8..fe8624e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9098,6 +9098,7 @@ __metadata:
     "@testing-library/cypress": "npm:^10.0.1"
     cypress: "npm:^13.5.1"
     dotenv: "npm:^16.3.1"
+    typescript: "npm:^5.3.3"
   languageName: unknown
   linkType: soft