From d233fea968499c40491eb8a8f359244fd32559b7 Mon Sep 17 00:00:00 2001 From: Juan Huerta Date: Fri, 18 Nov 2022 13:38:55 -0800 Subject: [PATCH] Updated script --- myContentWidget_spec.js | 352 +++++++++++++++++++++++++++------------- 1 file changed, 239 insertions(+), 113 deletions(-) diff --git a/myContentWidget_spec.js b/myContentWidget_spec.js index 977861f..cfed153 100644 --- a/myContentWidget_spec.js +++ b/myContentWidget_spec.js @@ -31,7 +31,7 @@ describe('My Content Widget 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() { @@ -60,7 +60,7 @@ describe('My Content Widget script', function () { Dashboard(); MyContentWidget(); Algebra(); - /*ResultsPanel(); + ResultsPanel(); DeleteSavedSearch(); //Sign Out*/ @@ -169,32 +169,52 @@ function MyContentWidget() { var ContentCountFive = element(by.css('.list-group-item:nth-child(5) .badge')); var ContentLabelSix = element(by.css('.list-group-item:nth-child(6)')); var ContentCountSix = element(by.css('.list-group-item:nth-child(6) .badge')); + var ContentLabelSeven = element(by.css('.list-group-item:nth-child(7)')); + var ContentCountSeven = element(by.css('.list-group-item:nth-child(7) .badge')); + var ContentLabelEight = element(by.css('.list-group-item:nth-child(8)')); + var ContentCountEight = element(by.css('.list-group-item:nth-child(8) .badge')); + var ContentLabelNine = element(by.css('.list-group-item:nth-child(9)')); + var ContentCountNine = element(by.css('.list-group-item:nth-child(9) .badge')); + var ContentLabelTen = element(by.css('.list-group-item:nth-child(10)')); + var ContentCountTen = element(by.css('.list-group-item:nth-child(10) .badge')); var ExportPageTitle = element(by.css('h2')); var ExportPageSubText = element(by.css('b')); var ExportPageDownloadExportButton = element(by.css('.btn')); - var BackToDashboardButton = element(by.linkText('Back to Dashboard')); + var DashboardMenuIcon = element(by.linkText('Dashboard')); expect(await MyContentWidgetTitle.getText()).toContain('My Content'); expect(ExportButton.getCssValue('background-color')).toBe('rgba(1, 160, 78, 1)'); //green expect(await ExportButton.getText()).toEqual('Export'); expect(await ContentLabelOne.getText()).toContain('Biology'); expect(ContentCountOne.getCssValue('background-color')).toBe('rgba(1, 160, 78, 1)'); //green - expect(await ContentCountOne.getText()).toEqual('1045'); + expect(await ContentCountOne.getText()).toEqual('1043'); expect(await ContentLabelTwo.getText()).toContain('Geometry'); expect(ContentCountTwo.getCssValue('background-color')).toBe('rgba(1, 160, 78, 1)'); //green - expect(await ContentCountTwo.getText()).toEqual('985'); + expect(await ContentCountTwo.getText()).toEqual('979'); expect(await ContentLabelThree.getText()).toContain('English I'); expect(ContentCountThree.getCssValue('background-color')).toBe('rgba(1, 160, 78, 1)'); //green - expect(await ContentCountThree.getText()).toEqual('403'); + expect(await ContentCountThree.getText()).toEqual('407'); expect(await ContentLabelFour.getText()).toContain('Algebra'); expect(ContentCountFour.getCssValue('background-color')).toBe('rgba(1, 160, 78, 1)'); //green - expect(await ContentCountFour.getText()).toEqual('184'); + expect(await ContentCountFour.getText()).toEqual('183'); expect(await ContentLabelFive.getText()).toContain('US History'); expect(ContentCountFive.getCssValue('background-color')).toBe('rgba(1, 160, 78, 1)'); //green - expect(await ContentCountFive.getText()).toEqual('66'); + expect(await ContentCountFive.getText()).toEqual('62'); expect(await ContentLabelSix.getText()).toContain('Demo - User Submitted Content'); expect(ContentCountSix.getCssValue('background-color')).toBe('rgba(1, 160, 78, 1)'); //green - expect(await ContentCountSix.getText()).toEqual('16'); + expect(await ContentCountSix.getText()).toEqual('17'); + expect(await ContentLabelSeven.getText()).toContain('Upload Demo'); + expect(ContentCountSeven.getCssValue('background-color')).toBe('rgba(1, 160, 78, 1)'); //green + expect(await ContentCountSeven.getText()).toEqual('0'); + expect(await ContentLabelEight.getText()).toContain('Exploring - Access'); + expect(ContentCountEight.getCssValue('background-color')).toBe('rgba(1, 160, 78, 1)'); //green + expect(await ContentCountEight.getText()).toEqual('0'); + expect(await ContentLabelNine.getText()).toContain('Exploring - PowerPoint'); + expect(ContentCountNine.getCssValue('background-color')).toBe('rgba(1, 160, 78, 1)'); //green + expect(await ContentCountNine.getText()).toEqual('0'); + expect(await ContentLabelTen.getText()).toContain('Exploring - Word'); + expect(ContentCountTen.getCssValue('background-color')).toBe('rgba(1, 160, 78, 1)'); //green + expect(await ContentCountTen.getText()).toEqual('0'); await ExportButton.click().then(function() { browser.sleep(2500); }); @@ -262,9 +282,8 @@ function MyContentWidget() { expect(await ExportPageSubText.getText()).toEqual('Export complete!'); expect(ExportPageDownloadExportButton.getCssValue('background-color')).toBe('rgba(1, 160, 78, 1)'); //green expect(await ExportPageDownloadExportButton.getText()).toEqual('Download Export'); - expect(BackToDashboardButton.getCssValue('background-color')).toBe('rgba(1, 160, 78, 1)'); //green - expect(await BackToDashboardButton.getText()).toEqual('1'); - await BackToDashboardButton.click().then(function() { + expect(await DashboardMenuIcon.getText()).toEqual('Dashboard'); + await DashboardMenuIcon.click().then(function() { browser.sleep(2500); }); }); @@ -272,8 +291,8 @@ function MyContentWidget() { function Algebra() { it(': Algebra, should verify Algebra data.', async function () { - var ContentLabelThree = element(by.css('.list-group-item:nth-child(3) > a')); var EC = protractor.ExpectedConditions; + var ContentLabelFour = element(by.css('.list-group-item:nth-child(4) > a')); //Filter Results Table var FilterResultsLabel = element(by.css('.well > b')); //Content Set @@ -310,7 +329,11 @@ function Algebra() { //Reset All link var ResetAllLink = element(by.linkText('Reset All')); - await ContentLabelThree.click().then(function() { + browser.wait(EC.visibilityOf(ContentLabelFour), 30000).then(function() { + browser.sleep(2500); + }); + expect(await ContentLabelFour.getText()).toEqual('Algebra'); + await ContentLabelFour.click().then(function() { browser.sleep(2500); }); browser.wait(EC.visibilityOf(FilterResultsLabel), 30000).then(function() { @@ -327,16 +350,16 @@ function Algebra() { expect(await GradeLabel.getText()).toEqual('Grade'); expect(NinethGradeCheckbox.isPresent()).toBe(true); expect(await NinethGradeLabel.getText()).toEqual('9'); - expect(await GradeCount.getText()).toContain('9 (182)'); + expect(await GradeCount.getText()).toContain('9 (181)'); expect(TenthGradeCheckbox.isPresent()).toBe(true); expect(await TenthGradeLabel.getText()).toEqual('10'); - expect(await GradeCount.getText()).toContain('10 (182)'); + expect(await GradeCount.getText()).toContain('10 (180)'); expect(EleventhGradeCheckbox.isPresent()).toBe(true); expect(await EleventhGradeLabel.getText()).toEqual('11'); - expect(await GradeCount.getText()).toContain('11 (172)'); + expect(await GradeCount.getText()).toContain('11 (170)'); expect(TwelfthGradeCheckbox.isPresent()).toBe(true); expect(await TwelfthGradeLabel.getText()).toEqual('12'); - expect(await GradeCount.getText()).toContain('12 (172)'); + expect(await GradeCount.getText()).toContain('12 (170)'); expect(EighthGradeCheckbox.isPresent()).toBe(true); expect(await EighthGradeLabel.getText()).toEqual('8'); expect(await GradeCount.getText()).toContain('8 (15)'); @@ -350,10 +373,10 @@ function Algebra() { expect(await AlignmentStatusLabel.getText()).toEqual('Alignment Status'); expect(NotAlignedCheckbox.isPresent()).toBe(true); expect(await NotAlignedLabel.getText()).toEqual('Not Aligned'); - expect(await CountTable.getText()).toContain('Not Aligned (181)'); + expect(await CountTable.getText()).toContain('Not Aligned (175)'); expect(PendingCheckbox.isPresent()).toBe(true); expect(await PendingLabel.getText()).toEqual('Pending'); - expect(await CountTable.getText()).toContain('Pending (2)'); + expect(await CountTable.getText()).toContain('Pending (8)'); //Reset All link expect(await ResetAllLink.getText()).toEqual('Reset All'); }); @@ -367,12 +390,13 @@ function ResultsPanel() { var EC = protractor.ExpectedConditions; var SaveSearchDIVTitle = element(by.css('#myModalLabel')); var SaveSearchDescriptionLabel = element(by.css('#save')); - var SaveSearchDescriptionTextBox = element(by.css('.form-control')); + var SaveSearchDescriptionTextBox = element(by.css('.form-control:nth-child(3)')); var SaveSearchButton = element(by.css('#save > input.btn.btn-primary')); - var ValidationText = element(by.css('.alert')); - var SaveSearchDIVXCloseIcon = element(by.css('span:nth-child(1)')); + var ValidationText = element(by.css('.alert-danger')); + var ValidationTextTwo = element(by.css('.alert:nth-child(1)')); + var SaveSearchDIVXCloseIcon = element(by.css('.modal-header span')); var PrintIcon = element(by.css('.icon-link > img')); - var ResultsCount = element(by.css('#pub > div:nth-child(4)')); + var ResultsCount = element(by.css('.float-left:nth-child(5)')); var PaginationOne = element(by.linkText('1')); var PaginationTwo = element(by.linkText('2')); var PaginationThree = element(by.linkText('3')); @@ -382,10 +406,31 @@ function ResultsPanel() { var PaginationEight = element(by.linkText('8')); var PaginationShowAll = element(by.linkText('Show All')); //Results - var Results3VariableLinearSystemWordProblem = element(by.linkText('3-variable linear system word problem')); - var Results3VariableLinearSystemWordProblemDescription = element(by.css('.card:nth-child(6) .lo-descr')); - var ResultsDesciptionOne = element(by.css('.card:nth-child(6) small')); - var ViewDetailsButton = element(by.linkText('View Details')); + //Angle relationships example (Video) + var AngleRelationshipsExampleVideo = element(by.linkText('Angle relationships example (Video)')); + var AngleRelationshipsExampleVideoDescription = element(by.css('.card:nth-child(8) .lo-descr')); + var AngleRelationshipsExampleVideoContentSet = element(by.css('.card:nth-child(8) small')); + var AngleRelationshipsExampleVideoViewDetailsButton = element(by.linkText('View Details')); + var ViewDetatilsContentOneViewDetatils = element(by.css('#content873065502')); + var AngleRelationshipsExampleVideoAlignmentStatusIcon = element(by.css('#alignstatuslink873065502 > .display-alignment')); + var AngleRelationshipsExampleVideoAlignmentSatuts = element(by.linkText('Not Aligned')); + var AngleRelationshipsExampleVideoViewStandardsButton = element(by.linkText('View Standards')); + //Angles of parallel lines 2 + var AnglesOfParallelLines2 = element(by.linkText('Angles of parallel lines 2')); + var AnglesOfParallelLines2Description = element(by.css('.card:nth-child(9) .lo-descr')); + var AnglesOfParallelLines2ContentSet = element(by.css('.card:nth-child(9) small')); + var AnglesOfParallelLines2ViewDetailsButton = element(by.css('.card:nth-child(9) > .card-body > div > .btn')); + var AnglesOfParallelLines2AlignmentStatusIcon = element(by.css('#alignstatuslink873065503 > .display-alignment')); + var AnglesOfParallelLines2AlignmentSatuts = element(by.css('#alignstatuslink873065503 .email')); + var AnglesOfParallelLines2ViewStandardsButton = element(by.css('.card:nth-child(9) .well > .btn')); + //ANOVA 1: Calculating SST (total sum of squares)(Video) + var ANOVA1CalculatingSST = element(by.linkText('ANOVA 1: Calculating SST (total sum of squares) (Video)')); + var ANOVA1CalculatingSSTDescription = element(by.css('.card:nth-child(10) .lo-descr')); + var ANOVA1CalculatingSSTContentSet = element(by.css('.card:nth-child(10) small')); + var ANOVA1CalculatingSSTViewDetailsButton = element(by.css('.card:nth-child(10) > .card-body > div > .btn')); + var ANOVA1CalculatingSSTAlignmentStatusIcon = element(by.css('#alignstatuslink873565165 > .display-alignment')); + var ANOVA1CalculatingSSTAlignmentSatuts = element(by.css('#alignstatuslink873565165 .email')); + var ANOVA1CalculatingSSTViewStandardsButton = element(by.css('.card:nth-child(10) .well > .btn')); expect(await HomeLink.getText()).toEqual('Home'); expect(ContentBreadcrumb.getCssValue('color')).toBe('rgba(1, 160, 78, 1)'); //green @@ -411,8 +456,8 @@ function ResultsPanel() { await SaveSearchButton.click().then(function() { browser.sleep(2500); }); - expect(ValidationText.getCssValue('background-color')).toBe('rgba(38, 185, 154, 0.88)'); //green - expect(await ValidationText.getText()).toEqual('Your search was saved successfully! It can now be recalled on your Saved Searches page.'); + expect(ValidationTextTwo.getCssValue('background-color')).toBe('rgba(38, 185, 154, 0.88)'); //green + expect(await ValidationTextTwo.getText()).toEqual('Your search was saved successfully! It can now be recalled on your Saved Searches page.'); await SaveSearchDIVXCloseIcon.click().then(function() { browser.sleep(2500); }); @@ -444,14 +489,51 @@ function ResultsPanel() { expect(PaginationShowAll.getCssValue('color')).toBe('rgba(1, 160, 78, 1)'); //green expect(await PaginationShowAll.getText()).toEqual('Show All'); //Results - expect(await Results3VariableLinearSystemWordProblem.getText()).toEqual('3-variable linear system word problem'); - expect(await Results3VariableLinearSystemWordProblemDescription.getText()).toContain('Learn how to make the most out of the familiar algebraic techniques in order to solve systems of three equations with three variables.'); - expect(await ResultsDesciptionOne.getText()).toEqual('Content Set: Algebra'); - expect(ViewDetailsButton.getCssValue('background-color')).toBe('rgba(1, 160, 78, 1)'); //green - expect(await ViewDetailsButton.getText()).toEqual('View Details'); - await ViewDetailsButton.click().then(function() { + //Angle relationships example (Video) + expect(await AngleRelationshipsExampleVideo.getText()).toEqual('Angle relationships example (Video)'); + expect(await AngleRelationshipsExampleVideoDescription.getText()).toContain('Explore the different types of angles'); + expect(await AngleRelationshipsExampleVideoContentSet.getText()).toEqual('Content Set: Algebra'); + expect(AngleRelationshipsExampleVideoViewDetailsButton.getCssValue('background-color')).toBe('rgba(1, 160, 78, 1)'); //green + expect(await AngleRelationshipsExampleVideoViewDetailsButton.getText()).toEqual('View Details'); + expect(AngleRelationshipsExampleVideoAlignmentStatusIcon.isPresent()).toBe(true); + expect(await AngleRelationshipsExampleVideoAlignmentSatuts.getText()).toEqual('Not Aligned'); + expect(AngleRelationshipsExampleVideoViewStandardsButton.getCssValue('background-color')).toBe('rgba(1, 160, 78, 1)'); //green + expect(await AngleRelationshipsExampleVideoViewStandardsButton.getText()).toEqual('View Standards'); + await AngleRelationshipsExampleVideoViewDetailsButton.click().then(function() { browser.sleep(2500); }); + expect(await ViewDetatilsContentOneViewDetatils.getText()).toContain('Content Type: Tutorial'); + expect(await ViewDetatilsContentOneViewDetatils.getText()).toContain('Format: Online Video'); + expect(await ViewDetatilsContentOneViewDetatils.getText()).toContain('Free or Fee: Free'); + expect(await ViewDetatilsContentOneViewDetatils.getText()).toContain('Grade Range: 7 to 12'); + expect(await ViewDetatilsContentOneViewDetatils.getText()).toContain('Language: English'); + expect(await ViewDetatilsContentOneViewDetatils.getText()).toContain('Level-On Target: 9'); + expect(await ViewDetatilsContentOneViewDetatils.getText()).toContain('Login Required: No'); + expect(await ViewDetatilsContentOneViewDetatils.getText()).toContain('Printable: Yes'); + expect(await ViewDetatilsContentOneViewDetatils.getText()).toContain('Source: Khan Academy'); + expect(await ViewDetatilsContentOneViewDetatils.getText()).toContain('Subject(s): Mathematics'); + expect(await ViewDetatilsContentOneViewDetatils.getText()).toContain('Target Audience: Student'); + expect(await ViewDetatilsContentOneViewDetatils.getText()).toContain('Terms of Use: https://www.khanacademy.org/about/tos'); + //Angles of parallel lines 2 + expect(await AnglesOfParallelLines2.getText()).toEqual('Angles of parallel lines 2'); + expect(await AnglesOfParallelLines2Description.getText()).toContain('Angles of parallel lines examples'); + expect(await AnglesOfParallelLines2ContentSet.getText()).toEqual('Content Set: Algebra'); + expect(AnglesOfParallelLines2ViewDetailsButton.getCssValue('background-color')).toBe('rgba(1, 160, 78, 1)'); //green + expect(await AnglesOfParallelLines2ViewDetailsButton.getText()).toEqual('View Details'); + expect(AnglesOfParallelLines2AlignmentStatusIcon.isPresent()).toBe(true); + expect(await AnglesOfParallelLines2AlignmentSatuts.getText()).toEqual('Not Aligned'); + expect(AnglesOfParallelLines2ViewStandardsButton.getCssValue('background-color')).toBe('rgba(1, 160, 78, 1)'); //green + expect(await AnglesOfParallelLines2ViewStandardsButton.getText()).toEqual('View Standards'); + //ANOVA 1: Calculating SST (total sum of squares)(Video) + expect(await ANOVA1CalculatingSST.getText()).toEqual('ANOVA 1: Calculating SST (total sum of squares) (Video)'); + expect(await ANOVA1CalculatingSSTDescription.getText()).toContain("You already know a good bit about hypothesis testing with one or two samples. Now we take things further by making inferences based on three or more samples. We'll use the very special F-distribution to do it (F stands for "); + expect(await ANOVA1CalculatingSSTContentSet.getText()).toEqual('Content Set: Algebra'); + expect(ANOVA1CalculatingSSTViewDetailsButton.getCssValue('background-color')).toBe('rgba(1, 160, 78, 1)'); //green + expect(await ANOVA1CalculatingSSTViewDetailsButton.getText()).toEqual('View Details'); + expect(ANOVA1CalculatingSSTAlignmentStatusIcon.isPresent()).toBe(true); + expect(await ANOVA1CalculatingSSTAlignmentSatuts.getText()).toEqual('Not Aligned'); + expect(ANOVA1CalculatingSSTViewStandardsButton.getCssValue('background-color')).toBe('rgba(1, 160, 78, 1)'); //green + expect(await ANOVA1CalculatingSSTViewStandardsButton.getText()).toEqual('View Standards'); }); } @@ -520,15 +602,17 @@ function DeleteSavedSearch() { //Content Results var HomeLink = element(by.linkText('Home')); var ContentLabel = element(by.css('.breadcrumb-item:nth-child(2)')); - var ResultsCountLabel = element(by.css('#pub > div:nth-child(4)')); - var ThreeVariableLinearSystemWordProblem = element(by.linkText('3-variable linear system word problem')); - var ContentDescriptionOne = element(by.css('.card:nth-child(6) .lo-descr')); - var ContentSetResultLabelOne = element(by.css('.card:nth-child(6) small')); - var ContentViewDetailsButtonOne = element(by.css('.card:nth-child(6) > .card-body > div > .btn')); - var ViewDetatilsContentOne = element(by.css('#content873065498')); + var ResultsCountLabel = element(by.css('.float-left:nth-child(5)')); + var AngleRelationshipsExampleVideo = element(by.linkText('Angle relationships example (Video)')); + var ContentDescriptionOne = element(by.css('.card:nth-child(8) .lo-descr')); + var ContentDescriptionOneAlt = element(by.css('.card:nth-child(7) .lo-descr')); + var ContentSetResultLabelOne = element(by.css('.card:nth-child(8) small')); + var ContentSetResultLabelOneAlt = element(by.css('.card:nth-child(7) small')); + var ContentViewDetailsButtonOne = element(by.css('.card:nth-child(8) > .card-body > div > .btn')); + var ViewDetatilsContentOne = element(by.css('#content873065502')); var PendingIcon = element(by.css('.alignment-pending')); var AlignmentPendingLabel = element(by.linkText('Alignment Pending')); - var ViewStandardsButtonOne = element(by.css('.card:nth-child(6) .well > .btn')); + var ViewStandardsButtonOne = element(by.css('.card:nth-child(8) .well > .btn')); var DecimalOperations = element(by.linkText('Decimal Operations')); //View Standards DIV var ViewStandardsDIVTitle = element(by.css('.modal-title')); @@ -536,35 +620,52 @@ function DeleteSavedSearch() { var ViewStandardsDIVText = element(by.css('.mb-1:nth-child(1)')); var ViewStandardsDIVStandardsLabel = element(by.css('label > b')); var ViewStandardsDIVDropDown = element(by.css('#iStateIds')); - var ViewStandardsDIVViewStandardsButton = element(by.css('.btn:nth-child(1)')); - //California Content Standards + var ViewStandardsDIVViewStandardsButton = element(by.css('.form-group > .btn')); + //California Content Standards - Results var SearchLink = element(by.linkText('Search')); var ResultsLink = element(by.linkText('Results')); var CorrelatedStandardsBreadcrumb = element(by.css('.breadcrumb-item:nth-child(3)')); var ThreeVariableLinearSystemWordProblemDescription = element(by.css('.lo-descr')); - var ViewDetailsButton = element(by.linkText('View Details')); - var ViewDetailsData = element(by.css('#content873065498')); + var ViewDetailsButton = element(by.css('.btn')); + var ViewDetailsData = element(by.css('#content873065502')); var CaliforniaContentStandardsLabel = element(by.css('h4')); - var SubjectAndGradeText = element(by.css('strong:nth-child(7)')); - var CAContentStandardsHeaderOne = element(by.css('.card:nth-child(8) > .card-header')); - var ACEDLabelOne = element(by.xpath('//div[2]/div/b')); - var ACEDOne = element(by.id('stdbox')); - var ACEDTwo = element(by.xpath('//div[2]/div[2]')); - var ACEDThree = element(by.xpath('//div[3]/b')); - var ACEDFour = element(by.xpath('//div[2]/div[3]')); - var ACEDFive = element(by.xpath('//div[4]/b')); - var ACEDSix = element(by.xpath('//div[4]')); - var FBFLabel = element(by.xpath('//div[5]/b')); - var FBFOne = element(by.xpath('//div[5]')); - var FBFTwo = element(by.xpath('//div[6]')); - var FBFThree = element(by.xpath('//div[7]/b')); - var FBFFour = element(by.xpath('//div[7]')); - var FBFFive = element(by.xpath('//div[8]/b')); - var FBFSix = element(by.xpath('//div[8]')); - var CAContentStandardsHeaderTwo = element(by.css('.card:nth-child(9) > .card-header')); - var ACEDLabelTwo = element(by.xpath("(//div[@id='stdbox']/b)[7]")); - var ACEDOneTwo = element(by.xpath("(//div[@id='stdbox'])[9]")); - var ACEDTwoTwo = element(by.xpath("(//div[@id='stdbox'])[10]")); + //Grade9 - Results + var SubjectAndGradeLabelGrade9 = element(by.css('strong:nth-child(7)')); + var CAAIAlgebraICourseHeaderGrade9 = element(by.css('.card:nth-child(8) > .card-header')); + var CAAIAlgebraIStrandTitleGrade9 = element(by.xpath('//div[2]/div/b')); + var CAAIAlgebraIStrandDescriptionGrade9 = element(by.id('stdbox')); + var CAAIAlgebraIStandardParentDescriptionGrade9 = element(by.xpath('//div[2]/div[2]')); + var CAAIAlgebraIStandardGrade9 = element(by.xpath('//div[3]/b')); + var CAAIAlgebraIStandardDescriptionGrade9 = element(by.xpath('//div[2]/div[3]')); + var CAAIAlgebraIStandardDescriptionAddedBadgeGrade9 = element(by.css('.card:nth-child(8) .badge')); + //Grade10 - Results + var SubjectAndGradeLabelGrade10 = element(by.css('strong:nth-child(9)')); + var CAAIAlgebraICourseHeaderGrade10 = element(by.css('.card:nth-child(10) > .card-header')); + var CAAIAlgebraIStrandTitleGrade10 = element(by.xpath('//div[4]/div[2]/div/b')); + var CAAIAlgebraIStrandDescriptionGrade10 = element(by.xpath('//div[4]/div[2]/div')); + var CAAIAlgebraIStandardParentDescriptionGrade10 = element(by.xpath('//div[4]/div[2]/div[2]')); + var CAAIAlgebraIStandardGrade10 = element(by.xpath('//div[4]/div[2]/div[3]/b')); + var CAAIAlgebraIStandardDescriptionGrade10 = element(by.xpath('//div[4]/div[2]/div[3]')); + var CAAIAlgebraIStandardDescriptionAddedBadgeGrade10 = element(by.css('.card:nth-child(10) .badge')); + //Grade11 - Results + var SubjectAndGradeLabelGrade11 = element(by.css('strong:nth-child(11)')); + var CAAIAlgebraICourseHeaderGrade11 = element(by.css('.card:nth-child(12) > .card-header')); + var CAAIAlgebraIStrandTitleGrade11 = element(by.xpath('//div[5]/div[2]/div/b')); + var CAAIAlgebraIStrandDescriptionGrade11 = element(by.xpath('//div[5]/div[2]/div')); + var CAAIAlgebraIStandardParentDescriptionGrade11 = element(by.xpath('//div[5]/div[2]/div[2]')); + var CAAIAlgebraIStandardGrade11 = element(by.xpath('//div[5]/div[2]/div[3]/b')); + var CAAIAlgebraIStandardDescriptionGrade11 = element(by.xpath('//div[5]/div[2]/div[3]')); + var CAAIAlgebraIStandardDescriptionAddedBadgeGrade11 = element(by.css('.card:nth-child(12) .badge')); + //Grade12 - Results + var SubjectAndGradeLabelGrade12 = element(by.css('strong:nth-child(13)')); + var CAAIAlgebraICourseHeaderGrade12 = element(by.css('.card:nth-child(14) > .card-header')); + var CAAIAlgebraIStrandTitleGrade12 = element(by.xpath('//div[6]/div[2]/div/b')); + var CAAIAlgebraIStrandDescriptionGrade12 = element(by.xpath('//div[6]/div[2]/div')); + var CAAIAlgebraIStandardParentDescriptionGrade12 = element(by.xpath('//div[6]/div[2]/div[2]')); + var CAAIAlgebraIStandardGrade12 = element(by.xpath('//div[6]/div[2]/div[3]/b')); + var CAAIAlgebraIStandardDescriptionGrade12 = element(by.xpath('//div[6]/div[2]/div[3]')); + var CAAIAlgebraIStandardDescriptionAddedBadgeGrade12 = element(by.css('.card:nth-child(14) .badge')); + //Verify Language - Only Four Results (saved search) browser.executeScript('window.scrollTo(0, 0);').then(function() { @@ -613,16 +714,16 @@ function DeleteSavedSearch() { expect(await GradeLabel.getText()).toEqual('Grade'); expect(NinethGradeCheckbox.isPresent()).toBe(true); expect(await GradeLabelOne.getText()).toEqual('9'); - expect(await GradeCount.getText()).toContain('9 (182)'); + expect(await GradeCount.getText()).toContain('9 (181)'); expect(TenthGradeCheckbox.isPresent()).toBe(true); expect(await GradeLabelTwo.getText()).toEqual('10'); - expect(await GradeCount.getText()).toContain('10 (182)'); + expect(await GradeCount.getText()).toContain('10 (180)'); expect(EleventhGradeCheckbox.isPresent()).toBe(true); expect(await GradeLabelThree.getText()).toEqual('11'); - expect(await GradeCount.getText()).toContain('11 (172)'); + expect(await GradeCount.getText()).toContain('11 (170)'); expect(TwelfthGradeCheckbox.isPresent()).toBe(true); expect(await GradeLabelFour.getText()).toEqual('12'); - expect(await GradeCount.getText()).toContain('12 (172)'); + expect(await GradeCount.getText()).toContain('12 (170)'); expect(EighthGradeCheckbox.isPresent()).toBe(true); expect(await GradeLabelFive.getText()).toEqual('8'); expect(await GradeCount.getText()).toContain('8 (15)'); @@ -636,18 +737,19 @@ function DeleteSavedSearch() { expect(await AlignmentStatusLabel.getText()).toEqual('Alignment Status'); expect(NotAlignedCheckbox.isPresent()).toBe(true); expect(await NotAlignedLabel.getText()).toEqual('Not Aligned'); - expect(await CountTable.getText()).toContain('Not Aligned (181)'); + expect(await CountTable.getText()).toContain('Not Aligned (175)'); expect(PendingCheckbox.isPresent()).toBe(true); expect(await PendingLabel.getText()).toEqual('Pending'); - expect(await CountTable.getText()).toContain('Pending (2)'); + expect(await CountTable.getText()).toContain('Pending (8)'); //Reset All link expect(await ResetAllLink.getText()).toEqual('Reset All'); //Content Results expect(await HomeLink.getText()).toEqual('Home'); expect(await ContentLabel.getText()).toEqual('Content'); expect(await ResultsCountLabel.getText()).toEqual('Results 1 - 25 of 183'); - expect(await ThreeVariableLinearSystemWordProblem.getText()).toEqual('3-variable linear system word problem'); - expect(await ContentDescriptionOne.getText()).toContain('Learn how to make the most out of the familiar algebraic techniques in order to solve systems of three equations with three variables.'); + expect(await AngleRelationshipsExampleVideo.getText()).toEqual('Angle relationships example (Video)'); + expect(await ContentDescriptionOne.getText()).toContain('Explore the different types of angles'); + expect(await ContentDescriptionOne.getText()).toContain('Content Set: Algebra'); expect(await ContentSetResultLabelOne.getText()).toEqual('Content Set: Algebra'); expect(ContentViewDetailsButtonOne.getCssValue('background-color')).toBe('rgba(1, 160, 78, 1)'); //green expect(await ContentViewDetailsButtonOne.getText()).toEqual('View Details'); @@ -687,12 +789,12 @@ function DeleteSavedSearch() { browser.wait(EC.visibilityOf(SearchLink), 30000).then(function() { browser.sleep(2500); }); - //California Content Standards + //California Content Standards - Results expect(await SearchLink.getText()).toEqual('Search'); expect(await ResultsLink.getText()).toEqual('Results'); expect(await CorrelatedStandardsBreadcrumb.getText()).toEqual('Correlated Standards'); - expect(await ThreeVariableLinearSystemWordProblem.getText()).toEqual('3-variable linear system word problem'); - expect(await ThreeVariableLinearSystemWordProblemDescription.getText()).toEqual('Learn how to make the most out of the familiar algebraic techniques in order to solve systems of three equations with three variables.'); + expect(await AngleRelationshipsExampleVideo.getText()).toEqual('Angle relationships example (Video)'); + expect(await ThreeVariableLinearSystemWordProblemDescription.getText()).toEqual('Explore the different types of angles'); expect(ViewDetailsButton.getCssValue('background-color')).toBe('rgba(1, 160, 78, 1)'); //green expect(await ViewDetailsButton.getText()).toEqual('View Details'); await ViewDetailsButton.click().then(function() { @@ -701,7 +803,7 @@ function DeleteSavedSearch() { browser.wait(EC.visibilityOf(ViewDetailsData), 30000).then(function() { browser.sleep(2500); }); - expect(await ViewDetailsData.getText()).toContain("Expected 'Content Type: Tutorial"); + expect(await ViewDetailsData.getText()).toContain('Content Type: Tutorial'); expect(await ViewDetailsData.getText()).toContain('Format: Online Video'); expect(await ViewDetailsData.getText()).toContain('Free or Fee: Free'); expect(await ViewDetailsData.getText()).toContain('Grade Range: 7 to 12'); @@ -717,27 +819,51 @@ function DeleteSavedSearch() { browser.sleep(2500); }); expect(await CaliforniaContentStandardsLabel.getText()).toEqual('California Content Standards'); - expect(await SubjectAndGradeText.getText()).toEqual('Mathematics - Grade 9'); - expect(await CAContentStandardsHeaderOne.getText()).toEqual('CA.AI. Algebra I'); - expect(await ACEDLabelOne.getText()).toEqual('A-CED.'); - expect(await ACEDOne.getText()).toContain('Algebra: Creating Equations'); - expect(await ACEDTwo.getText()).toEqual('Create equations that describe numbers or relationships. [Linear, quadratic, and exponential (integer inputs only); for A.CED.3 linear only]'); - expect(await ACEDThree.getText()).toEqual('A-CED.1.'); - expect(await ACEDFour.getText()).toContain('Create equations and inequalities in one variable including ones with absolute value and use them to solve problems. Include equations arising from linear and quadratic functions, and simple rational and exponential functions. CA'); - expect(await ACEDFive.getText()).toEqual('A-CED.3.'); - expect(await ACEDSix.getText()).toContain('Represent constraints by equations or inequalities, and by systems of equations and/or inequalities, and interpret solutions as viable or non-viable options in a modeling context. For example, represent inequalities describing nutritional and cost constraints on combinations of different foods.'); - expect(await FBFLabel.getText()).toEqual('F-BF.'); - expect(await FBFOne.getText()).toContain('Functions: Building Functions'); - expect(await FBFTwo.getText()).toEqual('Build a function that models a relationship between two quantities. [For F.BF.1, 2, linear, exponential, and quadratic]'); - expect(await FBFThree.getText()).toEqual('F-BF.1.'); - expect(await FBFFour.getText()).toContain('Write a function that describes a relationship between two quantities.'); - expect(await FBFFive.getText()).toEqual('F-BF.1.a.'); - expect(await FBFSix.getText()).toContain('Determine an explicit expression, a recursive process, or steps for calculation from a context.'); - expect(await CAContentStandardsHeaderTwo.getText()).toEqual('CA.AII. Algebra II'); - expect(await ACEDLabelTwo.getText()).toEqual('A-CED.'); - expect(await ACEDOneTwo.getText()).toContain('Algebra: Creating Equations'); - expect(await ACEDTwoTwo.getText()).toEqual('Create equations that describe numbers or relationships. [Equations using all available types of expressions, including simple root functions]'); - /*Delete last saved search + //Grade9 - Results + expect(await SubjectAndGradeLabelGrade9.getText()).toEqual('Mathematics - Grade 9'); + expect(await CAAIAlgebraICourseHeaderGrade9.getText()).toEqual('CA.AI. Algebra I'); + expect(await CAAIAlgebraIStrandTitleGrade9.getText()).toEqual('N-RN.'); + expect(await CAAIAlgebraIStrandDescriptionGrade9.getText()).toContain('Number and Quantity: The Real Number System'); + expect(await CAAIAlgebraIStandardParentDescriptionGrade9.getText()).toEqual('Extend the properties of exponents to rational exponents.'); + expect(CAAIAlgebraIStandardGrade9.getCssValue('color')).toBe('rgba(1, 160, 78, 1)'); //green + expect(await CAAIAlgebraIStandardGrade9.getText()).toEqual('N-RN.1.'); + expect(await CAAIAlgebraIStandardDescriptionGrade9.getText()).toContain('Explain how the definition of the meaning of rational exponents follows from extending the properties of integer exponents to those values, allowing for a notation for radicals in terms of rational exponents. For example, we define 5^(1/3) to be the cube root of 5 because we want (5^(1/3))^3 = 5^((1/3)3) to hold, so (5^(1/3))^3 must equal 5. added'); + expect(CAAIAlgebraIStandardDescriptionAddedBadgeGrade9.getCssValue('background-color')).toBe('rgba(40, 167, 69, 1)'); //green + expect(await CAAIAlgebraIStandardDescriptionAddedBadgeGrade9.getText()).toEqual('added'); + //Grade10 - Results + expect(await SubjectAndGradeLabelGrade10.getText()).toEqual('Mathematics - Grade 10'); + expect(await CAAIAlgebraICourseHeaderGrade10.getText()).toEqual('CA.AI. Algebra I'); + expect(await CAAIAlgebraIStrandTitleGrade10.getText()).toEqual('N-RN.'); + expect(await CAAIAlgebraIStrandDescriptionGrade10.getText()).toContain('Number and Quantity: The Real Number System'); + expect(await CAAIAlgebraIStandardParentDescriptionGrade10.getText()).toEqual('Extend the properties of exponents to rational exponents.'); + expect(CAAIAlgebraIStandardGrade10.getCssValue('color')).toBe('rgba(1, 160, 78, 1)'); //green + expect(await CAAIAlgebraIStandardGrade10.getText()).toEqual('N-RN.1.'); + expect(await CAAIAlgebraIStandardDescriptionGrade10.getText()).toContain('Explain how the definition of the meaning of rational exponents follows from extending the properties of integer exponents to those values, allowing for a notation for radicals in terms of rational exponents. For example, we define 5^(1/3) to be the cube root of 5 because we want (5^(1/3))^3 = 5^((1/3)3) to hold, so (5^(1/3))^3 must equal 5. added'); + expect(CAAIAlgebraIStandardDescriptionAddedBadgeGrade10.getCssValue('background-color')).toBe('rgba(40, 167, 69, 1)'); //green + expect(await CAAIAlgebraIStandardDescriptionAddedBadgeGrade10.getText()).toEqual('added'); + //Grade11 - Results + expect(await SubjectAndGradeLabelGrade11.getText()).toEqual('Mathematics - Grade 11'); + expect(await CAAIAlgebraICourseHeaderGrade11.getText()).toEqual('CA.AI. Algebra I'); + expect(await CAAIAlgebraIStrandTitleGrade11.getText()).toEqual('N-RN.'); + expect(await CAAIAlgebraIStrandDescriptionGrade11.getText()).toContain('Number and Quantity: The Real Number System'); + expect(await CAAIAlgebraIStandardParentDescriptionGrade11.getText()).toEqual('Extend the properties of exponents to rational exponents.'); + expect(CAAIAlgebraIStandardGrade11.getCssValue('color')).toBe('rgba(1, 160, 78, 1)'); //green + expect(await CAAIAlgebraIStandardGrade11.getText()).toEqual('N-RN.1.'); + expect(await CAAIAlgebraIStandardDescriptionGrade11.getText()).toContain('Explain how the definition of the meaning of rational exponents follows from extending the properties of integer exponents to those values, allowing for a notation for radicals in terms of rational exponents. For example, we define 5^(1/3) to be the cube root of 5 because we want (5^(1/3))^3 = 5^((1/3)3) to hold, so (5^(1/3))^3 must equal 5. added'); + expect(CAAIAlgebraIStandardDescriptionAddedBadgeGrade11.getCssValue('background-color')).toBe('rgba(40, 167, 69, 1)'); //green + expect(await CAAIAlgebraIStandardDescriptionAddedBadgeGrade11.getText()).toEqual('added'); + //Grade12 - Results + expect(await SubjectAndGradeLabelGrade12.getText()).toEqual('Mathematics - Grade 12'); + expect(await CAAIAlgebraICourseHeaderGrade12.getText()).toEqual('CA.AI. Algebra I'); + expect(await CAAIAlgebraIStrandTitleGrade12.getText()).toEqual('N-RN.'); + expect(await CAAIAlgebraIStrandDescriptionGrade12.getText()).toContain('Number and Quantity: The Real Number System'); + expect(await CAAIAlgebraIStandardParentDescriptionGrade12.getText()).toEqual('Extend the properties of exponents to rational exponents.'); + expect(CAAIAlgebraIStandardGrade12.getCssValue('color')).toBe('rgba(1, 160, 78, 1)'); //green + expect(await CAAIAlgebraIStandardGrade12.getText()).toEqual('N-RN.1.'); + expect(await CAAIAlgebraIStandardDescriptionGrade12.getText()).toContain('Explain how the definition of the meaning of rational exponents follows from extending the properties of integer exponents to those values, allowing for a notation for radicals in terms of rational exponents. For example, we define 5^(1/3) to be the cube root of 5 because we want (5^(1/3))^3 = 5^((1/3)3) to hold, so (5^(1/3))^3 must equal 5. added'); + expect(CAAIAlgebraIStandardDescriptionAddedBadgeGrade12.getCssValue('background-color')).toBe('rgba(40, 167, 69, 1)'); //green + expect(await CAAIAlgebraIStandardDescriptionAddedBadgeGrade12.getText()).toEqual('added'); + //Delete saved search await ProfileImage.click().then(function() { browser.sleep(2500); }); @@ -780,24 +906,24 @@ function DeleteSavedSearch() { expect(await ContentSetLabel.getText()).toEqual('Content Set'); //expect(AlgebraCheckBox.isPresent()).toBe(true); expect(await ContentSetLabelOne.getText()).toEqual('Demo - User Submitted Content'); - expect(await ContentSetCount.getText()).toContain('Demo - User Submitted Content (16)'); + expect(await ContentSetCount.getText()).toContain('Demo - User Submitted Content (17)'); //Grade expect(await GradeLabel.getText()).toEqual('Grade'); expect(NinethGradeCheckbox.isPresent()).toBe(true); expect(await GradeLabelOne.getText()).toEqual('5'); - expect(await GradeCount.getText()).toContain('5 (5)'); + expect(await GradeCount.getText()).toContain('5 (6)'); expect(TenthGradeCheckbox.isPresent()).toBe(true); expect(await GradeLabelTwo.getText()).toEqual('6'); - expect(await GradeCount.getText()).toContain('6 (4)'); + expect(await GradeCount.getText()).toContain('6 (5)'); expect(EleventhGradeCheckbox.isPresent()).toBe(true); expect(await GradeLabelThree.getText()).toEqual('4'); - expect(await GradeCount.getText()).toContain('4 (3)'); + expect(await GradeCount.getText()).toContain('4 (4)'); expect(TwelfthGradeCheckbox.isPresent()).toBe(true); expect(await GradeLabelFour.getText()).toEqual('2'); - expect(await GradeCount.getText()).toContain('2 (2)'); + expect(await GradeCount.getText()).toContain('2 (3)'); expect(EighthGradeCheckbox.isPresent()).toBe(true); expect(await GradeLabelFive.getText()).toEqual('3'); - expect(await GradeCount.getText()).toContain('3 (2)'); + expect(await GradeCount.getText()).toContain('3 (3)'); expect(await MoreLink.getText()).toEqual('More>>'); //Subject expect(await SubjectLabel.getText()).toEqual('Subject'); @@ -806,7 +932,7 @@ function DeleteSavedSearch() { expect(await SubjectCount.getText()).toContain('Science (12)'); expect(MathematicsCheckbox.isPresent()).toBe(true); expect(await SubjectLabelTwo.getText()).toEqual('Mathematics'); - expect(await SubjectCount.getText()).toContain('Mathematics (7)'); + expect(await SubjectCount.getText()).toContain('Mathematics (8)'); expect(LanguageArtsCheckbox.isPresent()).toBe(true); expect(await SubjectLabelThree.getText()).toEqual('Language Arts'); expect(await SubjectCount.getText()).toContain('Language Arts (4)'); @@ -816,7 +942,7 @@ function DeleteSavedSearch() { //Alignment Status expect(await AlignmentStatusLabel.getText()).toEqual('Alignment Status'); expect(await NotAlignedLabelTwo.getText()).toEqual('Not Aligned'); - expect(await AlignmentStatusCount.getText()).toContain('Not Aligned (13)'); + expect(await AlignmentStatusCount.getText()).toContain('Not Aligned (14)'); expect(await AlignedLabel.getText()).toEqual('Aligned'); expect(await AlignmentStatusCount.getText()).toContain('Aligned (1)'); expect(await NeedsReviewLabel.getText()).toEqual('Needs Review'); @@ -828,12 +954,12 @@ function DeleteSavedSearch() { //Content Results expect(await HomeLink.getText()).toEqual('Home'); expect(await ContentLabel.getText()).toEqual('Content'); - expect(await ResultsCountLabel.getText()).toEqual('Results 1 - 16 of 16'); + expect(await ResultsCountLabel.getText()).toEqual('Results 1 - 17 of 17'); expect(await DecimalOperations.getText()).toEqual('Decimal Operations'); - expect(await ContentDescriptionOne.getText()).toContain('Students will review adding, subtracting, and dividing decimals. This lesson includes a review and a quiz.'); - expect(await ContentDescriptionOne.getText()).toContain('Content Set: Demo - User Submitted Content'); - expect(await ContentSetResultLabelOne.getText()).toEqual('Content Set: Demo - User Submitted Content'); - expect(ContentViewDetailsButtonOne.getCssValue('background-color')).toBe('rgba(1, 160, 78, 1)'); //green*/ + expect(await ContentDescriptionOneAlt.getText()).toContain('Students will review adding, subtracting, and dividing decimals. This lesson includes a review and a quiz.'); + expect(await ContentDescriptionOneAlt.getText()).toContain('Content Set: Demo - User Submitted Content'); + expect(await ContentSetResultLabelOneAlt.getText()).toEqual('Content Set: Demo - User Submitted Content'); + expect(ContentViewDetailsButtonOne.getCssValue('background-color')).toBe('rgba(1, 160, 78, 1)'); //green }); }