Merge branch 'main' into quest

tests/cypress/e2e/helloworld.cy.js

@@ -79,7 +79,7 @@ describe('example helloworld app', () => {
       cy.PrepareForGame()
     })
     it('Check Header', () => {
-      cy.get('#HeaderText').should('contain', title).and('be.visible')
+      cy.get('#HeaderText').should('contain', 'Linux Odyssey').and('be.visible')
       cy.findByRole('link', { name: 'Bug Report' }).should('be.visible')
       cy.findByRole('button', { name: 'Sign Out' }).should('be.visible')
     })
@@ -123,8 +123,8 @@ describe('example helloworld app', () => {
     it('Typing in Terminal', () => {
       cy.typeInCommand('12345{enter}')
       cy.get('@Terminaltextbox')
-        .should('contain', 'zsh: command not found: 12345')
-        .and('contain', '12345')
+        .should('contain', '12345')
+        .and('contain', 'zsh: command not found: 12345', { timeout: 50000 })
     })
     it('Complete the Game(relating UI)', () => {
       // Stage1

tests/cypress/support/commands.js

@@ -9,12 +9,19 @@ Cypress.Commands.add('LoginWithPassword', (username, password) => {
 })
 Cypress.Commands.add('PrepareForGame', () => {
   cy.visit('/')
+  // make sure the login page is loaded
+  cy.url().should('satisfy', (elements) => {
+    const text = elements
+    return text.includes('login') || text.includes('register')
+  })
   cy.LoginWithPassword(
     Cypress.env('defaultAccount'),
     Cypress.env('defaultPassword')
   )
+  // make sure the map page is loaded
   cy.url().should('include', '/map')
   cy.visit('/game/get-started')
+  cy.url().should('include', '/game/get-started')
   cy.get('.xterm-screen', { timeout: 10000 })
     .as('Terminaltextbox')
     .should('be.visible')
@@ -24,10 +31,6 @@ Cypress.Commands.add('PrepareForGame', () => {
     'contain',
     'commander:~ $'
   )
-  cy.get('@Terminaltextbox', { timeout: 150000 }).should(
-    'contain',
-    'commander:~ $'
-  )
 })
 Cypress.Commands.add('typeInCommand', (command) => {
   cy.get('.xterm-screen', { timeout: 150000 }).type(command)