Skip to content

Updated version of Kevin's fixes for sign-in #2394

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
jaltekruse wants to merge 20 commits into
base: legacy
Choose a base branch
from
Draft

Updated version of Kevin's fixes for sign-in #2394

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
402550a
Redesigned Sign in
kevincharles Oct 18, 2023
85e6ce5
start entering code
kevincharles Oct 19, 2023
817c7c7
email message and start of JWT as axios
kevincharles Oct 19, 2023
a929c0c
started all cards
kevincharles Oct 20, 2023
7a75b6a
process improvements
kevincharles Oct 20, 2023
6d8ee9e
last in the series
kevincharles Oct 21, 2023
7c15def
Progress on three path design
kevincharles Oct 22, 2023
4fa1e9b
basics of three path method
kevincharles Oct 22, 2023
3a06d31
handle code expired
kevincharles Oct 22, 2023
a7bf410
fixed bugs
kevincharles Oct 23, 2023
8ee7284
Base_Model conversion
kevincharles Oct 24, 2023
a8047f6
Fixed sign out
kevincharles Oct 24, 2023
d48b059
fix backticks
kevincharles Oct 24, 2023
28152a3
tests for signin
kevincharles Oct 25, 2023
baa2f19
cleaned tool root
kevincharles Oct 25, 2023
7589a9b
Removed commented code
kevincharles Oct 25, 2023
834f893
Chakra darkmode signout bug fixed
kevincharles Oct 25, 2023
1b54f33
Fixed measurement of signed out
kevincharles Oct 25, 2023
3addb0b
Merge branch kevin/fixSignIn
jaltekruse Apr 23, 2024
eb1e0b6
Revert changes to add an unnecessary extra loop over every cell in SQ…
jaltekruse Apr 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
88 changes: 69 additions & 19 deletions cypress/e2e/AsStudent/signIn.cy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,31 +1,20 @@
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 });
// cy.clearAllOfAUsersCoursesAndItems({ userId: studentUserId });
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(`/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", () => {
cy.createCourse({ userId, courseId });
cy.signin({ userId });
cy.clearIndexedDB();
cy.clearAllOfAUsersActivities({ userId });
cy.visit(`/course?tool=people&courseId=${courseId}`);

const emailAddress = "scoobydoo@doenet.org";
cy.get('[data-test="First"]').type("Scooby");
cy.get('[data-test="Last"]').type("Doo");
Expand All @@ -42,8 +31,17 @@ describe("Student Sign-In Test", function () {
`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="signinCodeInput"]').type(code);
cy.get('[data-test="code-input-0"]').type(code.charAt(0));
cy.get('[data-test="code-input-1"]').type(code.charAt(1));
cy.get('[data-test="code-input-2"]').type(code.charAt(2));
cy.get('[data-test="code-input-3"]').type(code.charAt(3));
cy.get('[data-test="code-input-4"]').type(code.charAt(4));
cy.get('[data-test="code-input-5"]').type(code.charAt(5));
cy.get('[data-test="code-input-6"]').type(code.charAt(6));
cy.get('[data-test="code-input-7"]').type(code.charAt(7));
cy.get('[data-test="code-input-8"]').type(code.charAt(8));
cy.get('[data-test="submitCodeButton"]').click();
cy.get('[data-test="My Courses"]').click();
cy.get('[data-test="Course Label"]').should(
"have.text",
Expand All @@ -53,4 +51,56 @@ describe("Student Sign-In Test", function () {
cy.document().should("contain.text", "Welcome");
});
});

it("Signed out to in to out with all entry errors", () => {
const emailAddress = "scrapydoo@doenet.org";
const firstName = "Scrapy";
const lastName = "Doo";
//Delete entry so we will need to enter the name
cy.task(
"queryDb",
`DELETE FROM user WHERE email='${emailAddress}'`,
).then(() => {
cy.visit(`/`);
cy.get('[data-test="Nav to signin"]').click();
cy.get('[data-test="email input"]').type(emailAddress);
cy.get('[data-test="sendEmailButton"]').click();
cy.wait(500); //Wait for it to be stored in db
cy.task(
"queryDb",
`SELECT signInCode FROM user_device ORDER BY id DESC LIMIT 1`,
).then((result) => {
const code = result[0].signInCode;
//Try no code
cy.get('[data-test="submitCodeButton"]').click();
cy.get('[data-test="code-err"]').should('contain', "Please enter the nine digits sent to your email.");
//Try only one number
cy.get('[data-test="code-input-0"]').type(code.charAt(0));
cy.get('[data-test="submitCodeButton"]').click();
cy.get('[data-test="code-err"]').should('contain', "Please enter all nine digits.");

cy.get('[data-test="code-input-0"]').type(code.charAt(0));
cy.get('[data-test="code-input-1"]').type(code.charAt(1));
cy.get('[data-test="code-input-2"]').type(code.charAt(2));
cy.get('[data-test="code-input-3"]').type(code.charAt(3));
cy.get('[data-test="code-input-4"]').type(code.charAt(4));
cy.get('[data-test="code-input-5"]').type(code.charAt(5));
cy.get('[data-test="code-input-6"]').type(code.charAt(6));
cy.get('[data-test="code-input-7"]').type(code.charAt(7));
cy.get('[data-test="code-input-8"]').type(code.charAt(8));
cy.get('[data-test="submitCodeButton"]').click();
//Try no names
cy.get('[data-test="submitName"]').click();
cy.get('[data-test="firstNameError"]').should('contain', 'Please enter your first name.')
cy.get('[data-test="lastNameError"]').should('contain', 'Please enter your last name.')

cy.get('[data-test="firstNameInput"]').type(firstName);
cy.get('[data-test="lastNameInput"]').type(lastName);
cy.get('[data-test="submitName"]').click();
cy.get('[data-test="AvatarMenuButton"]').click();
cy.get('[data-test="AvatarMenuSignOut"]').click();
cy.get('[data-test="homepage button"]').click();
});
});
});
});
Loading