Merge branch 'ref/318/query-composables' into ref/318/query-composabl…

…es-student-report

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();

cypress/e2e/partner-admin/default-tests/testScoreReportFiltering.cy.js

@@ -12,45 +12,56 @@
 // 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();
 //   cy.get('ul>li').find('.p-tag-value', { timeout: timeout }).contains(category).click();
 //   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();
 //   cy.get('ul > li', { timeout: timeout }).contains(category).click();
 //   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();