forked from Doenet/DoenetTools
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Squashed commit of the following: commit c2f29cc Merge: 9d23ae5 7cab3f6 Author: Kevin Charles <[email protected]> Date: Fri Apr 7 13:37:58 2023 -0500 Merge pull request Doenet#5 from Lyanthropos/deployVite2 update with vite-bugfix commit 7cab3f6 Merge: cfd2ab8 9d23ae5 Author: Emilio Alvarez <[email protected]> Date: Fri Apr 7 13:07:17 2023 -0500 Merge remote-tracking branch 'Kevin/deployVite2' into deployVite2 commit cfd2ab8 Merge: 7001361 33c4426 Author: Emilio Alvarez <[email protected]> Date: Fri Apr 7 18:06:55 2023 +0000 Merge remote-tracking branch 'Emilio/vite-bugfix' into deployVite2 commit 33c4426 Author: Emilio Alvarez <[email protected]> Date: Fri Apr 7 17:25:24 2023 +0000 increase default node space size commit 0875f63 Author: Emilio Alvarez <[email protected]> Date: Fri Apr 7 17:04:13 2023 +0000 move geogebra to public (references) commit 6c191f8 Author: Emilio Alvarez <[email protected]> Date: Fri Apr 7 17:03:48 2023 +0000 move geogebra to public (files) commit e668f5a Author: Emilio Alvarez <[email protected]> Date: Fri Apr 7 17:00:22 2023 +0000 explicit worker module type commit 87fc436 Author: Emilio Alvarez <[email protected]> Date: Fri Apr 7 00:59:05 2023 +0000 add cache to gitnore commit 578f693 Author: Emilio Alvarez <[email protected]> Date: Fri Apr 7 00:58:50 2023 +0000 update commands commit 825f7e5 Author: Emilio Alvarez <[email protected]> Date: Fri Apr 7 00:58:27 2023 +0000 add gnome-keyring commit 5012664 Merge: b6eabed 8c19893 Author: Emilio Alvarez <[email protected]> Date: Tue Apr 4 10:23:22 2023 -0500 Merge branch 'main' into vite-bugfix commit b6eabed Merge: a95e754 bd04a17 Author: Emilio Alvarez <[email protected]> Date: Tue Apr 4 15:19:21 2023 +0000 Merge remote-tracking branch 'Doenet/main' into vite-bugfix commit a95e754 Author: Emilio Alvarez <[email protected]> Date: Tue Apr 4 15:18:55 2023 +0000 inlcude plotly commit bcebb93 Author: Emilio Alvarez <[email protected]> Date: Tue Apr 4 15:12:56 2023 +0000 increase npm build space to 4gb commit 8c19893 Author: Duane Nykamp <[email protected]> Date: Mon Apr 3 23:17:07 2023 -0500 graph inside graph renders children inside parent graph (Doenet#2007) commit 541f71f Author: Duane Nykamp <[email protected]> Date: Mon Apr 3 23:11:54 2023 -0500 dark mode support in core styles and test environments (Doenet#2006) commit f5d66b1 Author: Emilio Alvarez <[email protected]> Date: Tue Apr 4 03:17:16 2023 +0000 fix geogebra import commit 8384bab Author: Emilio Alvarez <[email protected]> Date: Tue Apr 4 03:15:46 2023 +0000 switch to import flags commit bd04a17 Author: Duane Nykamp <[email protected]> Date: Mon Apr 3 21:56:09 2023 -0500 Functions inside functions are reevaluated (Doenet#2002) * evaluate_to_constant return NaN for non-numeric * Functions default to symbolic * Functions default to simplify * function simplify/expand do not affect formula commit fc2fbc3 Author: Emilio Alvarez <[email protected]> Date: Tue Apr 4 02:55:51 2023 +0000 fix image imports commit ed43229 Author: Emilio Alvarez <[email protected]> Date: Mon Apr 3 21:11:42 2023 -0500 upgrade development to vite (Doenet#2008) commit 6fa3a61 Author: Jason Altekruse <[email protected]> Date: Mon Apr 3 10:35:59 2023 -0500 Upgrade to react 18 (Doenet#1991) * Upgrade react 18 - also update packages with peer dependencies on react - delete file not referenced anywhere (it happened to also reference a datetime package that has not be updated to be compatible with react 18, but it doesn't matter because we didn't actually need it) - palantir/blueprint#5699 * package lock * Change to use the new API for the root render call reqired in version 18 * Remove unneeded depedency, move cypress-parallel to optional depedencies commit 8d61204 Author: Duane Nykamp <[email protected]> Date: Thu Mar 30 20:08:25 2023 -0500 piecewise function (Doenet#1998) (cherry picked from commit 86f9660)
- Loading branch information
1 parent
84e6534
commit de26fe7
Showing
960 changed files
with
16,575 additions
and
20,685 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
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,3 +1,4 @@ | ||
| ./.cache/ | ||
| ./.devcontainer/ | ||
| .env | ||
| ./.git/ | ||
|
|
||
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
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
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
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,51 +1,51 @@ | ||
| describe('Student Sign-In Test', function () { | ||
| const userId = "cyuserId"; | ||
| // const studentUserId = "cyStudentUserId"; | ||
| const courseId = "courseid1"; | ||
| // const doenetId = "activity1id"; | ||
| // const pageDoenetId = "_page1id"; | ||
| before(()=>{ | ||
| cy.signin({ userId }); | ||
| cy.clearAllOfAUsersCoursesAndItems({ userId }); | ||
| const userId = "cyuserId"; | ||
| // const studentUserId = "cyStudentUserId"; | ||
| const courseId = "courseid1"; | ||
| // const doenetId = "activity1id"; | ||
| // const pageDoenetId = "_page1id"; | ||
|
|
||
| before(() => { | ||
| cy.signin({ userId }); | ||
| cy.clearAllOfAUsersCoursesAndItems({ userId }); | ||
| // cy.clearAllOfAUsersCoursesAndItems({ userId: studentUserId }); | ||
| cy.createCourse({ userId, courseId }); | ||
| }) | ||
| beforeEach(() => { | ||
| cy.signin({ userId }); | ||
| cy.clearIndexedDB(); | ||
| cy.clearAllOfAUsersActivities({ userId }); | ||
| cy.createCourse({ userId, courseId }); | ||
| }) | ||
| beforeEach(() => { | ||
| cy.signin({ userId }); | ||
| cy.clearIndexedDB(); | ||
| cy.clearAllOfAUsersActivities({ userId }); | ||
| // cy.clearAllOfAUsersActivities({ userId: studentUserId }); | ||
| // cy.createActivity({ courseId, doenetId, parentDoenetId:courseId, pageDoenetId }); | ||
| cy.visit(`http://localhost/course?tool=people&courseId=${courseId}`); | ||
| }) | ||
| Cypress.on('uncaught:exception', (err, runnable) => { | ||
| // Returning false here prevents Cypress from failing the test | ||
| return false; | ||
| }) | ||
| it('Student can sign in after being added to a course', () => { | ||
| const emailAddress = "[email protected]"; | ||
| cy.get('[data-test="First"]').type("Scooby"); | ||
| cy.get('[data-test="Last"]').type("Doo"); | ||
| cy.get('[data-test="Email"]').type(emailAddress); | ||
| cy.get('[data-test="Add User"]').click(); | ||
| cy.visit(`http://localhost/settings`) | ||
| cy.get('[data-test="sign out button"]').click(); | ||
| cy.get('[data-test="homepage button"]').should('be.visible'); | ||
| cy.visit(`http://localhost/SignIn`) | ||
| cy.get('[data-test="email input"]').type(emailAddress); | ||
| cy.get('[data-test="sendEmailButton"]').click(); | ||
| cy.task('queryDb', `SELECT signInCode FROM user_device ORDER BY id DESC LIMIT 1`).then((result)=>{ | ||
| const code = result[0].signInCode; | ||
| cy.get('[data-test="signinCodeInput"]').type(code); | ||
| cy.get('[data-test="signInButton"]').click(); | ||
| cy.get('[data-test="Nav to course"]').should('be.visible'); | ||
| }); | ||
| }) | ||
| cy.visit(`/course?tool=people&courseId=${courseId}`); | ||
| }) | ||
|
|
||
|
|
||
| Cypress.on('uncaught:exception', (err, runnable) => { | ||
| // Returning false here prevents Cypress from failing the test | ||
| return false; | ||
| }) | ||
|
|
||
|
|
||
| it('Student can sign in after being added to a course', () => { | ||
| const emailAddress = "[email protected]"; | ||
| cy.get('[data-test="First"]').type("Scooby"); | ||
| cy.get('[data-test="Last"]').type("Doo"); | ||
| cy.get('[data-test="Email"]').type(emailAddress); | ||
| cy.get('[data-test="Add User"]').click(); | ||
| cy.visit(`/settings`) | ||
| cy.get('[data-test="sign out button"]').click(); | ||
| cy.get('[data-test="homepage button"]').should('be.visible'); | ||
| cy.visit(`/SignIn`) | ||
| cy.get('[data-test="email input"]').type(emailAddress); | ||
| cy.get('[data-test="sendEmailButton"]').click(); | ||
| cy.task('queryDb', `SELECT signInCode FROM user_device ORDER BY id DESC LIMIT 1`).then((result) => { | ||
| const code = result[0].signInCode; | ||
| cy.get('[data-test="signinCodeInput"]').type(code); | ||
| cy.get('[data-test="signInButton"]').click(); | ||
| cy.get('[data-test="Nav to course"]').should('be.visible'); | ||
| }); | ||
|
|
||
| }) | ||
|
|
||
| }) |
Oops, something went wrong.