diff --git a/exActDashboard_spec.js b/exActDashboard_spec.js index 288d273..46f570f 100644 --- a/exActDashboard_spec.js +++ b/exActDashboard_spec.js @@ -31,7 +31,7 @@ describe('ExACT Dashboard script', function () { browser.sleep(2500); }); expect(EdGateLogo.isPresent()).toBe(true); - expect(await CopyrightText.getText()).toEqual('© Copyright 2021 EdGate Correlation Services'); + expect(await CopyrightText.getText()).toEqual('© Copyright 2022 EdGate Correlation Services'); await browser.driver.getCurrentUrl().then(async function(actualURL) { if(actualURL.indexOf('http://stage.edgate.com/exact/login.php') !== -1) { await UserNameTextBox.sendKeys('exact_juan').then(function() { @@ -136,38 +136,61 @@ function Dashboard() { function MyContentWidget() { it(': MyContentWidget, should verify widget default information.', async function () { var MyContentWidgetTitle = element(by.css('.row:nth-child(2) > .col-lg-6:nth-child(1) .card-header')); - var BiologyHeader = element(by.css('.list-group-item:nth-child(1)')); - var BiologyCount = element(by.css('.list-group-item:nth-child(1) > .float-right')); - var English1Header = element(by.css('.list-group-item:nth-child(2)')); - var English1Count = element(by.css('.list-group-item:nth-child(2) > .float-right')); - var AlgebraHeader = element(by.css('.list-group-item:nth-child(3)')); - var AlgebraCount = element(by.css('.list-group-item:nth-child(3) > .float-right')); - var USHistoryHeader = element(by.css('.list-group-item:nth-child(4)')); - var USHistoryCount = element(by.css('.list-group-item:nth-child(4) > .float-right')); - var DemoUserSubmittedContentHeader = element(by.css('.list-group-item:nth-child(5)')); - var DemoUserSubmittedContentCount = element(by.css('.list-group-item:nth-child(5) > .float-right')); - var GeometryHeader = element(by.css('.list-group-item:nth-child(6)')); - var GeometryCount = element(by.css('.list-group-item:nth-child(6) > .float-right')); + var ExportButton = element(by.css('.col-lg-6:nth-child(1) .btn')); + var MyContentRowLabelOne = element(by.css('.list-group-item:nth-child(1) > a')); + var MyContentRowDataOne = element(by.css('.list-group-item:nth-child(1) .badge')); + var MyContentRowLabelTwo = element(by.css('.list-group-item:nth-child(2) > a')); + var MyContentRowDataTwo = element(by.css('.list-group-item:nth-child(2) .badge')); + var MyContentRowLabelThree = element(by.css('.list-group-item:nth-child(3) > a')); + var MyContentRowDataThree = element(by.css('.list-group-item:nth-child(3) .badge')); + var MyContentRowLabelFour = element(by.css('.list-group-item:nth-child(4) > a')); + var MyContentRowDataFour = element(by.css('.list-group-item:nth-child(4) .badge')); + var MyContentRowLabelFive = element(by.css('.list-group-item:nth-child(5) > a')); + var MyContentRowDataFive = element(by.css('.list-group-item:nth-child(5) .badge')); + var MyContentRowLabelSix = element(by.css('.list-group-item:nth-child(6) > a')); + var MyContentRowDataSix = element(by.css('.list-group-item:nth-child(6) .badge')); + var MyContentRowLabelSeven = element(by.css('.list-group-item:nth-child(7) > a')); + var MyContentRowDataSeven = element(by.css('.list-group-item:nth-child(7) .badge')); + var MyContentRowLabelEight = element(by.css('.list-group-item:nth-child(8) > a')); + var MyContentRowDataEight = element(by.css('.list-group-item:nth-child(8) .badge')); + var MyContentRowLabelNine = element(by.css('.list-group-item:nth-child(9) > a')); + var MyContentRowDataNine = element(by.css('.list-group-item:nth-child(9) .badge')); + var MyContentRowLabelTen = element(by.css('.list-group-item:nth-child(10) > a')); + var MyContentRowDataTen = element(by.css('.list-group-item:nth-child(10) .badge')); - expect(await MyContentWidgetTitle.getText()).toEqual('My Content'); - expect(await BiologyHeader.getText()).toContain('Biology'); - expect(BiologyCount.getCssValue('background-color')).toBe('rgba(1, 160, 78, 1)'); //green - expect(await BiologyCount.getText()).toEqual('1045'); - expect(await English1Header.getText()).toContain('English I'); - expect(English1Count.getCssValue('background-color')).toBe('rgba(1, 160, 78, 1)'); //green - expect(await English1Count.getText()).toEqual('403'); - expect(await AlgebraHeader.getText()).toContain('Algebra'); - expect(AlgebraCount.getCssValue('background-color')).toBe('rgba(1, 160, 78, 1)'); //green - expect(await AlgebraCount.getText()).toEqual('183'); - expect(await USHistoryHeader.getText()).toContain('US History'); - expect(USHistoryCount.getCssValue('background-color')).toBe('rgba(1, 160, 78, 1)'); //green - expect(await USHistoryCount.getText()).toEqual('66'); - expect(await DemoUserSubmittedContentHeader.getText()).toContain('Demo - User Submitted Content'); - expect(DemoUserSubmittedContentCount.getCssValue('background-color')).toBe('rgba(1, 160, 78, 1)'); //green - expect(await DemoUserSubmittedContentCount.getText()).toEqual('16'); - expect(await GeometryHeader.getText()).toContain('Geometry'); - expect(GeometryCount.getCssValue('background-color')).toBe('rgba(1, 160, 78, 1)'); //green - expect(await GeometryCount.getText()).toEqual('1'); + expect(await MyContentWidgetTitle.getText()).toContain('My Content'); + expect(ExportButton.getCssValue('background-color')).toBe('rgba(1, 160, 78, 1)'); //green + expect(await ExportButton.getText()).toContain('Export'); + expect(await MyContentRowLabelOne.getText()).toContain('Biology'); + expect(MyContentRowDataOne.getCssValue('background-color')).toBe('rgba(1, 160, 78, 1)'); //green + expect(await MyContentRowDataOne.getText()).toEqual('1043'); + expect(await MyContentRowLabelTwo.getText()).toContain('Geometry'); + expect(MyContentRowDataTwo.getCssValue('background-color')).toBe('rgba(1, 160, 78, 1)'); //green + expect(await MyContentRowDataTwo.getText()).toEqual('979'); + expect(await MyContentRowLabelThree.getText()).toContain('English I'); + expect(MyContentRowDataThree.getCssValue('background-color')).toBe('rgba(1, 160, 78, 1)'); //green + expect(await MyContentRowDataThree.getText()).toEqual('407'); + expect(await MyContentRowLabelFour.getText()).toContain('Algebra'); + expect(MyContentRowDataFour.getCssValue('background-color')).toBe('rgba(1, 160, 78, 1)'); //green + expect(await MyContentRowDataFour.getText()).toEqual('183'); + expect(await MyContentRowLabelFive.getText()).toContain('US History'); + expect(MyContentRowDataFive.getCssValue('background-color')).toBe('rgba(1, 160, 78, 1)'); //green + expect(await MyContentRowDataFive.getText()).toEqual('62'); + expect(await MyContentRowLabelSix.getText()).toContain('Demo - User Submitted Content'); + expect(MyContentRowDataSix.getCssValue('background-color')).toBe('rgba(1, 160, 78, 1)'); //green + expect(await MyContentRowDataSix.getText()).toEqual('17'); + expect(await MyContentRowLabelSeven.getText()).toContain('Upload Demo'); + expect(MyContentRowDataSeven.getCssValue('background-color')).toBe('rgba(1, 160, 78, 1)'); //green + expect(await MyContentRowDataSeven.getText()).toEqual('0'); + expect(await MyContentRowLabelEight.getText()).toContain('Exploring - Access'); + expect(MyContentRowDataEight.getCssValue('background-color')).toBe('rgba(1, 160, 78, 1)'); //green + expect(await MyContentRowDataEight.getText()).toEqual('0'); + expect(await MyContentRowLabelNine.getText()).toContain('Exploring - PowerPoint'); + expect(MyContentRowDataNine.getCssValue('background-color')).toBe('rgba(1, 160, 78, 1)'); //green + expect(await MyContentRowDataNine.getText()).toEqual('0'); + expect(await MyContentRowLabelTen.getText()).toContain('Exploring - Word'); + expect(MyContentRowDataTen.getCssValue('background-color')).toBe('rgba(1, 160, 78, 1)'); //green + expect(await MyContentRowDataTen.getText()).toEqual('0'); }); } @@ -241,7 +264,6 @@ function CorrelationCoverageWidget() { var CorrelationCoverageWidgetTitle = element(by.css('.row:nth-child(3) > .col-lg-6:nth-child(1) .card-header')); var CorrelationCoverageStandardDropDown = element(by.css('#stdgap')); var CorrelationCoverageSubjectDropDown = element(by.css('#subgap')); - var CorrelationCoverageDonutChart = element(by.css('#gcanvas')); var CorrelationCoverageSubText = element(by.css('p:nth-child(2)')); var StandardsCoveredIcon = element(by.css('.list-group-item:nth-child(4)')); var StandardsCoveredLabel = element(by.css('.list-group-item:nth-child(5)')); @@ -249,17 +271,111 @@ function CorrelationCoverageWidget() { var NotCoveredLabel = element(by.css('')); var ViewDetailsLinkText = element(by.linkText('View Details')); var ViewDetailsArrowIcon = element(by.css('.fa-arrow-circle-right')); + var EC = protractor.ExpectedConditions; + var CorrelationCoverageDonutChart = element(by.css('#gcanvas')); + //Correlation DIV + var CorrelationDIVTitle = element(by.css('.modal-content #gradeCovLabel')); + var CorrelationDIVGradeColumnHeader = element(by.css('.modal-content th:nth-child(1)')); + var CorrelationDIVCoverageColumnHeader = element(by.css('.modal-content th:nth-child(2)')); + var CorrelationDIVGradeRowOne = element(by.css('.modal-content tr:nth-child(2) > td:nth-child(1)')); + var CorrelationDIVCoverageRowOne = element(by.css('.modal-content tr:nth-child(2) .progress-bar')); + var CorrelationDIVGradeRowTwo = element(by.css('.modal-content tr:nth-child(3) > td:nth-child(1)')); + var CorrelationDIVCoverageRowTwo = element(by.css('.modal-content tr:nth-child(3) .progress-bar')); + var CorrelationDIVGradeRowThree = element(by.css('.modal-content tr:nth-child(4) > td:nth-child(1)')); + var CorrelationDIVCoverageRowThree = element(by.css('.modal-content tr:nth-child(4) .progress-bar')); + var CorrelationDIVGradeRowFour = element(by.css('.modal-content tr:nth-child(5) > td:nth-child(1)')); + var CorrelationDIVCoverageRowFour = element(by.css('.modal-content tr:nth-child(5) .progress-bar')); + var CorrelationDIVGradeRowFive = element(by.css('.modal-content tr:nth-child(6) > td:nth-child(1)')); + var CorrelationDIVCoverageRowFive = element(by.css('.modal-content tr:nth-child(6) .progress-bar')); + var CorrelationDIVGradeRowSix = element(by.css('.modal-content tr:nth-child(7) > td:nth-child(1)')); + var CorrelationDIVCoverageRowSix = element(by.css('.modal-content tr:nth-child(7) .progress-bar')); + var CorrelationDIVGradeRowSeven = element(by.css('.modal-content tr:nth-child(8) > td:nth-child(1)')); + var CorrelationDIVCoverageRowSeven = element(by.css('.modal-content tr:nth-child(8) .progress-bar')); + var CorrelationDIVGradeRowEight = element(by.css('.modal-content tr:nth-child(9) > td:nth-child(1)')); + var CorrelationDIVCoverageRowEight = element(by.css('.modal-content tr:nth-child(9) .progress-bar')); + var CorrelationDIVGradeRowNine = element(by.css('.modal-content tr:nth-child(10) > td:nth-child(1)')); + var CorrelationDIVCoverageRowNine = element(by.css('.modal-content tr:nth-child(10) .progress-bar')); + var CorrelationDIVGradeRowTen = element(by.css('.modal-content tr:nth-child(11) > td:nth-child(1)')); + var CorrelationDIVCoverageRowTen = element(by.css('.modal-content tr:nth-child(11) .progress-bar')); + var CorrelationDIVGradeRowEleven = element(by.css('.modal-content tr:nth-child(12) > td:nth-child(1)')); + var CorrelationDIVCoverageRowEleven = element(by.css('.modal-content tr:nth-child(12) .progress-bar')); + var CorrelationDIVGradeRowTweleve = element(by.css('.modal-content tr:nth-child(13) > td:nth-child(1)')); + var CorrelationDIVCoverageRowTwelve = element(by.css('.modal-content tr:nth-child(13) .progress-bar')); + var CorrelationDIVGradeRowThirteen = element(by.css('.modal-content tr:nth-child(14) > td:nth-child(1)')); + var CorrelationDIVCoverageRowThirteen = element(by.css('.modal-content tr:nth-child(14) .progress-bar')); + var CorrelationDIVXCloseIcon = element(by.css('.modal-content span')); - browser.executeScript('window.scrollTo(0, 563);').then(function() { + browser.executeScript('window.scrollTo(0, 540);').then(function() { browser.sleep(2500); }); expect(await CorrelationCoverageWidgetTitle.getText()).toEqual('Correlation Coverage'); - expect(await CorrelationCoverageStandardDropDown.getAttribute('value')).toEqual('19928');//changes - expect(await CorrelationCoverageSubjectDropDown.getAttribute('value')).toEqual('Mathematics');//changes + //expect(await CorrelationCoverageStandardDropDown.getAttribute('value')).toEqual('19927');//changes + //expect(await CorrelationCoverageSubjectDropDown.getAttribute('value')).toEqual('Language Arts');//changes expect(await CorrelationCoverageSubText.getText()).toEqual('Click anywhere on the chart to see a coverage breakdown by grade.'); expect(ViewDetailsLinkText.getCssValue('color')).toBe('rgba(1, 160, 78, 1)'); //green expect(await ViewDetailsLinkText.getText()).toEqual('View Details'); expect(ViewDetailsArrowIcon.isPresent()).toBe(true); + element(by.cssContainingText('option', 'California Standards')).click().then(function() { + browser.sleep(2500); + }); + element(by.cssContainingText('option', 'Mathematics')).click().then(function() { + browser.sleep(2500); + }); + browser.wait(EC.visibilityOf(CorrelationCoverageDonutChart), 30000).then(function() { + browser.sleep(2500); + }); + await CorrelationCoverageDonutChart.click().then(function() { + browser.sleep(2500); + }); + //Correlation DIV + browser.wait(EC.visibilityOf(CorrelationDIVTitle), 30000).then(function() { + browser.sleep(2500); + }); + expect(await CorrelationDIVTitle.getText()).toEqual('California Standards - Mathematics'); + expect(await CorrelationDIVGradeColumnHeader.getText()).toEqual('Grade'); + expect(await CorrelationDIVCoverageColumnHeader.getText()).toEqual('Coverage'); + expect(await CorrelationDIVGradeRowOne.getText()).toEqual('K'); + expect(CorrelationDIVCoverageRowOne.getCssValue('color')).toBe('rgba(255, 255, 255, 1)'); //green + expect(await CorrelationDIVCoverageRowOne.getText()).toEqual('28%'); + expect(await CorrelationDIVGradeRowTwo.getText()).toEqual('1'); + expect(CorrelationDIVCoverageRowTwo.getCssValue('color')).toBe('rgba(255, 255, 255, 1)'); //green + expect(await CorrelationDIVCoverageRowTwo.getText()).toEqual('26%'); + expect(await CorrelationDIVGradeRowThree.getText()).toEqual('2'); + expect(CorrelationDIVCoverageRowThree.getCssValue('color')).toBe('rgba(255, 255, 255, 1)'); //green + expect(await CorrelationDIVCoverageRowThree.getText()).toEqual('39%'); + expect(await CorrelationDIVGradeRowFour.getText()).toEqual('3'); + expect(CorrelationDIVCoverageRowFour.getCssValue('color')).toBe('rgba(255, 255, 255, 1)'); //green + expect(await CorrelationDIVCoverageRowFour.getText()).toEqual('37%'); + expect(await CorrelationDIVGradeRowFive.getText()).toEqual('4'); + expect(CorrelationDIVCoverageRowFive.getCssValue('color')).toBe('rgba(255, 255, 255, 1)'); //green + expect(await CorrelationDIVCoverageRowFive.getText()).toEqual('24%'); + expect(await CorrelationDIVGradeRowSix.getText()).toEqual('5'); + expect(CorrelationDIVCoverageRowSix.getCssValue('color')).toBe('rgba(255, 255, 255, 1)'); //green + expect(await CorrelationDIVCoverageRowSix.getText()).toEqual('26%'); + expect(await CorrelationDIVGradeRowSeven.getText()).toEqual('6'); + expect(CorrelationDIVCoverageRowSeven.getCssValue('color')).toBe('rgba(255, 255, 255, 1)'); //green + expect(await CorrelationDIVCoverageRowSeven.getText()).toEqual('18%'); + expect(await CorrelationDIVGradeRowEight.getText()).toEqual('7'); + expect(CorrelationDIVCoverageRowEight.getCssValue('color')).toBe('rgba(255, 255, 255, 1)'); //green + expect(await CorrelationDIVCoverageRowEight.getText()).toEqual('33%'); + expect(await CorrelationDIVGradeRowNine.getText()).toEqual('8'); + expect(CorrelationDIVCoverageRowNine.getCssValue('color')).toBe('rgba(255, 255, 255, 1)'); //green + expect(await CorrelationDIVCoverageRowNine.getText()).toEqual('29%'); + expect(await CorrelationDIVGradeRowTen.getText()).toEqual('9'); + expect(CorrelationDIVCoverageRowTen.getCssValue('color')).toBe('rgba(255, 255, 255, 1)'); //green + expect(await CorrelationDIVCoverageRowTen.getText()).toEqual('14%'); + expect(await CorrelationDIVGradeRowEleven.getText()).toEqual('10'); + expect(CorrelationDIVCoverageRowEleven.getCssValue('color')).toBe('rgba(255, 255, 255, 1)'); //green + expect(await CorrelationDIVCoverageRowEleven.getText()).toEqual('13%'); + expect(await CorrelationDIVGradeRowTweleve.getText()).toEqual('11'); + expect(CorrelationDIVCoverageRowTwelve.getCssValue('color')).toBe('rgba(255, 255, 255, 1)'); //green + expect(await CorrelationDIVCoverageRowTwelve.getText()).toEqual('13%'); + expect(await CorrelationDIVGradeRowThirteen.getText()).toEqual('12'); + expect(CorrelationDIVCoverageRowThirteen.getCssValue('color')).toBe('rgba(255, 255, 255, 1)'); //green + expect(await CorrelationDIVCoverageRowThirteen.getText()).toEqual('13%'); + await CorrelationDIVXCloseIcon.click().then(function() { + browser.sleep(2500); + }); }); } @@ -322,14 +438,14 @@ function FavoriteReportsWidget() { var FavoriteReportsFormatButtonOne = element(by.css('tr:nth-child(1) > td:nth-child(1) > .badge')); var FavoriteReportsReportHandleOne = element(by.css('.table:nth-child(1) tr:nth-child(1) > td:nth-child(2)')); var FavoriteReportsRunIconOne = element(by.css('tr:nth-child(1) .reportrun > .fa')); - var FavoriteReportsDownloadIconOne = element(by.css('tr:nth-child(1) > .text-center > .fa')); + var FavoriteReportsDownloadIconOne = element(by.css('tr:nth-child(1) .fa-download')); var FavoriteReportsFormatButtonTwo = element(by.css('tr:nth-child(2) > td:nth-child(1) > .badge')); var FavoriteReportsReportHandleTwo = element(by.css('.table:nth-child(1) > tbody:nth-child(2) > tr:nth-child(2) > td:nth-child(2)')); var FavoriteReportsRunIconTwo = element(by.css('tr:nth-child(2) .reportrun > .fa')); - var FavoriteReportsDownloadIconTwo = element(by.css('tr:nth-child(2) > .text-center > .fa')); + var FavoriteReportsDownloadIconTwo = element(by.css('tr:nth-child(2) .fa-download')); var FavoriteReportsFormatButtonThree = element(by.css('tr:nth-child(3) > td:nth-child(1) > .badge')); var FavoriteReportsReportHandleThree = element(by.css('.table:nth-child(1) > tbody:nth-child(2) > tr:nth-child(3) > td:nth-child(2)')); - var FavoriteReportsRunIconThree = element(by.css('tr:nth-child(3) .reportrun > .fa')); + var FavoriteReportsRunIconThree = element(by.css('tr:nth-child(3) .fa-download')); var FavoriteReportsDownloadIconThree = element(by.css('.report-icon-download')); var EdGateLogo = element(by.css('.pull-right img')); @@ -348,19 +464,19 @@ function FavoriteReportsWidget() { expect(await FavoriteReportsReportHandleOne.getText()).toEqual('Social Studies'); expect(FavoriteReportsRunIconOne.getCssValue('color')).toBe('rgba(40, 167, 69, 1)'); //green expect(FavoriteReportsRunIconOne.isPresent()).toBe(true); - expect(FavoriteReportsDownloadIconOne.getCssValue('color')).toBe('rgba(204, 204, 204, 1)'); //dimmed + expect(FavoriteReportsDownloadIconOne.getCssValue('color')).toBe('rgba(1, 160, 78, 1)'); //green expect(FavoriteReportsDownloadIconOne.isPresent()).toBe(true); expect(FavoriteReportsFormatButtonTwo.getCssValue('background-color')).toBe('rgba(0, 0, 0, 1)'); //black expect(await FavoriteReportsFormatButtonTwo.getText()).toEqual('html'); expect(await FavoriteReportsReportHandleTwo.getText()).toEqual('Second Test'); expect(FavoriteReportsRunIconTwo.getCssValue('color')).toBe('rgba(40, 167, 69, 1)'); //green expect(FavoriteReportsRunIconTwo.isPresent()).toBe(true); - expect(FavoriteReportsDownloadIconTwo.getCssValue('color')).toBe('rgba(204, 204, 204, 1)'); //dimmed + expect(FavoriteReportsDownloadIconTwo.getCssValue('color')).toBe('rgba(1, 160, 78, 1)'); //green expect(FavoriteReportsDownloadIconTwo.isPresent()).toBe(true); expect(FavoriteReportsFormatButtonThree.getCssValue('background-color')).toBe('rgba(29, 111, 66, 1)'); //green expect(await FavoriteReportsFormatButtonThree.getText()).toEqual('xls'); expect(await FavoriteReportsReportHandleThree.getText()).toEqual('FirstQueuedReport'); - expect(FavoriteReportsRunIconThree.getCssValue('color')).toBe('rgba(40, 167, 69, 1)'); //green + expect(FavoriteReportsRunIconThree.getCssValue('color')).toBe('rgba(1, 160, 78, 1)'); //green expect(FavoriteReportsRunIconThree.isPresent()).toBe(true); expect(FavoriteReportsDownloadIconThree.getCssValue('color')).toBe('rgba(1, 160, 78, 1)'); //green expect(FavoriteReportsDownloadIconThree.isPresent()).toBe(true); diff --git a/exactLandingPage_spec.js b/exactLandingPage_spec.js index 995d287..90ca4c3 100644 --- a/exactLandingPage_spec.js +++ b/exactLandingPage_spec.js @@ -284,7 +284,7 @@ describe('My Journeys Widget script', function () { browser.sleep(5000); }); expect(EdGateLogo.isPresent()).toBe(true); - expect(await CopyrightText.getText()).toEqual('© Copyright 2021 EdGate Correlation Services'); + expect(await CopyrightText.getText()).toEqual('© Copyright 2022 EdGate Correlation Services'); await browser.driver.getCurrentUrl().then(async function(actualURL) { if(actualURL.indexOf('http://stage.edgate.com/exact/login.php') !== -1) { await UserNameTextBox.sendKeys('exact_juan').then(function() {