-
Notifications
You must be signed in to change notification settings - Fork 5
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/cypress-e2e' into cypress-e2e
# Conflicts: # cypress.config.js # cypress/e2e/partner-admin/viewProgressReports.spec.cy.js # src/components/CreateOrgs.vue
- Loading branch information
Showing
35 changed files
with
1,122 additions
and
1,108 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,64 +1,62 @@ | ||
|
|
||
| export const games = [ | ||
| { | ||
| name: "ROAR Picture Vocabulary", | ||
| id: "vocab", | ||
| startBtn: ".jspsych-btn", | ||
| introBtn: ".continue", | ||
| introIters: 3, | ||
| numChoices: 3, | ||
| stimulus: "", | ||
| preChoiceDelay: 700, | ||
| setUpChoice: ".intro_aliens", | ||
| clickableItem: ".vocab_img", | ||
| numIter: 4, | ||
| }, | ||
| { | ||
| name: "ROAR Written Vocabulary", | ||
| id: "cva", | ||
| startBtn: ".jspsych-btn", | ||
| introBtn: ".go-button", | ||
| introIters: 2, | ||
| setupChoice: "", | ||
| stimulus: ".item-stimulus-cva", | ||
| preChoiceDelay: 1700, | ||
| clickableItem: "button", | ||
| correctChoice: ".glowingButton", | ||
| numIter: 4, | ||
| }, | ||
| { | ||
| name: "ROAR-Morphology", | ||
| id: "multichoice", | ||
| startBtn: ".jspsych-btn", | ||
| introBtn: ".go-button", | ||
| introIters: 3 , | ||
| numChoices: 3, | ||
| stimulus: ".item-stimulus", | ||
| clickableItem: "button", | ||
| preChoiceDelay: 1500, | ||
| setupChoice: "", | ||
| correctChoice: ".glowingButton", | ||
| numIter: 4, | ||
| }, | ||
| { | ||
| name: "Letter", | ||
| id: "letter", | ||
| startBtn: ".jspsych-btn", | ||
| introBtn: ".go-button", | ||
| introIters: 5, | ||
| correctChoice: ".glowingButton", | ||
| numChoices: 3, | ||
| stimulus: "", | ||
| setupChoice: "", | ||
| clickableItem: "button", | ||
| preChoiceDelay: 600, | ||
| numIter: 27, | ||
| }, | ||
| ] | ||
| { | ||
| name: 'ROAR Picture Vocabulary', | ||
| id: 'vocab', | ||
| startBtn: '.jspsych-btn', | ||
| introBtn: '.continue', | ||
| introIters: 3, | ||
| numChoices: 3, | ||
| stimulus: '', | ||
| preChoiceDelay: 700, | ||
| setUpChoice: '.intro_aliens', | ||
| clickableItem: '.vocab_img', | ||
| numIter: 4, | ||
| }, | ||
| { | ||
| name: 'ROAR Written Vocabulary', | ||
| id: 'cva', | ||
| startBtn: '.jspsych-btn', | ||
| introBtn: '.go-button', | ||
| introIters: 2, | ||
| setupChoice: '', | ||
| stimulus: '.item-stimulus-cva', | ||
| preChoiceDelay: 1700, | ||
| clickableItem: 'button', | ||
| correctChoice: '.glowingButton', | ||
| numIter: 4, | ||
| }, | ||
| { | ||
| name: 'ROAR-Morphology', | ||
| id: 'multichoice', | ||
| startBtn: '.jspsych-btn', | ||
| introBtn: '.go-button', | ||
| introIters: 3, | ||
| numChoices: 3, | ||
| stimulus: '.item-stimulus', | ||
| clickableItem: 'button', | ||
| preChoiceDelay: 1500, | ||
| setupChoice: '', | ||
| correctChoice: '.glowingButton', | ||
| numIter: 4, | ||
| }, | ||
| { | ||
| name: 'Letter', | ||
| id: 'letter', | ||
| startBtn: '.jspsych-btn', | ||
| introBtn: '.go-button', | ||
| introIters: 5, | ||
| correctChoice: '.glowingButton', | ||
| numChoices: 3, | ||
| stimulus: '', | ||
| setupChoice: '', | ||
| clickableItem: 'button', | ||
| preChoiceDelay: 600, | ||
| numIter: 27, | ||
| }, | ||
| ]; | ||
|
|
||
| // variant IDS | ||
| // vocab: VimH8oXM99UToXydiDK4 | ||
| // cva: 5OaEGDBHAxU4kSebvyix | ||
| // cva: 5OaEGDBHAxU4kSebvyix | ||
| // letter: E89L0yam9SJ9g5vDFzzr | ||
| // multichoice: UD9GC7PkVRX8oJvqysTL | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,15 +1,14 @@ | ||
| describe("Test to maintain that assent form shows in when signing in with an un-assented user", () => { | ||
| it("passes", () => { | ||
| // this is a user that has an assignment of roarVocab -- how can we create a user that can | ||
| // ALWAYS play the game | ||
| let test_login = "DO_NOT_ACCEPT_DOC"; | ||
| let test_pw = "passwordLEGAL"; | ||
| // how can we write some logic to reset the already played | ||
| cy.login(test_login, test_pw); | ||
| cy.visit("/") | ||
| cy.wait(1000) | ||
| cy.get(".p-dialog-title").contains("Assent Form").should("be.visible") | ||
| cy.get(".p-confirm-dialog-accept").contains("Continue").should("be.visible") | ||
|
|
||
| }); | ||
| describe('Test to maintain that assent form shows in when signing in with an un-assented user', () => { | ||
| it('passes', () => { | ||
| // this is a user that has an assignment of roarVocab -- how can we create a user that can | ||
| // ALWAYS play the game | ||
| let test_login = 'DO_NOT_ACCEPT_DOC'; | ||
| let test_pw = 'passwordLEGAL'; | ||
| // how can we write some logic to reset the already played | ||
| cy.login(test_login, test_pw); | ||
| cy.visit('/'); | ||
| cy.wait(1000); | ||
| cy.get('.p-dialog-title').contains('Assent Form').should('be.visible'); | ||
| cy.get('.p-confirm-dialog-accept').contains('Continue').should('be.visible'); | ||
| }); | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,17 +1,15 @@ | ||
| describe("Cypress test to login and play picture vocab as participant", () => { | ||
| it("passes", () => { | ||
| // this is a user that has an assignment of roarVocab -- how can we create a user that can | ||
| // ALWAYS play the game | ||
| let test_login = "testingUser4"; | ||
| let test_pw = "password4"; | ||
| // how can we write some logic to reset the already played | ||
| describe('Cypress test to login and play picture vocab as participant', () => { | ||
| it('passes', () => { | ||
| // this is a user that has an assignment of roarVocab -- how can we create a user that can | ||
| // ALWAYS play the game | ||
| // how can we write some logic to reset the already played | ||
|
|
||
| cy.login(test_login, test_pw); | ||
| cy.login(Cypress.env('participantUsername'), Cypress.env('participantPassword')); | ||
|
|
||
| cy.wait(1000); | ||
| cy.get("button").contains("Sign Out").click(); | ||
| cy.wait(1000); | ||
| cy.get('button').contains('Sign Out').click(); | ||
|
|
||
| // successfully back at Login page | ||
| cy.contains("Welcome to ROAR!") | ||
| }); | ||
| // successfully back at Login page | ||
| cy.contains('Welcome to ROAR!'); | ||
| }); | ||
| }); |
Oops, something went wrong.