diff --git a/quests/read/answer.sh b/quests/read/answer.sh index fa233b9..c70c380 100644 --- a/quests/read/answer.sh +++ b/quests/read/answer.sh @@ -2,4 +2,4 @@ echo start ls cat file1.txt ls folder -cat folder/file1.txt \ No newline at end of file +cat folder/file.txt \ No newline at end of file diff --git a/tests/cypress/support/commands.js b/tests/cypress/support/commands.js index 1bc13fa..99a83dd 100644 --- a/tests/cypress/support/commands.js +++ b/tests/cypress/support/commands.js @@ -39,7 +39,7 @@ Cypress.Commands.add('InitTerminal', () => { }) Cypress.Commands.add('typeInCommand', (command) => { cy.get('.xterm-screen', { timeout: 150000 }).type(command, { - delay: 100, + delay: 60, }) }) Cypress.Commands.add('getQuestInfo', (id) => { @@ -66,23 +66,13 @@ Cypress.Commands.add('waitUntilActive', () => { cy.log('story ends') return } - cy.typeInCommand('{enter}') - cy.waitUntilActive() - }) -}) -Cypress.Commands.add('checkFinished', () => { - cy.get('input[id="currentStatus"]', { timeout: 1000000 }) - .invoke('val') - .then((value) => { if (value === 'finished') { - cy.log(value) cy.log('Quest Finished') return } if (value === 'pending') { - cy.log(value) cy.typeInCommand('{enter}') - cy.checkFinished() + cy.waitUntilActive() } }) }) @@ -110,7 +100,7 @@ Cypress.Commands.add('CompleteStageWithCommands', (stagename) => { cy.waitUntilActive() } if (answerarr.indexOf(element) + 1 === answerarr.length) { - cy.checkFinished() + cy.waitUntilActive() cy.CheckTextElement('#QuestCompleted', '關卡完成!', 'Quest Completed!') cy.get('div[class="modal"]').find('p').should('be.visible') cy.get('#BacktoMap').should('be.visible').and('contain', '回到地圖')