fix failing on finishing

This commit is contained in:
Annie Huang committed 2023-12-03 21:30:34 +08:00
1 parent 10ac3c720e
commit d0b179108a
2 files changed
+4 -14

No files matched your search

+1 -1
View File
@@ -2,4 +2,4 @@ echo start
ls ls
cat file1.txt cat file1.txt
ls folder ls folder
cat folder/file1.txt cat folder/file.txt
+3 -13
View File
@@ -39,7 +39,7 @@ Cypress.Commands.add('InitTerminal', () => {
}) })
Cypress.Commands.add('typeInCommand', (command) => { Cypress.Commands.add('typeInCommand', (command) => {
cy.get('.xterm-screen', { timeout: 150000 }).type(command, { cy.get('.xterm-screen', { timeout: 150000 }).type(command, {
delay: 100, delay: 60,
}) })
}) })
Cypress.Commands.add('getQuestInfo', (id) => { Cypress.Commands.add('getQuestInfo', (id) => {
@@ -66,23 +66,13 @@ Cypress.Commands.add('waitUntilActive', () => {
cy.log('story ends') cy.log('story ends')
return return
} }
cy.typeInCommand('{enter}')
cy.waitUntilActive()
})
})
Cypress.Commands.add('checkFinished', () => {
cy.get('input[id="currentStatus"]', { timeout: 1000000 })
.invoke('val')
.then((value) => {
if (value === 'finished') { if (value === 'finished') {
cy.log(value)
cy.log('Quest Finished') cy.log('Quest Finished')
return return
} }
if (value === 'pending') { if (value === 'pending') {
cy.log(value)
cy.typeInCommand('{enter}') cy.typeInCommand('{enter}')
cy.checkFinished() cy.waitUntilActive()
} }
}) })
}) })
@@ -110,7 +100,7 @@ Cypress.Commands.add('CompleteStageWithCommands', (stagename) => {
cy.waitUntilActive() cy.waitUntilActive()
} }
if (answerarr.indexOf(element) + 1 === answerarr.length) { if (answerarr.indexOf(element) + 1 === answerarr.length) {
cy.checkFinished() cy.waitUntilActive()
cy.CheckTextElement('#QuestCompleted', '關卡完成!', 'Quest Completed!') cy.CheckTextElement('#QuestCompleted', '關卡完成!', 'Quest Completed!')
cy.get('div[class="modal"]').find('p').should('be.visible') cy.get('div[class="modal"]').find('p').should('be.visible')
cy.get('#BacktoMap').should('be.visible').and('contain', '回到地圖') cy.get('#BacktoMap').should('be.visible').and('contain', '回到地圖')