diff --git a/cypress/e2e/partner-admin/default-tests/testProgressReportFiltering.spec.cy.js b/cypress/e2e/partner-admin/default-tests/testProgressReportFiltering.spec.cy.js index cecf1a260..2d07767a9 100644 --- a/cypress/e2e/partner-admin/default-tests/testProgressReportFiltering.spec.cy.js +++ b/cypress/e2e/partner-admin/default-tests/testProgressReportFiltering.spec.cy.js @@ -17,31 +17,39 @@ // const testUserList = Cypress.env('testUserList'); // const testAssignments = Cypress.env('testAssignmentsList'); // const headers = ['School']; -// + // function checkUrl() { // cy.login(testPartnerAdminUsername, testPartnerAdminPassword); // cy.navigateTo('/'); // cy.url({ timeout: 3 * timeout }).should('eq', `${baseUrl}/`); // } + // + // function clickProgressButton(adminId) { // cy.get('button', { timeout: timeout }).contains('Progress').first().click(); // cy.url({ timeout: 3 * timeout }).should('eq', `${baseUrl}/administration/${adminId}/district/${testDistrictId}`); // } + // + // function setFilterBySchool(school) { // cy.get('[data-cy="filter-by-school"]', { timeout: timeout }).click(); // cy.get('ul > li', { timeout: timeout }).contains(school).click(); // cy.wait(0.05 * timeout); // } + // + // function setFilterByGrade(grade) { // cy.get('[data-cy="filter-by-grade"]', { timeout: timeout }).click(); // cy.get('ul > li', { timeout: timeout }).contains(grade).click(); // cy.get('body').type('{esc}'); // cy.wait(0.05 * timeout); // } + // + // function setFilterByProgressCategory(header, category) { // cy.contains('div.p-column-header-content', header).find('button').click(); // cy.get('[data-cy="progress-filter-dropdown"]', { timeout: timeout }).click(); @@ -50,6 +58,7 @@ // cy.get('button').contains('Apply').click(); // cy.wait(0.05 * timeout); // } + // // function checkTableColumn(headers, value) { // cy.get('[data-cy="roar-data-table"] thead th').then(($header) => { @@ -58,6 +67,7 @@ // headers.forEach((header) => { // const headerIndex = tableHeaders.indexOf(header); // + // if (headerIndex !== -1) { // cy.get('[data-cy="roar-data-table"] tbody tr').each(($row) => { // cy.wrap($row) @@ -71,6 +81,7 @@ // }); // }); // } + // // function checkProgressTags(headers) { // cy.get('[data-cy="roar-data-table"] thead th').then(($header) => { @@ -79,6 +90,7 @@ // headers.forEach((header) => { // const headerIndex = tableHeaders.indexOf(header); // + // if (headerIndex !== -1) { // cy.get('[data-cy="roar-data-table"] tbody tr', { timeout: timeout }).each(($row) => { // cy.wrap($row) @@ -92,7 +104,9 @@ // }); // }); // } + // + // describe('The partner admin can view progress reports for a given administration and filter by school.', () => { // it('Selects an administration and views its score report, then accesses the filter bar to filter by school.', () => { // checkUrl(); @@ -102,7 +116,9 @@ // checkTableColumn(headers, 'Cypress Test School'); // }); // }); + // + // describe('The partner admin can view progress reports for a given administration and filter by grade', () => { // it('Selects an administration, views its progress report, then accesses the filter bar to filter by grade', () => { // checkUrl(); @@ -112,7 +128,9 @@ // checkTableColumn(['Grade'], '1'); // }); // }); + // + // describe('The partner admin can view progress reports for a given administration and filter by both school and grade', () => { // it('Selects an administration, views its progress report, then accesses the filter bar to filter by both school grade', () => { // checkUrl(); @@ -124,7 +142,9 @@ // checkTableColumn(['Grade'], '1'); // }); // }); + // + // describe('The partner admin can view progress reports for a given administration and filter by progress status', () => { // it('Selects an administration, views its score report, then accesses the column filter to filter by progress status', () => { // checkUrl(); @@ -134,7 +154,9 @@ // checkTableColumn(['Username'], 'CypressTestStudent0'); // }); // }); + // + // describe('The partner admin can view progress reports for a given administration and filter by grade and progress status', () => { // it('Selects an administration, views its score report, then accesses the column filter to filter by grade and support level', () => { // checkUrl(); @@ -145,7 +167,9 @@ // checkTableColumn(['Username'], 'CypressTestStudent0'); // }); // }); + // + // describe('The partner admin can view progress reports for a given administration and a not applicable filter returns an empty message', () => { // it('Selects an administration, views its score report, then accesses the column filter to filter by a non-returnable filter', () => { // checkUrl(); diff --git a/cypress/e2e/partner-admin/default-tests/testScoreReportFiltering.cy.js b/cypress/e2e/partner-admin/default-tests/testScoreReportFiltering.cy.js index 607047607..f7642e534 100644 --- a/cypress/e2e/partner-admin/default-tests/testScoreReportFiltering.cy.js +++ b/cypress/e2e/partner-admin/default-tests/testScoreReportFiltering.cy.js @@ -12,30 +12,38 @@ // const timeout = Cypress.env('timeout'); // const baseUrl = Cypress.env('baseUrl'); // const headers = ['School']; + // + // function checkUrl() { // cy.login(testPartnerAdminUsername, testPartnerAdminPassword); // cy.navigateTo('/'); // cy.url({ timeout: timeout }).should('eq', `${baseUrl}/`); // } + // + // function clickScoreButton(adminId) { // cy.get('button', { timeout: timeout }).contains('Scores').first().click(); // cy.url({ timeout: timeout }).should('eq', `${baseUrl}/scores/${adminId}/district/${roarDemoDistrictId}`); // } + // + // function setFilterBySchool(school) { // cy.get('[data-cy="filter-by-school"]', { timeout: timeout }).click(); // cy.get('ul > li', { timeout: timeout }).contains(school).click(); // cy.wait(0.05 * timeout); // } + // + // function setFilterByGrade(grade) { // cy.get('[data-cy="filter-by-grade"]', { timeout: timeout }).click(); // cy.get('ul > li', { timeout: timeout }).contains(grade).click(); // cy.wait(0.05 * timeout); // } -// + // function setFilterByProgressCategory(header, category) { // cy.contains('div.p-column-header-content', header).find('button').click(); // cy.get('[data-cy="score-filter-dropdown"]', { timeout: timeout }).click(); @@ -43,7 +51,9 @@ // cy.get('button').contains('Apply').click(); // cy.wait(0.05 * timeout); // } + // + // function setFilterByScoreCategory(header, category) { // cy.contains('div.p-column-header-content', header).find('button').click(); // cy.get('[data-cy="score-filter-dropdown"]', { timeout: timeout }).click(); @@ -51,6 +61,7 @@ // cy.get('button').contains('Apply').click(); // cy.wait(0.05 * timeout); // } + // // function checkTableColumn(headers, value) { // cy.get('[data-cy="roar-data-table"] thead th').then(($header) => { @@ -59,6 +70,7 @@ // headers.forEach((header) => { // const headerIndex = tableHeaders.indexOf(header); // + // if (headerIndex !== -1) { // cy.get('[data-cy="roar-data-table"] tbody').each(($row) => { // cy.wrap($row).find('tr').should('contain', value); @@ -67,7 +79,7 @@ // }); // }); // } -// + // describe('The partner admin can view score reports for a given administration and filter by school.', () => { // it('Selects an administration and views its score report, then accesses the filter bar to filter by school.', () => { // checkUrl(); @@ -77,7 +89,7 @@ // checkTableColumn(headers, 'Cypress Test School'); // }); // }); -// + // describe('The partner admin can view score reports for a given administration and filter by grade', () => { // it('Selects an administration, views its score report, then accesses the filter bar to filter by grade', () => { // checkUrl(); @@ -87,7 +99,7 @@ // checkTableColumn(['Grade'], '3'); // }); // }); -// + // describe('The partner admin can view score reports for a given administration and filter by both school and grade', () => { // it('Selects an administration, views its score report, then accesses the filter bar to filter by both school grade', () => { // checkUrl(); @@ -99,7 +111,7 @@ // checkTableColumn(['Grade'], '5'); // }); // }); -// + // describe('The partner admin can view score reports for a given administration and filter by support level', () => { // it('Selects an administration, views its score report, then accesses the column filter to filter by support level', () => { // checkUrl(); @@ -109,7 +121,7 @@ // checkTableColumn(['Username'], 'CypressTestStudent0'); // }); // }); -// + // describe('The partner admin can view score reports for a given administration filter by school, grade, and progress status: completed', () => { // it('Selects an administration, views its score report, then accesses the column filter to filter by school, grade, and completed', () => { // checkUrl(); @@ -121,7 +133,7 @@ // checkTableColumn(['Username'], 'CypressTestStudent0'); // }); // }); -// + // describe('The partner admin can view score reports for a given administration and filter by Assessed', () => { // it('Selects an administration, views its score report, then accesses the column filter to filter by assessed', () => { // checkUrl(); @@ -131,7 +143,7 @@ // checkTableColumn(['Username'], 'CypressTestStudent0'); // }); // }); -// + // describe('The partner admin can view score reports for a given administration and a not applicable filter returns an empty message', () => { // it('Selects an administration, views its score report, then accesses the column filter to filter by a non-returnable filter', () => { // checkUrl(); diff --git a/package-lock.json b/package-lock.json index 1130d3ac3..ef0fcbeaf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,7 +10,7 @@ "dependencies": { "@bdelab/roam-fluency": "1.11.26", "@bdelab/roar-firekit": "^8.0.8", - "@bdelab/roar-letter": "1.11.5", + "@bdelab/roar-letter": "1.11.8", "@bdelab/roar-multichoice": "^1.11.3", "@bdelab/roar-pa": "2.2.4", "@bdelab/roar-sre": "1.15.9", @@ -1882,9 +1882,10 @@ } }, "node_modules/@bdelab/roar-letter": { - "version": "1.11.5", - "resolved": "https://registry.npmjs.org/@bdelab/roar-letter/-/roar-letter-1.11.5.tgz", - "integrity": "sha512-8wUZSajJbDfLIOBcv/e+CbhVQvPnvidhVcRf/gA7RhVr0S959ldql1jO5tBKUyzU0jldha2X7zeqbvcb/KtpNA==", + "version": "1.11.8", + "resolved": "https://registry.npmjs.org/@bdelab/roar-letter/-/roar-letter-1.11.8.tgz", + "integrity": "sha512-y0VJ6mIYf0KkDZ1tvt9aGWFSokF9dhuJv74vf9yiewIFQxJHft/LIWfjscvW/Hpe9YUwJuHjJ0Liq129jbA1Qg==", + "license": "Stanford Academic Software License for ROAR", "dependencies": { "@bdelab/jscat": "^4.0.0", "@bdelab/roar-firekit": "^4.7.0", @@ -24798,6 +24799,7 @@ }, "node_modules/npm/node_modules/lodash._baseindexof": { "version": "3.1.0", + "extraneous": true, "inBundle": true, "license": "MIT" }, @@ -24822,16 +24824,19 @@ }, "node_modules/npm/node_modules/lodash._bindcallback": { "version": "3.0.1", + "extraneous": true, "inBundle": true, "license": "MIT" }, "node_modules/npm/node_modules/lodash._cacheindexof": { "version": "3.0.2", + "extraneous": true, "inBundle": true, "license": "MIT" }, "node_modules/npm/node_modules/lodash._createcache": { "version": "3.1.2", + "extraneous": true, "inBundle": true, "license": "MIT", "dependencies": { @@ -24840,6 +24845,7 @@ }, "node_modules/npm/node_modules/lodash._getnative": { "version": "3.9.1", + "extraneous": true, "inBundle": true, "license": "MIT" }, @@ -24850,6 +24856,7 @@ }, "node_modules/npm/node_modules/lodash.restparam": { "version": "3.6.1", + "extraneous": true, "inBundle": true, "license": "MIT" }, @@ -39121,9 +39128,9 @@ } }, "@bdelab/roar-letter": { - "version": "1.11.5", - "resolved": "https://registry.npmjs.org/@bdelab/roar-letter/-/roar-letter-1.11.5.tgz", - "integrity": "sha512-8wUZSajJbDfLIOBcv/e+CbhVQvPnvidhVcRf/gA7RhVr0S959ldql1jO5tBKUyzU0jldha2X7zeqbvcb/KtpNA==", + "version": "1.11.8", + "resolved": "https://registry.npmjs.org/@bdelab/roar-letter/-/roar-letter-1.11.8.tgz", + "integrity": "sha512-y0VJ6mIYf0KkDZ1tvt9aGWFSokF9dhuJv74vf9yiewIFQxJHft/LIWfjscvW/Hpe9YUwJuHjJ0Liq129jbA1Qg==", "requires": { "@bdelab/jscat": "^4.0.0", "@bdelab/roar-firekit": "^4.7.0", @@ -56521,7 +56528,8 @@ }, "lodash._baseindexof": { "version": "3.1.0", - "bundled": true + "bundled": true, + "extraneous": true }, "lodash._baseuniq": { "version": "4.6.0", @@ -56543,22 +56551,26 @@ }, "lodash._bindcallback": { "version": "3.0.1", - "bundled": true + "bundled": true, + "extraneous": true }, "lodash._cacheindexof": { "version": "3.0.2", - "bundled": true + "bundled": true, + "extraneous": true }, "lodash._createcache": { "version": "3.1.2", "bundled": true, + "extraneous": true, "requires": { "lodash._getnative": "^3.0.0" } }, "lodash._getnative": { "version": "3.9.1", - "bundled": true + "bundled": true, + "extraneous": true }, "lodash.clonedeep": { "version": "4.5.0", @@ -56566,7 +56578,8 @@ }, "lodash.restparam": { "version": "3.6.1", - "bundled": true + "bundled": true, + "extraneous": true }, "lodash.union": { "version": "4.6.0", diff --git a/package.json b/package.json index 8c3021c34..7c7cc1765 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "dependencies": { "@bdelab/roam-fluency": "1.11.26", "@bdelab/roar-firekit": "^8.0.8", - "@bdelab/roar-letter": "1.11.5", + "@bdelab/roar-letter": "1.11.8", "@bdelab/roar-multichoice": "^1.11.3", "@bdelab/roar-pa": "2.2.4", "@bdelab/roar-sre": "1.15.9", diff --git a/roar-firebase-functions b/roar-firebase-functions index 3186f408d..27875477c 160000 --- a/roar-firebase-functions +++ b/roar-firebase-functions @@ -1 +1 @@ -Subproject commit 3186f408dbba54d2558b9f4df2b4adbc5cf987fb +Subproject commit 27875477c98d9b65712b2413b3780ed15bf97e6c diff --git a/src/router/index.js b/src/router/index.js index a0bab8664..4a39bb25d 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -94,6 +94,13 @@ const routes = [ props: { taskId: 'letter-es', language: 'es' }, meta: { pageTitle: 'Letter-ES' }, }, + { + path: '/game/letter-en-ca', + name: 'Letter-EN-CA', + component: () => import('../components/tasks/TaskLetter.vue'), + props: { taskId: 'letter-en-ca', language: 'en-CA' }, + meta: { pageTitle: 'Letter-EN-CA' }, + }, { path: '/game/multichoice', name: 'Multichoice',