diff --git a/app_journeysmap_spec.js b/app_journeysmap_spec.js index 82ebcd5..143cd95 100644 --- a/app_journeysmap_spec.js +++ b/app_journeysmap_spec.js @@ -29,7 +29,7 @@ describe('Journeysmap script', function () { await UserNameTextBox.sendKeys('QA_AutomatedRegression'); await PasswordTextBox.sendKeys('3Dm1nAuto'); await SignInButton.click().then(function() { - browser.sleep(10000); + browser.sleep(5000); browser.waitForAngular(); browser.getCurrentUrl(); }); @@ -95,7 +95,6 @@ describe('Journeysmap script', function () { MapInteraction(); //<<<>>> - //MyActivityJourneys MyActivityJourneys(); SurveyMetrics(); Logins(); @@ -181,7 +180,6 @@ function MyProgressWidget() { it(': MyProgressWidget, should interact with My Progress widget, navigate to Interest Survey, toggle language to Spanish then back to English and complete survey', async function () { var MyProgressWidgetTitle = element(by.css('.yourProgressTitle')); var ProgressLevel = element(by.css('.myProgressLevel')); - //var ProgressWidgetExpandCollapseIcon = element(by.css('.full-width > div > .fa')); var ProgressWidgetExpandIcon = element(by.css('.full-width .ng-scope')); var ActionOneCompleted = element(by.css('.col-md-3:nth-child(1) > .ng-scope')); var ActionTwo = element(by.css('.col-md-3:nth-child(2) > .ng-scope')); @@ -532,8 +530,8 @@ function InterestSurveyResultsWidget() { expect(await FirstOccupationCardTitle.getText()).toEqual('Administrative Law Judges, Adjudicators, and Hearing Officers'); expect(await FirstOccupationCardAtAGlanceIcon.getText()).toContain('At a'); expect(await FirstOccupationCardAtAGlanceIcon.getText()).toContain('Glance'); - expect(await FirstOccupationCardBestFitIcon.getText()).toContain('Interest'); - expect(await FirstOccupationCardBestFitIcon.getText()).toContain('Best Fit'); + expect(await FirstOccupationCardBestFitIcon.getText()).toContain('Interest');//loading issue, not consistent + expect(await FirstOccupationCardBestFitIcon.getText()).toContain('Best Fit');//loading issue, not consistent expect(await SecondOccupationCardTitle.getText()).toEqual('Administrative Services Managers'); expect(await ThirdOccupationCardTitle.getText()).toEqual('Administrative Services Managers'); browser.executeScript('window.scrollTo(0, 610);').then(function() { @@ -622,11 +620,10 @@ function InterestSurveyResultsClusters() { var AtAGlanceIcon = element(by.xpath('//territory-card/div/div/div/div/div/div[2]')); var AtAGlanceBackOfCardXCloseLink = element(by.xpath('//div[2]/div/div[2]/span')); var OccupationCardEllipsis = element(by.xpath('//div/div/div[2]/div/i')); - //var JourneymanIcon = element(by.xpath('//div[4]/div[2]')) + var JourneymanIcon = element(by.xpath('//div[4]/div[2]')) var LearnMoreButton = element(by.xpath('//div/div/div/div/div[2]/div[2]')); var EC = protractor.ExpectedConditions; - //var JourneymanIcon = element(by.css('.text-right .socialImgIcon .socialImgIconJourneyableSvg')); - var JourneymanIcon = element(by.css('.text-right .socialImgIconJourneyableSvg')); + var JourneyInfoIcon = element(by.css('.journey-info-circle')); expect(await WidgetTitle.getText()).toEqual('Clusters'); expect(await WidgetDescription.getText()).toEqual('To start your career exploration, select a cluster below.'); @@ -681,14 +678,11 @@ function InterestSurveyResultsClusters() { await OccupationCardEllipsis.click().then(function() { browser.sleep(2500); }); - await LearnMoreButton.click().then(function() { - browser.sleep(25000); + await JourneymanIcon.click().then(function() { + browser.sleep(5000); }); - /*await JourneymanIcon.click().then(function() { - browser.sleep(2500); - });*/ browser.waitForAngular(); - browser.wait(EC.elementToBeClickable(JourneymanIcon)); + browser.wait(EC.elementToBeClickable(JourneyInfoIcon)); browser.waitForAngular(); browser.getCurrentUrl(); }); @@ -696,8 +690,7 @@ function InterestSurveyResultsClusters() { function InterestSurveyResultsCreateJourney() { it(': InterestSurveyResultsCreateJourney, should create a Journey to Top Interest Survey Result', async function () { - var JourneymanIcon = element(by.css('.text-right .socialImgIcon .socialImgIconJourneyableSvg')); - var JourneySideBarHeader = element(by.css('.side-bar-child-text > span')); + var JourneySideBarHeaderOne = element(by.css('.side-bar-child-text > span')); var JourneyInfoIcon = element(by.css('.journey-info-circle')); var JourneyInfoDivTitle = element(by.css('.col-lg-12 > .ng-binding')); var JourneyInfoDivSubText = element(by.css('.col-lg-12:nth-child(3)')); @@ -705,26 +698,103 @@ function InterestSurveyResultsCreateJourney() { var JourneyEntryPoint = element(by.css('.journeyInput')); var SelectEntryPointDropDown = element(by.css('.ng-scope:nth-child(1) > .sidebarScrollListTxt > .ng-binding')); var StartYourJourneyButton = element(by.css('.journeyStartBtnEnable')); - var JourneyDetailsIcon = element(by.css('#journeyitem0 .journey-info-circle')); - var ExpandGradeSubJourney = element(by.css('.ng-scope:nth-child(4) .side-bar-journey-detail-child-txt')); - var ExpandSubjectSubJourney = element(by.css('.ng-scope:nth-child(11) .side-bar-journey-detail-child-txt')); - var ExpandStrandSubJourney = element(by.css('.ng-scope:nth-child(2) > div > div:nth-child(1) .side-bar-journey-detail-child-txt')); - var ExpandStandardSubJourney = element(by.css('.ng-scope:nth-child(2) > div > div:nth-child(1) .side-bar-journey-detail-child-txt')); - var ExpandBenchmarkSubJourney = element(by.css('.ng-scope:nth-child(2) > div > div:nth-child(1) .side-bar-journey-detail-child-txt')); - var UpOneLevelLink = element(by.css('div:nth-child(1) > .sidebarBackTxt')); - var JourneySaveIcon = element(by.css('#journeyCardIdx0 > .fas')); + var JourneysSideBarHeaderTwo = element(by.css('.sideBarSearchBarContainer > div:nth-child(1) > .ng-binding')); + var JourneySaveIcon = element(by.css('#journeyitem0 .mapActionBarActive > .fas')); var JourneySaveDivTitle = element(by.css('h2')); var JourneySaveDivDescription = element(by.css('p:nth-child(7)')); - //var JourneyPersistButtonYes = element(by.css('.confirm')); var JourneyPersistButtonNo = element(by.css('.cancel')); + var JourneyPersistButtonYes = element(by.css('.confirm')); + var JourneyDetailsIcon = element(by.css('#journeyitem0 .journey-info-circle')); + var ActionTitleBar = element(by.css('.ng-binding:nth-child(2)')); + var Expand8thGradeSubJourney = element(by.css('.ng-scope:nth-child(4) > div > div .side-bar-journey-detail-child-txt:nth-child(5)')); + var ExpandSubjectMathematicsSubJourney = element(by.css('.ng-scope:nth-child(11) .side-bar-journey-detail-child-txt:nth-child(6)')); + var ExpandSubJourney = element(by.css('.ng-scope:nth-child(2) > div > div:nth-child(1) > .ng-isolate-scope .side-bar-journey-detail-child-txt:nth-child(6)')); + var UpOneLevelLink = element(by.css('div:nth-child(1) > .sidebarBackTxt')); + var EditJourneyLink = element(by.linkText('Edit Journey')); + var WayPointOne = element(by.css('.itemWaypoint:nth-child(1) > .itemTextContainer > .ng-binding')); + var WayPointTwo = element(by.css('.itemWaypoint:nth-child(2) > .itemTextContainer > .ng-binding')); + var WayPointThree = element(by.css('.itemWaypoint:nth-child(3) > .itemTextContainer > .ng-binding')); + var WayPointFour = element(by.css('.itemWaypoint:nth-child(4) > .itemTextContainer > .ng-binding')); + var WayPointFive = element(by.css('.itemWaypoint:nth-child(5) > .itemTextContainer > .ng-binding')); + var WayPointSix = element(by.css('.itemWaypoint:nth-child(6) > .itemTextContainer > .ng-binding')); + var SelectWayPointTwoEllipsis = element(by.css('.itemWaypoint:nth-child(2) > .dropdown > .fas')); + var DeleteLink = element(by.linkText('Delete')); + var DeleteDiv = element(by.css('.modal-content > .ng-scope div:nth-child(1)')); + var DeleteDivRemoveThisWaypoint = element(by.css('.btn:nth-child(3)')); + var cancel = element(by.css('.fa-times-circle')); + var ActionBarSaveIconOne = element(by.css('.mapActionBarActive:nth-child(2) > .fas')); + var Select12thGradeWayPointEllipsis = element(by.css('.itemWaypoint:nth-child(7) > .dropdown > .fas')); + var InsertAStop = element(by.linkText('Insert a Stop')); + var SixthGradeWayPoint = element(by.css('.itemWaypoint:nth-child(1) > .itemTextContainer > .ng-binding:nth-child(1)')); + var SeventhGradeWayPoint = element(by.css('.itemWaypoint:nth-child(2) > .itemTextContainer > .ng-binding:nth-child(1)')); + var EightGradeWayPoint = element(by.css('.itemWaypoint:nth-child(3) > .itemTextContainer > .ng-binding:nth-child(1)')); + var NinethGradeWayPoint = element(by.css('.itemWaypoint:nth-child(4) > .itemTextContainer > .ng-binding:nth-child(1)')); + var TenthGradeWayPoint = element(by.css('.itemWaypoint:nth-child(5) > .itemTextContainer > .ng-binding:nth-child(1)')); + var EleventhGradeWayPoint = element(by.css('.itemWaypoint:nth-child(6) > .itemTextContainer > .ng-binding:nth-child(1)')); + var TwelvethGradeWayPoint = element(by.css('.itemWaypoint:nth-child(7) > .itemTextContainer > .ng-binding:nth-child(1)')); + var ThirteenthWayPoint = element(by.css('.itemWaypoint:nth-child(8) > .itemTextContainer > .ng-binding:nth-child(1)')); + var FourteenthWayPoint = element(by.css('.itemWaypoint:nth-child(9) > .itemTextContainer > .ng-binding:nth-child(1)')); + var EditSearchText = element(by.css('.sidebarNoResults:nth-child(1)')); + var MapSearchTextBox = element(by.css('#searchBox')); + var MagnifyingGlassIcon = element(by.css('.glyphicon-search')); + var ActionTitleBarTwo = element(by.css('.sideBarSearchBarContainer > div:nth-child(1) > .ng-binding')); + var CertificationResultsTab = element(by.css('#tab-item-6 > .ng-binding'));//#tab-item-2 > .ng-binding')); + var ThirdResultViewOnMapIconIcon = element(by.css('#tab-content-6 #searchitem2 div:nth-child(6) > .fas'));//#tab-content-2 #searchitem2 div:nth-child(6) > .fas')); + var MapZoomInIcon = element(by.css('.glyphicon-plus')); + var ThirdResultAddIcon = element(by.css('#tab-content-6 #searchitem2 div:nth-child(5) > #mapActionBarJourneyIcon'));//#tab-content-2 #searchitem2 div:nth-child(5) > #mapActionBarJourneyIcon')); + var FifteenthWayPoint = element(by.css('.itemWaypoint:nth-child(10) > .itemTextContainer > .ng-binding')); + var ActionBarSaveIconTwo = element(by.css('.fa-save')); + var MapZoomOutIcon = element(by.css('.glyphicon-minus')); + var SelectCollegeWayPointEllipsis = element(by.css('.itemWaypoint:nth-child(9) > .dropdown > .fas')); + var ReOrderLink = element(by.linkText('Re-order')); + var GrabCollegeWayPoint = element(by.css('.selectedWaypoint > .itemTextContainer > .ng-binding:nth-child(1)')); var DashboardHeaderLink = element(by.css('.ng-scope:nth-child(1) > a > .span-navbar-hover')); - - await JourneymanIcon.click().then(function() { + + //short cut to create journey + var Results = element(by.css('div:nth-child(6) .fa-chart-bar')); + var SecondAtAGlanceIcon = element(by.xpath('//div[2]/div/div/career-territory-card/territory-card/div/div/div/div/div/div[2]')); + var Select = element(by.xpath('//territory-card-action-bar/div/button')); + var Journey = element(by.xpath('//action-journey/span')); + await Results.click().then(function() { browser.sleep(5000); }); - expect(await JourneySideBarHeader.getText()).toEqual('Create Your Journey'); - await JourneyInfoIcon.click(); - browser.sleep(1000); + browser.actions().mouseMove(SecondAtAGlanceIcon).perform().then(function() { + browser.sleep(2500); + }); + await Select.click().then(function() { + browser.sleep(5000); + }); + browser.actions().mouseMove(SecondAtAGlanceIcon).perform().then(function() { + browser.sleep(2500); + }); + await Select.click().then(function() { + browser.sleep(5000); + }); + browser.actions().mouseMove(SecondAtAGlanceIcon).perform().then(function() { + browser.sleep(2500); + }); + await Journey.click().then(function() { + browser.sleep(5000); + });//end*/ + + /*short cut to retrieve journey + var MyJourneys = element(by.css('#nbMyJourneys .span-navbar-hover')); + var Journey = element(by.xpath('//div[2]/div/div/span')); + var ViewOnMap = element(by.css('.col-md-4 > .btn-info')); + await MyJourneys.click().then(function() { + browser.sleep(2500); + }); + await Journey.click().then(function() { + browser.sleep(2500); + }); + await ViewOnMap.click().then(function() { + browser.sleep(2500); + });//end - hide upto row 829*/ + + expect(await JourneySideBarHeaderOne.getText()).toEqual('Create Your Journey'); + await JourneyInfoIcon.click().then(function() { + browser.sleep(1000); + }); expect(await JourneyInfoDivTitle.getText()).toEqual('Create Your Journey'); expect(await JourneyInfoDivSubText.getText()).toEqual('A Journey is your driving direction. Enter a starting location, such as your current grade, as well as the destination you are trying to reach, like an occupation. From there we will provide you with possible pathways to reach your goal.'); await JourneyInfoDivXCloseLink.click().then(function() { @@ -737,31 +807,193 @@ function InterestSurveyResultsCreateJourney() { browser.waitForAngular(); await StartYourJourneyButton.click(); browser.waitForAngular(); - await JourneyDetailsIcon.click(); - browser.sleep(5000); - await ExpandGradeSubJourney.click(); - browser.sleep(5000); - await ExpandSubjectSubJourney.click(); - browser.sleep(5000); - await ExpandStrandSubJourney.click(); - browser.sleep(5000); - await ExpandStandardSubJourney.click(); - browser.sleep(5000); - await ExpandBenchmarkSubJourney.click(); - browser.sleep(5000); - await UpOneLevelLink.click(); - browser.sleep(5000); - await UpOneLevelLink.click(); - browser.sleep(5000); + expect(await JourneysSideBarHeaderTwo.getText()).toEqual('Journey Search Results'); browser.actions().mouseMove(JourneySaveIcon).perform().then(function() { - browser.sleep(2500); + browser.sleep(1000); + }); + await JourneySaveIcon.click().then(function() { + browser.sleep(5000); }); - await JourneySaveIcon.click(); - browser.sleep(5000); expect(await JourneySaveDivTitle.getText()).toEqual('Journey saved!'); expect(await JourneySaveDivDescription.getText()).toEqual('Would you like this journey to persist on the map?'); - await JourneyPersistButtonNo.click(); - browser.sleep(2500); + await JourneyPersistButtonYes.click().then(function() { + browser.sleep(2500); + }); + await JourneyDetailsIcon.click().then(function() { + browser.sleep(5000); + }); + expect(await ActionTitleBar.getText()).toEqual('Journey Search Results'); + await Expand8thGradeSubJourney.click().then(function() { + browser.sleep(5000); + }); + browser.actions().mouseMove(element(by.css('.ng-scope:nth-child(5) div:nth-child(2) .side-bar-journey-detail-child-txt:nth-child(5)'))).perform().then(function() { + browser.sleep(2500); + }); + await ExpandSubjectMathematicsSubJourney.click().then(function() { + browser.sleep(5000); + }); + browser.actions().mouseMove(JourneyDetailsIcon).perform().then(function() { + browser.sleep(2500); + }); + await ExpandSubJourney.click().then(function() { + browser.sleep(5000); + }); + await ExpandSubJourney.click().then(function() { + browser.sleep(5000); + }); + await ExpandSubJourney.click().then(function() { + browser.sleep(5000); + }); + await UpOneLevelLink.click().then(function() { + browser.sleep(5000); + }); + await UpOneLevelLink.click().then(function() { + browser.sleep(5000); + }); + await EditJourneyLink.click().then(function() { + browser.sleep(2500) + }); + expect(await ActionTitleBar.getText()).toEqual('Journey Edit'); + expect(await WayPointOne.getText()).toEqual('Geometry'); + expect(await WayPointTwo.getText()).toEqual('Expressions and Equations'); + expect(await WayPointThree.getText()).toEqual('Mathematical Practices'); + expect(await WayPointFour.getText()).toEqual('The Number System'); + expect(await WayPointFive.getText()).toEqual('Statistics and Probability'); + expect(await WayPointSix.getText()).toEqual('Functions'); + await SelectWayPointTwoEllipsis.click().then(function() { + browser.sleep(2500); + }); + browser.actions().mouseMove(DeleteLink).perform().then(function() { + browser.sleep(1000); + }); + await DeleteLink.click().then(function() { + browser.sleep(2500); + }); + expect(await DeleteDiv.getText()).toEqual('Are you sure you want to remove Expressions and Equations from this journey?'); + await DeleteDivRemoveThisWaypoint.click().then(function() { + browser.sleep(2500); + }); + expect(await ActionTitleBar.getText()).toEqual('Journey Edit'); + expect(await WayPointOne.getText()).toEqual('Geometry'); + expect(await WayPointTwo.getText()).toEqual('Mathematical Practices'); + expect(await WayPointThree.getText()).toEqual('The Number System'); + expect(await WayPointFour.getText()).toEqual('Statistics and Probability'); + expect(await WayPointFive.getText()).toEqual('Functions'); + await ActionBarSaveIconOne.click().then(function() { + browser.sleep(2500); + }); + expect(await ActionTitleBar.getText()).toEqual('Journey Search Results'); + await UpOneLevelLink.click().then(function() { + browser.sleep(5000); + }); + await UpOneLevelLink.click().then(function() { + browser.sleep(5000); + }); + await EditJourneyLink.click().then(function() { + browser.sleep(2500) + }); + expect(await ActionTitleBar.getText()).toEqual('Journey Edit'); + expect(await SixthGradeWayPoint.getText()).toEqual('6'); + expect(await SeventhGradeWayPoint.getText()).toEqual('7'); + expect(await EightGradeWayPoint.getText()).toEqual('8'); + expect(await NinethGradeWayPoint.getText()).toEqual('9'); + expect(await TenthGradeWayPoint.getText()).toEqual('10'); + expect(await EleventhGradeWayPoint.getText()).toEqual('11'); + browser.actions().mouseMove(FourteenthWayPoint).perform().then(function() { + browser.sleep(1000); + }); + expect(await TwelvethGradeWayPoint.getText()).toEqual('12'); + expect(await ThirteenthWayPoint.getText()).toEqual('Business Administration B.A./B.S.'); + expect(await FourteenthWayPoint.getText()).toEqual('Administrative Services Managers'); + await Select12thGradeWayPointEllipsis.click().then(function() { + browser.sleep(2500) + }); + browser.actions().mouseMove(InsertAStop).perform().then(function() { + browser.sleep(1000); + }); + await InsertAStop.click().then(function() { + browser.sleep(2500); + }); + expect(await ActionTitleBar.getText()).toEqual('Journey Add Stop'); + expect(await EditSearchText.getText()).toEqual('Use the search bar above to find a stop to add to your journey, or pick one from the map.'); + await MapSearchTextBox.sendKeys('Engineer').then(function() { + browser.sleep(2500); + }); + await MagnifyingGlassIcon.click().then(function() { + browser.sleep(5000); + }); + expect(await ActionTitleBarTwo.getText()).toEqual('Search Results'); + await CertificationResultsTab.click().then(function() { + browser.sleep(5000); + }); + browser.actions().mouseMove(ThirdResultViewOnMapIconIcon).perform().then(function() { + browser.sleep(1000); + }); + await ThirdResultViewOnMapIconIcon.click().then(function() { + browser.sleep(5000); + }); + await MapZoomInIcon.click().then(function() { + browser.sleep(2500); + }); + await MapZoomInIcon.click().then(function() { + browser.sleep(2500); + }); + await ThirdResultAddIcon.click().then(function() { + browser.sleep(2500); + }); + expect(await SixthGradeWayPoint.getText()).toEqual('6'); + expect(await SeventhGradeWayPoint.getText()).toEqual('7'); + expect(await EightGradeWayPoint.getText()).toEqual('8'); + expect(await NinethGradeWayPoint.getText()).toEqual('9'); + expect(await TenthGradeWayPoint.getText()).toEqual('10'); + expect(await EleventhGradeWayPoint.getText()).toEqual('11'); + browser.actions().mouseMove(FifteenthWayPoint).perform().then(function() { + browser.sleep(1000); + }); + expect(await TwelvethGradeWayPoint.getText()).toEqual('12'); + expect(await ThirteenthWayPoint.getText()).toEqual('National Chief Engineer/Assistant Engineer UFIV'); + expect(await FourteenthWayPoint.getText()).toEqual('Business Administration B.A./B.S.'); + expect(await FifteenthWayPoint.getText()).toEqual('Administrative Services Managers'); + await ActionBarSaveIconTwo.click().then(function() { + browser.sleep(2500); + }); + await MapZoomOutIcon.click(); + await MapZoomOutIcon.click(); + await MapZoomOutIcon.click(); + await MapZoomOutIcon.click(); + await MapZoomOutIcon.click(); + await MapZoomOutIcon.click(); + await MapZoomOutIcon.click(); + await MapZoomOutIcon.click().then(function() { + browser.sleep(1000) + }); + browser.actions().mouseMove(FifteenthWayPoint).perform().then(function() { + browser.sleep(1000); + }); + await SelectCollegeWayPointEllipsis.click().then(function() { + browser.sleep(2500) + }); + await ReOrderLink.click().then(function() { + browser.sleep(2500) + }); + browser.actions().dragAndDrop(GrabCollegeWayPoint, ThirteenthWayPoint).mouseUp().perform(); + browser.sleep(2500) + expect(await SixthGradeWayPoint.getText()).toEqual('6'); + expect(await SeventhGradeWayPoint.getText()).toEqual('7'); + expect(await EightGradeWayPoint.getText()).toEqual('8'); + expect(await NinethGradeWayPoint.getText()).toEqual('9'); + expect(await TenthGradeWayPoint.getText()).toEqual('10'); + expect(await EleventhGradeWayPoint.getText()).toEqual('11'); + browser.actions().mouseMove(FifteenthWayPoint).perform().then(function() { + browser.sleep(1000); + }); + expect(await TwelvethGradeWayPoint.getText()).toEqual('12'); + expect(await ThirteenthWayPoint.getText()).toEqual('Business Administration B.A./B.S.'); + expect(await FourteenthWayPoint.getText()).toEqual('National Chief Engineer/Assistant Engineer UFIV'); + expect(await FifteenthWayPoint.getText()).toEqual('Administrative Services Managers'); + await ActionBarSaveIconOne.click().then(function() { + browser.sleep(2500); + }); await DashboardHeaderLink.click().then(function() { browser.sleep(5000); }); @@ -1155,7 +1387,7 @@ function MyCareersCarousel() { var RemoveRightFilterButton = element(by.css('.statusBtn:nth-child(3)')); var WidgetFilterIcon = element(by.css('.fa-filter')); var FilterButtonTwo = element(by.css('tr:nth-child(24) .btn-info')); - var RemoveLastFilterButton = element(by.css('.statusBtn'));//.xIcon')); + var RemoveLastFilterButton = element(by.css('.statusBtn')); var FirstOccupationCardTitle = element(by.xpath('//div[3]/div/div[2]/span')); var FirstOccupationCardAtAGlanceIcon = element(by.xpath('//territory-card/div/div/div/div/div/div[2]')); var FirstOccupationCardBestFitIcon = element(by.xpath('//territory-card-fit-status/div/div/div[2]')); @@ -1239,12 +1471,10 @@ function MyCareersCarousel() { browser.sleep(5000); }); expect(await NoResultsFound.getText()).toContain('Sorry, Journeys found no matching results for that combination of filters. Please change the applied filters.'); - //expect(await RemoveLeftFilterButton.getText()).toEqual('Required Job Prep'); //debugging await RemoveLeftFilterButton.click().then(function() { browser.sleep(2500); }); expect(await NoResultsFound.getText()).toContain('Sorry, Journeys found no matching results for that combination of filters. Please change the applied filters.'); - //expect(await RemoveShowMyResultsByFilterButton.getText()).toEqual('Show My Results'); //debugging await RemoveShowMyResultsByFilterButton.click().then(function() { browser.sleep(2500); }); @@ -1255,7 +1485,6 @@ function MyCareersCarousel() { expect(await FirstOccupationCardBestFitIcon.getText()).toContain('Best Fit'); expect(await SecondOccupationCardTitle.getText()).toEqual('Business Intelligence Analysts'); expect(await ThirdOccupationCardTitle.getText()).toEqual('Airfield Operations Specialists'); - //expect(await RemoveRightFilterButton.getText()).toEqual('Z to A'); //debugging await RemoveRightFilterButton.click().then(function() { browser.sleep(2500); }); @@ -1286,7 +1515,6 @@ function MyCareersCarousel() { expect(await FirstOccupationCardBestFitIcon.getText()).toContain('Best Fit'); expect(await SecondOccupationCardTitle.getText()).toEqual('Administrative Services Managers'); expect(await ThirdOccupationCardTitle.getText()).toEqual('Administrative Services Managers'); - //expect(await RemoveLastFilterButton.getText()).toEqual('Fit'); //debugging await RemoveLastFilterButton.click().then(function() { browser.sleep(2500); }); @@ -1415,29 +1643,42 @@ function TopCareerWidget() { var Wages100KText = element(by.css('g:nth-child(3) > text')); var Wages150KText = element(by.css('g:nth-child(4) > text')); var Wages200KText = element(by.css('g:nth-child(5) > text')); - var ChangeLocationLinkText = element(by.css('.dropdown > .widgetRightControlContainer')); + var WagesChangeLocationLink = element(by.css('.dropdown > .widgetRightControlContainer')); var ZipCodeTextBox = element(by.css('.ng-valid-maxlength:nth-child(1)')); var ApplyButton = element(by.css('tr:nth-child(1) > td > .btn')); - var DegreesWidgetTitle = element(by.css('.widget-round-corners:nth-child(5) #id > .jrnys_lead-body-copy')); - var DegreesCardHeader = element(by.css('#id > table > tbody > tr > td > div > div > div > div.item.text-center.ng-isolate-scope.active > div:nth-child(1) > div > div > table > tbody > tr:nth-child(1) > td > div')); + var DegreesWidgetTitle = element(by.css('#liDegree .jrnys_lead-body-copy')); + var DegreesCardOneHeader = element(by.xpath('//div/div/div/div/table/tbody/tr/td/div')); + var DegreesCardTwoHeader = element(by.xpath('//div[2]/div/div/table/tbody/tr/td/div')); + var DegreesCardThreeHeader = element(by.xpath('//div[3]/div/div/table/tbody/tr/td/div')); var DegreesRightScroll = element(by.css('.table-height:nth-child(2) .right > .glyphicon')); - var CertificatesWidgetTitle = element(by.css('.widget-round-corners:nth-child(6) #id > .jrnys_lead-body-copy')); - var CertificatesCardHeader = element(by.css('#id > table > tbody > tr > td > div > div > div > div.item.text-center.ng-isolate-scope.active > div:nth-child(2) > div > div > table > tbody > tr:nth-child(1) > td > div')); - var CertificatesCardSubHeader = element(by.xpath('/html/body/div[1]/div/div/div[2]/ul/li[6]/div/div[2]/div[1]/table/tbody/tr/td/div/div/div/div[1]/div[1]/div/div/table/tbody/tr[1]/td/span')); //('#id > table > tbody > tr > td > div > div > div > div.item.text-center.ng-isolate-scope.active > div:nth-child(1) > div > div > table > tbody > tr:nth-child(1) > td > span')); + var CertificatesWidgetTitle = element(by.css('#liCertificate .jrnys_lead-body-copy')); + var CertificatesCardOneHeader = element(by.xpath('//career-certificate-carousel/div/div/table/tbody/tr/td/div/div/div/div/div/div/div/table/tbody/tr/td/div')); + var CertificatesCardOneSubHeader = element(by.xpath('//div/div/div/div/table/tbody/tr/td/span')); + var CertificatesCardTwoHeader = element(by.xpath('//career-certificate-carousel/div/div/table/tbody/tr/td/div/div/div/div/div[2]/div/div/table/tbody/tr/td/div')); + var CertificatesCardTwoSubHeader = element(by.xpath('//div[2]/div/div/table/tbody/tr/td/span')); + var CertificatesCardThreeHeader = element(by.xpath('//career-certificate-carousel/div/div/table/tbody/tr/td/div/div/div/div/div[3]/div/div/table/tbody/tr/td/div')); + var CertificatesCardThreeSubHeader = element(by.xpath('//div[3]/div/div/table/tbody/tr/td/span')); var CertificatesRightScroll = element(by.css('.widget-round-corners:nth-child(6) .right:nth-child(4) > .glyphicon:nth-child(1)')); - var InstitutionsWidgetTitle = element(by.xpath('//li[7]/div/div/div[2]/div/div')); - var InstitutionsCardHeader = element(by.css('#recommendedColleges > div > div > div.item.text-center.ng-isolate-scope.active > div:nth-child(1) > div > table > tbody > tr:nth-child(1) > td')); + var InstitutionsWidgetTitle = element(by.xpath('//recommended-colleges/div/div/div')); + var InstitutionsCardOneHeader = element(by.css('.item:nth-child(1) > .col-xs-4:nth-child(1) > .internat-carouse-padding > .full-width .jrnys_body-copy')); + var InstitutionsCardTwoHeader = element(by.css('.item:nth-child(1) > .col-xs-4:nth-child(2) > .internat-carouse-padding > .full-width .jrnys_body-copy')); + var InstitutionsCardThreeHeader = element(by.css('.item:nth-child(1) > .col-xs-4:nth-child(3) > .internat-carouse-padding > .full-width .jrnys_body-copy')); var InstitutionsRightScroll = element(by.css('#recommendedColleges .right > .glyphicon')); - var TopResourcesWidgetTitle = element(by.css('#id > .fullHeight > .jrnys_lead-body-copy')); - var TopResources3rdCardHeader = element(by.css('.item:nth-child(1) > .col-xs-4:nth-child(3) .hotTitles')); - var TopResources3rdCardSaveIcon = element(by.xpath('/html/body/div[1]/div/div/div[2]/ul/li[8]/resource-carousel/div[2]/div/table/tbody/tr/td/div[2]/div/div/div[1]/div[3]/div/resource-card/div/table/tbody/tr[3]/td/social-follow-icon/span/i')); - var TopResourcesRightScroll = element(by.css('.table-height:nth-child(3) .right > .glyphicon')); + var TopResourcesWidgetTitle = element(by.css('#id .jrnys_lead-body-copy')); + var TopResourcesCardOneHeader = element(by.css('.item:nth-child(1) > .col-xs-4:nth-child(1) .hotTitles')); + var TopResourcesCardTwoHeader = element(by.css('.item:nth-child(1) > .col-xs-4:nth-child(2) .hotTitles')); + var TopResourcesCardThreeHeader = element(by.css('.item:nth-child(1) > .col-xs-4:nth-child(3) .hotTitles')); + var TopResourcesRightScroll = element(by.xpath('//resource-carousel/div/div/table/tbody/tr/td/div/div/a[2]/span')); + var TopResourcesLeftScroll = element(by.xpath('//resource-carousel/div/div/table/tbody/tr/td/div/div/a/span')); + var TopResourcesCardThreeSaveIcon = element(by.css('.item:nth-child(1) > .col-xs-4:nth-child(3) .journey-save:nth-child(1)')); var FindOpportunitiesWidgetTitle = element(by.css('.widgetTitleContainerFindJob > .noPaddingCol')); var FindOpportunitiesSubText = element(by.css('.col-sm-12:nth-child(2)')); - var JobTotals = element(by.css('.col-sm-4:nth-child(1) .col-sm-8 .jrnys_stand-out-text')); + var JobsTotalsLink = element(by.css('.col-sm-8 .job-title-display')); var JobListingsDivHeader = element(by.css('.col-xs-12 > h6:nth-child(1) > .ng-binding')); - var Totals = element(by.css('#findJobsWidget > .text-color-7a:nth-child(4)')); - var ChangeLocationLink = element(by.css('.widgetTitleContainerFindJob > .col-sm-5')); + var InternshipsTotalsLink = element(by.xpath('//div[2]/div/div[2]/div/div')); + var InternshipsListingsDivHeader = element(by.css('h6:nth-child(2) > .ng-binding')); + var ApprenticeshipsTotalsLink = element(by.css('#findJobsWidget > .text-color-7a:nth-child(3)')); + var FindOpportunitiesChangeLocationLink = element(by.css('.text-right:nth-child(2)')); var ChangeLocationDivTitle = element(by.css('b')); var ChangeLocationDivSubTitle = element(by.css('.col-xs-11:nth-child(2)')); var ChnageLocationEnterZipCodeTextBox = element(by.css('#inputZip')); @@ -1465,12 +1706,19 @@ function TopCareerWidget() { var SkillsWidgetTitle = element(by.css('#skillsid > .widgetHeaderContainer > .jrnys_lead-body-copy')); var WorkActivitiesWidgetTitle = element(by.css('#workActivitiesid > .widgetHeaderContainer > .jrnys_lead-body-copy')); var AbilityWidgetTitle = element(by.css('#abilitiesid > .widgetHeaderContainer > .jrnys_lead-body-copy')); - var NearbyPlacesWidgetTitle = element(by.css('#nearByid > .jrnys_lead-body-copy')); - var NearbyPlacesRightScroll = element(by.css('#nearByid .right > .glyphicon')); - var NearbyPlacesLeftScroll = element(by.css('#nearByid .left > .glyphicon')); + var NearbyPlacesWidgetTitle = element(by.css('#liNearby .jrnys_lead-body-copy')); + var NearbyPlacesCardOneHeader = element(by.xpath('//div[3]/div/div[2]/span')); + var NearbyPlacesCardTwoHeader = element(by.xpath('//div[2]/div/career-territory-card/territory-card/div/div/div[3]/div/div[2]/span')); + var NearbyPlacesCardThreeHeader = element(by.xpath('//div[3]/div/career-territory-card/territory-card/div/div/div[3]/div/div[2]/span')); + var NearbyPlacesRightScroll = element(by.xpath('//career-occupation-carousel/div/div/table/tbody/tr/td/div/div/a[2]/span')); + var NearbyPlacesLeftScroll = element(by.xpath('//career-occupation-carousel/div/div/table/tbody/tr/td/div/div/a/span')); //var NearbyPlacesRightScroll = element(by.xpath('//li[17]')).element(by.css('.glyphicon-chevron-right')); //var NearbyPlacesLeftScroll = element(by.xpath('//li[17]')).element(by.css('.glyphicon-chevron-left')); + /*browser.executeScript('window.scrollTo(0, 1880);').then(function() { + browser.sleep(2500); + });//remove*/ + await TopCareerLink.click().then(function() { browser.sleep(10000); }); @@ -1511,7 +1759,7 @@ function TopCareerWidget() { expect(await AtAGlanceStatFour.getText()).toEqual('2,500'); expect(await AtAGlanceHeaderFive.getText()).toEqual('Currently Employed'); expect(await AtAGlanceStatFive.getText()).toEqual('27,900'); - browser.executeScript('window.scrollTo(0, 410);').then(function() { + browser.executeScript('window.scrollTo(0, 405);').then(function() { browser.sleep(2500); }); /*browser.actions().mouseMove(DegreesWidgetTitle).perform().then(function() { @@ -1552,7 +1800,7 @@ function TopCareerWidget() { expect(await Wages100KText.getText()).toEqual('$100,000'); expect(await Wages150KText.getText()).toEqual('$150,000'); expect(await Wages200KText.getText()).toEqual('$200,000'); - await ChangeLocationLinkText.click().then(function() { + await WagesChangeLocationLink.click().then(function() { browser.sleep(1000); }); await ZipCodeTextBox.click(); @@ -1568,67 +1816,83 @@ function TopCareerWidget() { /*browser.actions().mouseMove(CertificatesWidgetTitle).perform().then(function() { browser.sleep(1000); });*/ - browser.executeScript('window.scrollTo(0, 890);').then(function() { - browser.sleep(2500); + browser.executeScript('window.scrollTo(0, 882);').then(function() { + browser.sleep(2495); }); //Degrees expect(await DegreesWidgetTitle.getText()).toEqual('Degrees'); - expect(await DegreesCardHeader.getText()).toEqual('Computer Applications Minor—College-Wide'); + expect(await DegreesCardOneHeader.getText()).toEqual('Computer Applications Minor—College-Wide'); + expect(await DegreesCardTwoHeader.getText()).toEqual('Computer Science B.S.'); + expect(await DegreesCardThreeHeader.getText()).toEqual('Computer Science M.S.'); await DegreesRightScroll.click(); browser.sleep(2500); /*browser.actions().mouseMove(InstitutionsWidgetTitle).perform().then(function() { browser.sleep(1000); });*/ - browser.executeScript('window.scrollTo(0, 1376);').then(function() { + browser.executeScript('window.scrollTo(0, 1360);').then(function() { browser.sleep(2500); }); //Certificates expect(await CertificatesWidgetTitle.getText()).toEqual('Certificates'); - expect(await CertificatesCardHeader.getText()).toEqual('Certified LabVIEW Architect'); - expect(await CertificatesCardSubHeader.getText()).toEqual('Business Analysis'); + expect(await CertificatesCardOneHeader.getText()).toEqual('Certified Associate LabVIEW Developer'); + expect(await CertificatesCardOneSubHeader.getText()).toEqual('Business Analysis'); + expect(await CertificatesCardTwoHeader.getText()).toEqual('Certified LabVIEW Architect'); + expect(await CertificatesCardTwoSubHeader.getText()).toEqual('Business Analysis'); + expect(await CertificatesCardThreeHeader.getText()).toEqual('Certified Biometrics Professional'); + expect(await CertificatesCardThreeSubHeader.getText()).toEqual('Business Financial Mgmt & Acctg'); await CertificatesRightScroll.click(); browser.sleep(2500); /*browser.actions().mouseMove(TopResourcesWidgetTitle).perform().then(function() { browser.sleep(1000); });*/ - browser.executeScript('window.scrollTo(0, 1860);').then(function() { + browser.executeScript('window.scrollTo(0, 1836);').then(function() { browser.sleep(2500); }); //Institutions expect(await InstitutionsWidgetTitle.getText()).toEqual('Institutions View All'); - expect(await InstitutionsCardHeader.getText()).toEqual('University of San Diego'); + expect(await InstitutionsCardOneHeader.getText()).toEqual('University of San Diego'); + expect(await InstitutionsCardTwoHeader.getText()).toEqual('National University'); + expect(await InstitutionsCardThreeHeader.getText()).toEqual('Point Loma Nazarene University'); await InstitutionsRightScroll.click(); browser.sleep(2500); /*browser.actions().mouseMove(FindOpportunitiesWidgetTitle).perform().then(function() { browser.sleep(1000); });*/ - browser.executeScript('window.scrollTo(0, 2340);').then(function() { + browser.executeScript('window.scrollTo(0, 2313);').then(function() { browser.sleep(2500); }); //Top Resources expect(await TopResourcesWidgetTitle.getText()).toEqual('Top Resources View All'); - expect(await TopResources3rdCardHeader.getText()).toEqual('Computer and Information Research Scientists'); - browser.sleep(2500); - await TopResources3rdCardSaveIcon.click(); - browser.sleep(2500); - await TopResourcesRightScroll.click(); + expect(await TopResourcesCardOneHeader.getText()).toEqual('Computer and Information Research Scientists (Information Technology)'); + expect(await TopResourcesCardTwoHeader.getText()).toEqual('How to Become a Research Scientist'); + expect(await TopResourcesCardThreeHeader.getText()).toEqual('Computer and Information Research Scientists'); browser.sleep(2500); + await TopResourcesRightScroll.click().then(function() { + browser.sleep(2500); + }); + await TopResourcesLeftScroll.click().then(function() { + browser.sleep(2500); + }); + expect(await TopResourcesCardThreeHeader.getText()).toEqual('Computer and Information Research Scientists'); + await TopResourcesCardThreeSaveIcon.click().then(function() { + browser.sleep(2500); + }); /*browser.actions().mouseMove(TasksWidgetTitle).perform().then(function() { browser.sleep(1000); });*/ - browser.executeScript('window.scrollTo(0, 2825);').then(function() { + browser.executeScript('window.scrollTo(0, 2790);').then(function() { browser.sleep(2500); }); //Find Opportunities expect(await FindOpportunitiesWidgetTitle.getText()).toEqual('Find Opportunities'); - expect(await FindOpportunitiesSubText.getText()).toEqual('Great News! We found lots of opportunities within a 50 mile radius of you.'); - expect(await Totals.getText()).toContain('Jobs'); - //expect(await Totals.getText()).toContain('85');//stored value needed - expect(await Totals.getText()).toContain('Internships'); - //expect(await Totals.getText()).toContain('0');//stored value needed - //expect(await Totals.getText()).toContain('Apprenticeships');//value sometimes is disabled - //expect(await Totals.getText()).toContain('0');//stored value needed - await ChangeLocationLink.click().then(function() { + expect(await FindOpportunitiesSubText.getText()).toEqual('Great News! We found lots of opportunities within a 50 mile radius of 92123.'); + expect(await JobsTotalsLink.getText()).toContain('Jobs'); + //expect(await JobsTotalsLink.getText()).toContain('85');//stored value needed + expect(await InternshipsTotalsLink.getText()).toContain('Internships'); + //expect(await InternshipsTotalsLink.getText()).toContain('0');//stored value needed + expect(await ApprenticeshipsTotalsLink.getText()).toContain('Apprenticeships');//value sometimes is disabled + //expect(await ApprenticeshipsTotalsLink.getText()).toContain('0');//stored value needed + await FindOpportunitiesChangeLocationLink.click().then(function() { browser.sleep(1000); }); expect(await ChangeLocationDivTitle.getText()).toEqual('Change Location'); @@ -1642,18 +1906,25 @@ function TopCareerWidget() { browser.sleep(1000); }); expect(await FindOpportunitiesSubText.getText()).toEqual('Great News! We found lots of opportunities within a 1000 mile radius of you.'); - await JobTotals.click().then(function() { - browser.sleep(5000); + await JobsTotalsLink.click().then(function() { + browser.sleep(2500); }); expect(await JobListingsDivHeader.getText()).toContain('Job Listings:');//stored value needed await XCloseLink.click().then(function() { browser.sleep(1000); }); - expect(await Totals.getText()).toContain('Jobs'); - //expect(await Totals.getText()).toContain('68');//stored value needed - expect(await Totals.getText()).toContain('Internships'); - //expect(await Totals.getText()).toContain('0');//stored value needed - expect(await Totals.getText()).toContain('Apprenticeships'); + /*await InternshipsTotalsLink.click().then(function() { + browser.sleep(2500); + }); + expect(await InternshipsListingsDivHeader.getText()).toContain('Internships: ');//stored value needed + await XCloseLink.click().then(function() { + browser.sleep(1000); + });*/ + expect(await JobsTotalsLink.getText()).toEqual('Jobs'); + //expect(await JobsTotalsLink.getText()).toContain('68');//stored value needed + expect(await InternshipsTotalsLink.getText()).toEqual('Internships'); + //expect(await InternshipsTotalsLink.getText()).toContain('0');//stored value needed + expect(await ApprenticeshipsTotalsLink.getText()).toContain('Apprenticeships'); //expect(await Totals.getText()).toContain('3');//stored value needed //Submit A Resource expect(await SubmitResourceWidgetTitle.getText()).toEqual('Submit a Resource'); @@ -1686,7 +1957,7 @@ function TopCareerWidget() { /*browser.actions().mouseMove(KnowledgeWidgetTitle).perform().then(function() { browser.sleep(1000); });*/ - browser.executeScript('window.scrollTo(0, 3145);').then(function() { + browser.executeScript('window.scrollTo(0, 3108);').then(function() { browser.sleep(2500); }); //Tasks @@ -1700,7 +1971,7 @@ function TopCareerWidget() { /*browser.actions().mouseMove(WorkActivitiesWidgetTitle).perform().then(function() { browser.sleep(1000); });*/ - browser.executeScript('window.scrollTo(0, 3468);').then(function() { + browser.executeScript('window.scrollTo(0, 3426);').then(function() { browser.sleep(2500); }); //Knowledge @@ -1711,7 +1982,7 @@ function TopCareerWidget() { /*browser.actions().mouseMove(NearbyPlacesWidgetTitle).perform().then(function() { browser.sleep(1000); });*/ - browser.executeScript('window.scrollTo(0, 3791);').then(function() { + browser.executeScript('window.scrollTo(0, 3743);').then(function() { browser.sleep(2500); }); //Work Activities @@ -1723,6 +1994,9 @@ function TopCareerWidget() { browser.sleep(5000); }); expect(await NearbyPlacesWidgetTitle.getText()).toEqual('Nearby Places'); + expect(await NearbyPlacesCardOneHeader.getText()).toEqual('Computer and Information Systems Managers'); + expect(await NearbyPlacesCardTwoHeader.getText()).toEqual('Computer Network Architects'); + expect(await NearbyPlacesCardThreeHeader.getText()).toEqual('Computer Network Support Specialists'); await NearbyPlacesRightScroll.click(); browser.sleep(2500); await NearbyPlacesLeftScroll.click(); @@ -1773,37 +2047,38 @@ function NearbyPlacesOccupationCard() { var OccupationCardVideoIcon = element(by.xpath('//div[4]/career-one-stop-video/i')); var VideoTitle = element(by.css('.modal-content > .ng-scope > div > .ng-binding')); var XCloseVideoDivLink = element(by.css('.close:nth-child(2)')); + var DashboardHeaderLink = element(by.css('.ng-scope:nth-child(1) > a > .span-navbar-hover')); - expect(await OccupationCardTitle.getText()).toEqual('Software Developers, Applications'); + expect(await OccupationCardTitle.getText()).toEqual('Computer and Information Systems Managers'); await OccupatonCardFollow.click().then(function() { browser.sleep(2500); }); await AtAGlanceHeaderRowIcon.click().then(function() { browser.sleep(1000); }); - expect(await AtAGlanceBackOfCardTitle.getText()).toEqual('Software Developers, Applications'); - expect(await AtAGlanceBackOfCardDescription.getText()).toEqual('Develop, create, and modify general computer applications software or specialized utility programs. Analyze user needs and develop software solutions. Design software or customize software for client use with the aim of optimizing operational efficiency. May analyze and design databases within an application area, working individually or coordinating database development as part of a team. May supervise computer programmers.'); + expect(await AtAGlanceBackOfCardTitle.getText()).toEqual('Computer and Information Systems Managers'); + expect(await AtAGlanceBackOfCardDescription.getText()).toEqual('Plan, direct, or coordinate activities in such fields as electronic data processing, information systems, systems analysis, and computer programming.'); expect(await AtAGlanceTypicalDegreeTitle.getText()).toEqual('Typical Degree'); - expect(await AtAGlanceCollege.getText()).toEqual('College (4 Year) - 80%'); - expect(await AtAGlanceMasters.getText()).toEqual("Master's degree - 16%"); - expect(await AtAGlanceAssociates.getText()).toEqual("Associate's degree - 3%"); + expect(await AtAGlanceCollege.getText()).toEqual('College (4 Year) - 48%'); + expect(await AtAGlanceMasters.getText()).toEqual("Some college - 26%"); + expect(await AtAGlanceAssociates.getText()).toEqual("Master's degree - 14%"); expect(await AtAGlanceSalary.getText()).toEqual('Average Annual Salary'); - expect(await AtAGlanceSalaryStat.getText()).toEqual('$101,790'); + expect(await AtAGlanceSalaryStat.getText()).toEqual('$139,220'); expect(await AtAGlanceGrowth.getText()).toEqual('Projected Growth'); - expect(await AtAGlanceGrowthStat.getText()).toEqual('30.7%'); + expect(await AtAGlanceGrowthStat.getText()).toEqual('12%'); expect(await AtAGlanceGrowthAverage.getText()).toEqual('ABOVE AVERAGE'); expect(await AtAGlanceJobOpenings.getText()).toEqual('Projected Job Openings'); - expect(await AtAGlanceJobOpeningsStat.getText()).toEqual('85,700'); + expect(await AtAGlanceJobOpeningsStat.getText()).toEqual('32,500'); expect(await AtAGlanceEmployed.getText()).toEqual('Currently Employed'); - expect(await AtAGlanceEmployedStat.getText()).toEqual('831,300'); + expect(await AtAGlanceEmployedStat.getText()).toEqual('367,600'); await AtAGlanceXCloseLink.click().then(function() { browser.sleep(1000); }); - expect(await OccupationCardTitle.getText()).toEqual('Software Developers, Applications'); + expect(await OccupationCardTitle.getText()).toEqual('Computer and Information Systems Managers'); await OccupationCardEllipsis.click().then(function() { browser.sleep(1000); }); - expect(await BackOfCardTitle.getText()).toEqual('Software Developers, Applications'); + expect(await BackOfCardTitle.getText()).toEqual('Computer and Information Systems Managers'); expect(await BackOfCardUnFollow.getText()).toEqual('Follow'); expect(await BackOfCardLearnMore.getText()).toEqual('Learn More'); expect(await BackOfCardMap.getText()).toEqual('Map'); @@ -1812,29 +2087,29 @@ function NearbyPlacesOccupationCard() { await BackOfCardAtAGlanceIcon.click().then(function() { browser.sleep(2500); }); - expect(await AtAGlanceBackOfCardTitle.getText()).toEqual('Software Developers, Applications'); - expect(await AtAGlanceBackOfCardDescription.getText()).toEqual('Develop, create, and modify general computer applications software or specialized utility programs. Analyze user needs and develop software solutions. Design software or customize software for client use with the aim of optimizing operational efficiency. May analyze and design databases within an application area, working individually or coordinating database development as part of a team. May supervise computer programmers.'); + expect(await AtAGlanceBackOfCardTitle.getText()).toEqual('Computer and Information Systems Managers'); + expect(await AtAGlanceBackOfCardDescription.getText()).toEqual('Plan, direct, or coordinate activities in such fields as electronic data processing, information systems, systems analysis, and computer programming.'); expect(await AtAGlanceTypicalDegreeTitle.getText()).toEqual('Typical Degree'); - expect(await AtAGlanceCollege.getText()).toEqual('College (4 Year) - 80%'); - expect(await AtAGlanceMasters.getText()).toEqual("Master's degree - 16%"); - expect(await AtAGlanceAssociates.getText()).toEqual("Associate's degree - 3%"); + expect(await AtAGlanceCollege.getText()).toEqual('College (4 Year) - 48%'); + expect(await AtAGlanceMasters.getText()).toEqual("Some college - 26%"); + expect(await AtAGlanceAssociates.getText()).toEqual("Master's degree - 14%"); expect(await AtAGlanceSalary.getText()).toEqual('Average Annual Salary'); - expect(await AtAGlanceSalaryStat.getText()).toEqual('$101,790'); + expect(await AtAGlanceSalaryStat.getText()).toEqual('$139,220'); expect(await AtAGlanceGrowth.getText()).toEqual('Projected Growth'); - expect(await AtAGlanceGrowthStat.getText()).toEqual('30.7%'); + expect(await AtAGlanceGrowthStat.getText()).toEqual('12%'); expect(await AtAGlanceGrowthAverage.getText()).toEqual('ABOVE AVERAGE'); expect(await AtAGlanceJobOpenings.getText()).toEqual('Projected Job Openings'); - expect(await AtAGlanceJobOpeningsStat.getText()).toEqual('85,700'); + expect(await AtAGlanceJobOpeningsStat.getText()).toEqual('32,500'); expect(await AtAGlanceEmployed.getText()).toEqual('Currently Employed'); - expect(await AtAGlanceEmployedStat.getText()).toEqual('831,300'); + expect(await AtAGlanceEmployedStat.getText()).toEqual('367,600'); await AtAGlanceXCloseLink.click().then(function() { browser.sleep(1000); }); - expect(await OccupationCardTitle.getText()).toEqual('Software Developers, Applications'); + expect(await OccupationCardTitle.getText()).toEqual('Computer and Information Systems Managers'); await OccupationCardLearnMoreIcon.click().then(function() { browser.sleep(10000); }); - expect(await LearnMoreTitle.getText()).toEqual('Software Developers, Applications'); + expect(await LearnMoreTitle.getText()).toEqual('Computer and Information Systems Managers'); browser.navigate().back().then(function() { browser.sleep(10000); }); @@ -1845,8 +2120,8 @@ function NearbyPlacesOccupationCard() { browser.sleep(10000); }); expect(await ObjectPath.getText()).toEqual('IT > Network Systems >'); - expect(await ObjectTitle.getText()).toEqual('Software Developers, Applications'); - expect(await ItemDescription.getText()).toEqual('Develop, create, and modify general computer applications software or specialized utility programs. Analyze user needs and develop software solutions. Design software or customize software for client use with the aim of optimizing operation...'); + expect(await ObjectTitle.getText()).toEqual('Computer and Information Systems Managers'); + expect(await ItemDescription.getText()).toEqual('Plan, direct, or coordinate activities in such fields as electronic data processing, information systems, systems analysis, and computer programming.'); browser.navigate().back().then(function() { browser.sleep(10000); }); @@ -1866,7 +2141,7 @@ function NearbyPlacesOccupationCard() { await OccupationCardVideoIcon.click().then(function() { browser.sleep(10000); }); - expect(await VideoTitle.getText()).toEqual('Software Developers Applications'); + expect(await VideoTitle.getText()).toEqual('Computer and Information Systems Managers'); await XCloseVideoDivLink.click().then(function() { browser.sleep(1000); }); @@ -1927,42 +2202,42 @@ function FollowingPage() { function AtAGlance() { it(': AtAGlance, should click the At A Glance link and validate data', async function () { var AtAGlanceLink = element(by.css('tr:nth-child(3) > td:nth-child(1) > .text-color-7a')); - var WidgetTitle = element(by.css('.widgetHeaderContainer > .jrnys_lead-body-copy')); - var WidgetHeaderOne = element(by.css('.row-height:nth-child(1) .jrnys_support-text')); - var WidgetStatOne = element(by.css('.row-height:nth-child(1) .col-sm-offset-4')); - var WidgetHeaderTwo = element(by.css('.row-height:nth-child(2) .jrnys_support-text')); - var WidgetStatTwo = element(by.css('.row-height:nth-child(2) .dataFontSize')); - var WidgetHeaderThree = element(by.css('.row-height:nth-child(3) .jrnys_support-text')); - var WidgetSubHeaderThree = element(by.css('.col-sm-offset-4 > span')); - var WidgetStatThree = element(by.css('.row-height:nth-child(3) .col-sm-offset-4')); - var WidgetHeaderFour = element(by.css('.row-height:nth-child(4) .jrnys_support-text')); - var WidgetStatFour = element(by.css('.row-height:nth-child(4) .dataFontSize')); - var WidgetHeaderFive = element(by.css('.row-height:nth-child(5) .jrnys_support-text')); - var WidgetStatFive = element(by.css('.row-height:nth-child(5) .dataFontSize')); + var AtAGlanceWidgetTitle = element(by.css('.widgetHeaderContainer > .jrnys_lead-body-copy')); + var AtAGlanceHeaderOne = element(by.css('.row-height:nth-child(1) .jrnys_support-text')); + var AtAGlanceStatOne = element(by.css('.row-height:nth-child(1) .col-sm-offset-4')); + var AtAGlanceHeaderTwo = element(by.css('.row-height:nth-child(2) .jrnys_support-text')); + var AtAGlanceStatTwo = element(by.css('.row-height:nth-child(2) .dataFontSize')); + var AtAGlanceHeaderThree = element(by.css('.row-height:nth-child(3) .jrnys_support-text')); + var AtAGlanceSubHeaderThree = element(by.css('.col-sm-offset-4 > span')); + var AtAGlanceStatThree = element(by.css('.row-height:nth-child(3) .col-sm-offset-4')); + var AtAGlanceHeaderFour = element(by.css('.row-height:nth-child(4) .jrnys_support-text')); + var AtAGlanceStatFour = element(by.css('.row-height:nth-child(4) .dataFontSize')); + var AtAGlanceHeaderFive = element(by.css('.row-height:nth-child(5) .jrnys_support-text')); + var AtAGlanceStatFive = element(by.css('.row-height:nth-child(5) .dataFontSize')); var XCloseLink = element(by.css('.close')); //browser.actions().mouseMove(element(by.css('#id > .ng-scope > .jrnys_lead-body-copy'))).perform().then(function() { - browser.executeScript('window.scrollTo(0, 1885);').then(function() { + browser.executeScript('window.scrollTo(0, 1883);').then(function() { browser.sleep(2500); }); await AtAGlanceLink.click().then(function() { browser.sleep(2500); }); - expect(await WidgetTitle.getText()).toEqual('At A Glance'); - expect(await WidgetHeaderOne.getText()).toEqual('Typical Degree'); - expect(await WidgetStatOne.getText()).toContain("Master's degree - 59%"); - expect(await WidgetStatOne.getText()).toContain("Associate's degree - 0%"); - expect(await WidgetStatOne.getText()).toContain('College (4 Year) - 0%'); - expect(await WidgetHeaderTwo.getText()).toEqual('Average Annual Salary'); - expect(await WidgetStatTwo.getText()).toEqual('$114,520'); - expect(await WidgetHeaderThree.getText()).toEqual('Projected Growth'); - expect(await WidgetSubHeaderThree.getText()).toContain(' ABOVE AVERAGE'); - expect(await WidgetStatThree.getText()).toContain(' ABOVE AVERAGE'); - expect(await WidgetStatThree.getText()).toContain('19.2%'); - expect(await WidgetHeaderFour.getText()).toEqual('Projected Job Openings'); - expect(await WidgetStatFour.getText()).toEqual('2,500'); - expect(await WidgetHeaderFive.getText()).toEqual('Currently Employed'); - expect(await WidgetStatFive.getText()).toEqual('27,900'); + expect(await AtAGlanceWidgetTitle.getText()).toEqual('At A Glance'); + expect(await AtAGlanceHeaderOne.getText()).toEqual('Typical Degree'); + expect(await AtAGlanceStatOne.getText()).toContain("Master's degree - 59%"); + expect(await AtAGlanceStatOne.getText()).toContain("Associate's degree - 0%"); + expect(await AtAGlanceStatOne.getText()).toContain('College (4 Year) - 0%'); + expect(await AtAGlanceHeaderTwo.getText()).toEqual('Average Annual Salary'); + expect(await AtAGlanceStatTwo.getText()).toEqual('$114,520'); + expect(await AtAGlanceHeaderThree.getText()).toEqual('Projected Growth'); + expect(await AtAGlanceSubHeaderThree.getText()).toContain(' ABOVE AVERAGE'); + expect(await AtAGlanceStatThree.getText()).toContain(' ABOVE AVERAGE'); + expect(await AtAGlanceStatThree.getText()).toContain('19.2%'); + expect(await AtAGlanceHeaderFour.getText()).toEqual('Projected Job Openings'); + expect(await AtAGlanceStatFour.getText()).toEqual('2,500'); + expect(await AtAGlanceHeaderFive.getText()).toEqual('Currently Employed'); + expect(await AtAGlanceStatFive.getText()).toEqual('27,900'); await XCloseLink.click().then(function() { browser.sleep(1000); }); @@ -1974,29 +2249,29 @@ function AtAGlance() { function Personality() { it(': Personality, should click the Personality link and validate data', async function() { var PersonatlityLink = element(by.css('tr:nth-child(4) > td:nth-child(1) > .text-color-7a')); - var WidgetTitle = element(by.css('.ng-isolate-scope:nth-child(3) > .fullHeight .jrnys_lead-body-copy')); - var WidgetDescriptionOne = element(by.css('.carouselHeight > .ng-scope td > .ng-binding')); - var WidgetDescriptionTwo = element(by.css('.carouselHeight > .ng-scope tr:nth-child(2) div')); - var WidgetBulletOne = element(by.css('.ng-scope > tbody > .ng-scope:nth-child(3) .ng-binding')); - var WidgetBulletTwo = element(by.css('.ng-scope > tbody > .ng-scope:nth-child(4) .ng-binding')); - var WidgetBulletThree = element(by.css('.ng-scope > tbody > .ng-scope:nth-child(5) .ng-binding')); - var WidgetBulletFour = element(by.css('.ng-scope > tbody > .ng-scope:nth-child(6) .ng-binding')); - var WidgetBulletFive = element(by.css('.ng-scope:nth-child(7) > td > div > .ng-binding')); - var WidgetBulletSix = element(by.css('.ng-scope:nth-child(8) > td > div > .ng-binding')); + var PersonatlityWidgetTitle = element(by.css('.ng-isolate-scope:nth-child(3) > .fullHeight .jrnys_lead-body-copy')); + var PersonatlityDescriptionOne = element(by.css('.carouselHeight > .ng-scope td > .ng-binding')); + var PersonatlityDescriptionTwo = element(by.css('.carouselHeight > .ng-scope tr:nth-child(2) div')); + var PersonatlityBulletOne = element(by.css('.ng-scope > tbody > .ng-scope:nth-child(3) .ng-binding')); + var PersonatlityBulletTwo = element(by.css('.ng-scope > tbody > .ng-scope:nth-child(4) .ng-binding')); + var PersonatlityBulletThree = element(by.css('.ng-scope > tbody > .ng-scope:nth-child(5) .ng-binding')); + var PersonatlityBulletFour = element(by.css('.ng-scope > tbody > .ng-scope:nth-child(6) .ng-binding')); + var PersonatlityBulletFive = element(by.css('.ng-scope:nth-child(7) > td > div > .ng-binding')); + var PersonatlityBulletSix = element(by.css('.ng-scope:nth-child(8) > td > div > .ng-binding')); var XCloseLink = element(by.css('.close')); await PersonatlityLink.click().then(function() { browser.sleep(2500); }); - expect(await WidgetTitle.getText()).toEqual('Personality'); - expect(await WidgetDescriptionOne.getText()).toEqual('People interested in this work like activities that include ideas, thinking, and figuring things out.'); - expect(await WidgetDescriptionTwo.getText()).toEqual('They do well at jobs that need:'); - expect(await WidgetBulletOne.getText()).toEqual('Analytical Thinking'); - expect(await WidgetBulletTwo.getText()).toEqual('Cooperation'); - expect(await WidgetBulletThree.getText()).toEqual('Attention to Detail'); - expect(await WidgetBulletFour.getText()).toEqual('Independence'); - expect(await WidgetBulletFive.getText()).toEqual('Achievement/Effort'); - expect(await WidgetBulletSix.getText()).toEqual('Initiative'); + expect(await PersonatlityWidgetTitle.getText()).toEqual('Personality'); + expect(await PersonatlityDescriptionOne.getText()).toEqual('People interested in this work like activities that include ideas, thinking, and figuring things out.'); + expect(await PersonatlityDescriptionTwo.getText()).toEqual('They do well at jobs that need:'); + expect(await PersonatlityBulletOne.getText()).toEqual('Analytical Thinking'); + expect(await PersonatlityBulletTwo.getText()).toEqual('Cooperation'); + expect(await PersonatlityBulletThree.getText()).toEqual('Attention to Detail'); + expect(await PersonatlityBulletFour.getText()).toEqual('Independence'); + expect(await PersonatlityBulletFive.getText()).toEqual('Achievement/Effort'); + expect(await PersonatlityBulletSix.getText()).toEqual('Initiative'); await XCloseLink.click().then(function() { browser.sleep(1000); }); @@ -2041,40 +2316,50 @@ function Wages() { function Degrees() { it(': Degrees, should click the Degrees link, expand/collapse first career card by title and validate data', async function () { var DegreesLink = element(by.css('tr:nth-child(3) > td:nth-child(2) > .text-color-7a')); - var WidgetTitle = element(by.css('#id > .jrnys_lead-body-copy')); + var DegreesWidgetTitle = element(by.css('.ng-scope > .fullHeight > .ng-binding')); var DegreeTitle = element(by.css('.item:nth-child(1) > .col-xs-12:nth-child(1) .textSize:nth-child(1)')); - var ExpandDegreeCard = element(by.css('.item:nth-child(1) > .col-xs-12:nth-child(1) .textSize')); - var InstitutionTitle = element(by.css('#dropDownDataComputerApplicationsMinorCollegeWideDegreesundefined > .row:nth-child(2) .item-title')); - var InstitutionData = element(by.css('#dropDownDataComputerApplicationsMinorCollegeWideDegreesundefined > .row:nth-child(2) .item-body > .ng-binding')); - var CourseTitle = element(by.css('#dropDownDataComputerApplicationsMinorCollegeWideDegreesundefined > .row:nth-child(3) .item-title')); - var CourseData = element(by.css('#dropDownDataComputerApplicationsMinorCollegeWideDegreesundefined > .row:nth-child(3) .item-body > .ng-binding')); - var OccupationTitle = element(by.css('#dropDownDataComputerApplicationsMinorCollegeWideDegreesundefined > .row:nth-child(4) .item-title')); - var OccupationData = element(by.css('#dropDownDataComputerApplicationsMinorCollegeWideDegreesundefined > .row:nth-child(4) .item-body > .ng-binding')); - var SalaryTitle = element(by.css('#dropDownDataComputerApplicationsMinorCollegeWideDegreesundefined > .row:nth-child(5) .item-title')); - var SalaryData = element(by.css('#dropDownDataComputerApplicationsMinorCollegeWideDegreesundefined > .row:nth-child(5) .item-body > .ng-binding')); - var CollapseDegreeCard = element(by.css('#dropDownDataComputerApplicationsMinorCollegeWideDegreesundefined > .col-xs-1')); + var DegreesEllipsis = element(by.css('.item:nth-child(1) > .col-xs-12:nth-child(1) .col-sm-1')); + var DegreeDetails = element(by.css('#dropDownSocialOptionsComputerApplicationsMinorCollegeWideDegrees63f93734c4e948cd8ff4041e10760da5 .row:nth-child(4) > .col-xs-9')); + var InstitutionTitle = element(by.css('#dropDownDataComputerApplicationsMinorCollegeWideDegrees63f93734c4e948cd8ff4041e10760da5 > .row:nth-child(2) .item-title')); + var InstitutionData = element(by.css('#dropDownDataComputerApplicationsMinorCollegeWideDegrees63f93734c4e948cd8ff4041e10760da5 > .row:nth-child(2) .item-body > .ng-binding')); + var CourseTitle = element(by.css('#dropDownDataComputerApplicationsMinorCollegeWideDegrees63f93734c4e948cd8ff4041e10760da5 > .row:nth-child(3) .item-title')); + var CourseData = element(by.css('#dropDownDataComputerApplicationsMinorCollegeWideDegrees63f93734c4e948cd8ff4041e10760da5 > .row:nth-child(3) .item-body > .ng-binding')); + var OccupationTitle = element(by.css('#dropDownDataComputerApplicationsMinorCollegeWideDegrees63f93734c4e948cd8ff4041e10760da5 > .row:nth-child(4) .item-title')); + var OccupationData = element(by.css('#dropDownDataComputerApplicationsMinorCollegeWideDegrees63f93734c4e948cd8ff4041e10760da5 > .row:nth-child(4) .item-body > .ng-binding')); + var SalaryTitle = element(by.css('#dropDownDataComputerApplicationsMinorCollegeWideDegrees63f93734c4e948cd8ff4041e10760da5 > .row:nth-child(5) .item-title')); + var SalaryData = element(by.css('#dropDownDataComputerApplicationsMinorCollegeWideDegrees63f93734c4e948cd8ff4041e10760da5 > .row:nth-child(5) .item-body > .ng-binding')); + var DegreeXCloseIcon = element(by.css('#dropDownDataComputerApplicationsMinorCollegeWideDegrees63f93734c4e948cd8ff4041e10760da5 > .col-xs-1')); var CarrouselRightScroll = element(by.css('.table-height:nth-child(2) .right > .glyphicon')); var XCloseLink = element(by.css('.close')); await DegreesLink.click().then(function() { browser.sleep(2500); }); - expect(await WidgetTitle.getText()).toEqual('Degrees'); + expect(await DegreesWidgetTitle.getText()).toEqual('Degrees'); expect(await DegreeTitle.getText()).toEqual('Computer Applications Minor—College-Wide'); - await ExpandDegreeCard.click(); - browser.sleep(1000); + await DegreesEllipsis.click().then(function() { + browser.sleep(1000); + }); + await DegreeDetails.click().then(function() { + browser.sleep(1000); + }); expect(await InstitutionTitle.getText()).toEqual('Institutions'); - expect(await InstitutionData.getText()).toEqual('2,425'); + expect(await InstitutionData.getText()).toEqual('2,419'); expect(await CourseTitle.getText()).toEqual('Courses'); expect(await CourseData.getText()).toEqual('0'); expect(await OccupationTitle.getText()).toEqual('Occupations'); expect(await OccupationData.getText()).toEqual('75'); expect(await SalaryTitle.getText()).toEqual('Average Salary'); expect(await SalaryData.getText()).toEqual('$98,931'); - await CollapseDegreeCard.click(); - browser.sleep(1000); - await CarrouselRightScroll.click(); - browser.sleep(1000); + await DegreeXCloseIcon.click().then(function() { + browser.sleep(1000); + }); + await DegreesEllipsis.click().then(function() { + browser.sleep(1000); + }); + await CarrouselRightScroll.click().then(function() { + browser.sleep(1000); + }); await XCloseLink.click().then(function() { browser.sleep(1000); }); @@ -2086,10 +2371,10 @@ function Degrees() { function Certificates() { it(': Certificates, should click the Certificate link, expand/collapse first card by ellipsis validate data and scroll to second set', async function () { var CertificatesLink = element(by.css('tr:nth-child(4) > td:nth-child(2) > .text-color-7a')); - var WidgetTitle = element(by.css('#id > .jrnys_lead-body-copy')); + var CertificatesWidgetTitle = element(by.css('.ng-scope > .fullHeight > .ng-binding')); var CertificateTitle = element(by.css('.item:nth-child(1) > .col-xs-12:nth-child(1) .textSize:nth-child(1)')); - var CertificateSubTitle = element(by.css('.item:nth-child(1) > .col-xs-12:nth-child(1) .row .text-color-4a')); - var EllipsisCertificate = element(by.css('.item:nth-child(1) > .col-xs-12:nth-child(1) .col-sm-1')); + var CertificateSubTitle = element(by.css('.item:nth-child(1) > .col-xs-12:nth-child(1) .text-color-4a')); + var CertificatesEllipsis = element(by.css('.item:nth-child(1) > .col-xs-12:nth-child(1) .col-sm-1')); var CertificateDetailsIcon = element(by.css('#dropDownSocialOptionsCertifiedAssociateLabVIEWDeveloperCertificates06943e36d76a4fcc9e67780aff668435 .row:nth-child(4) > .col-xs-9')); var EducationTitle = element(by.css('#dropDownDataCertifiedAssociateLabVIEWDeveloperCertificates06943e36d76a4fcc9e67780aff668435 > .row:nth-child(2) .item-title')); var EducationData = element(by.css('#dropDownDataCertifiedAssociateLabVIEWDeveloperCertificates06943e36d76a4fcc9e67780aff668435 > .row:nth-child(2) .item-body > .ng-binding')); @@ -2106,10 +2391,10 @@ function Certificates() { await CertificatesLink.click().then(function() { browser.sleep(2500); }); - expect(await WidgetTitle.getText()).toEqual('Certificates'); + expect(await CertificatesWidgetTitle.getText()).toEqual('Certificates'); expect(await CertificateTitle.getText()).toEqual('Certified Associate LabVIEW Developer'); expect(await CertificateSubTitle.getText()).toEqual('Business Analysis'); - await EllipsisCertificate.click(); + await CertificatesEllipsis.click(); browser.sleep(1000); await CertificateDetailsIcon.click(); browser.sleep(1000); @@ -2123,7 +2408,7 @@ function Certificates() { expect(await RenewalData.getText()).toEqual('No'); await CertificateXCloseIcon.click(); browser.sleep(1000); - await EllipsisCertificate.click(); + await CertificatesEllipsis.click(); browser.sleep(1000); await CarrouselRightScroll.click(); browser.sleep(1000); @@ -2138,12 +2423,12 @@ function Certificates() { function Institutions() { it(': Institutions, should click the Institutions link, scroll to second set, expand by ellipsis, and validate data', async function () { var InstitutionsLink = element(by.css('tr:nth-child(5) > td:nth-child(2) > .text-color-7a')); - var WidgetTitle = element(by.xpath('//recommended-colleges/div/div[2]/div/div')); + var InstitutionsWidgetTitle = element(by.xpath('//recommended-colleges/div/div/div')); var CarrouselRightScroll = element(by.css('#recommendedColleges .right > .glyphicon')); var SchoolNameTitle = element(by.css('.item:nth-child(2) > .col-xs-12:nth-child(2) .textSize')); - var EllipsisInstitutions = element(by.css('.item:nth-child(2) > .col-xs-12:nth-child(2) .col-sm-1')); - var InstitutionFollowIcon = element(by.css('#dropDownSocialOptionsInstitutions_1_1 .journey-follow')); - var InstitutionDetailsIcon = element(by.css('#dropDownSocialOptionsInstitutions_1_1 .journey-info')); + var InstitutionsEllipsis = element(by.css('.item:nth-child(2) > .col-xs-12:nth-child(2) .col-sm-1')); + var InstitutionsFollowIcon = element(by.css('#dropDownSocialOptionsInstitutions_1_1 .journey-follow')); + var InstitutionsDetailsIcon = element(by.css('#dropDownSocialOptionsInstitutions_1_1 .journey-info')); var UndergraduateTitle = element(by.css('#dropDownDataInstitutions_1_1 > .row:nth-child(2) .item-title')); var UndergraduateData = element(by.css('#dropDownDataInstitutions_1_1 > .row:nth-child(2) .ng-binding > span')); var NotRated = element(by.css('#dropDownDataInstitutions_1_1 > .row:nth-child(2) .item-body div')); @@ -2156,28 +2441,28 @@ function Institutions() { var EarningsTitle = element(by.css('#dropDownDataInstitutions_1_1 > .row:nth-child(5) .item-title')); var EarningsData = element(by.css('#dropDownDataInstitutions_1_1 > .row:nth-child(5) .ng-binding > span')); var EarningsAverage = element(by.css('#dropDownDataInstitutions_1_1 > .row:nth-child(5) .item-body div')); - var InstitutionDetailsXCloseLink = element(by.css('#dropDownDataInstitutions_1_1 > .col-xs-1')); - var InstitutionUnFollowIcon = element(by.css('.col-xs-2 .journey-follow-selected')); + var InstitutionsDetailsXCloseLink = element(by.css('#dropDownDataInstitutions_1_1 > .col-xs-1')); + var InstitutionsUnFollowIcon = element(by.css('.col-xs-2 .journey-follow-selected')); var CarrouselLeftScroll = element(by.css('#recommendedColleges .left > .glyphicon')); var XCloseLink = element(by.css('.close')); await InstitutionsLink.click().then(function() { browser.sleep(2500); }); - expect(await WidgetTitle.getText()).toEqual('Institutions'); + expect(await InstitutionsWidgetTitle.getText()).toEqual('Institutions View All'); await CarrouselRightScroll.click(); browser.sleep(1000); //Bug - Incorrect institution being loaded at times(Golden Gate University-San Francisco) await SchoolNameTitle.getText().then(async function(actualText) { if(actualText.indexOf('San Diego State University') !== -1) { expect(await SchoolNameTitle.getText()).toEqual('San Diego State University'); - await EllipsisInstitutions.click().then(function() { + await InstitutionsEllipsis.click().then(function() { browser.sleep(1000); }); - await InstitutionFollowIcon.click().then(function() { + await InstitutionsFollowIcon.click().then(function() { browser.sleep(1000); }); - await InstitutionDetailsIcon.click().then(function() { + await InstitutionsDetailsIcon.click().then(function() { browser.sleep(1000); }); expect(await UndergraduateTitle.getText()).toEqual('Undergraduate Students'); @@ -2194,13 +2479,13 @@ function Institutions() { expect(await EarningsAverage.getText()).toEqual('Above Average'); } else { expect(await SchoolNameTitle.getText()).toEqual('Golden Gate University-San Francisco'); - await EllipsisInstitutions.click().then(function() { + await InstitutionsEllipsis.click().then(function() { browser.sleep(1000); }); - await InstitutionFollowIcon.click().then(function() { + await InstitutionsFollowIcon.click().then(function() { browser.sleep(1000); }); - await InstitutionDetailsIcon.click().then(function() { + await InstitutionsDetailsIcon.click().then(function() { browser.sleep(1000); }); expect(await UndergraduateTitle.getText()).toEqual('Undergraduate Students'); @@ -2213,11 +2498,11 @@ function Institutions() { expect(await EarningsAverage.getText()).toEqual('Above Average'); } }); - await InstitutionDetailsXCloseLink.click(); + await InstitutionsDetailsXCloseLink.click(); browser.sleep(1000); - //remove await InstitutionUnFollowIcon.click(); - //remove browser.sleep(1000); - await EllipsisInstitutions.click(); + await InstitutionsUnFollowIcon.click(); + browser.sleep(1000); + await InstitutionsEllipsis.click(); browser.sleep(1000); await CarrouselLeftScroll.click(); browser.sleep(1000); @@ -2281,13 +2566,13 @@ function TopResources() { function FindOpportunities() { it(': FindOpportunities, should click Find Opportunities link', async function () { var FindOpportunitiesLink = element(by.css('tr:nth-child(4) > td:nth-child(3) > .text-color-7a')); - var WidgetTitle = element(by.css('.col-xs-12 > h6:nth-child(1) > .ng-binding')); + var FindOpportunitiesWidgetTitle = element(by.css('.col-xs-12 > h6:nth-child(1) > .ng-binding')); var XCloseLink = element(by.css('.close')); await FindOpportunitiesLink.click().then(function() { browser.sleep(2500); }); - expect(await WidgetTitle.getText()).toContain('Job Listings:');//stored value needed + expect(await FindOpportunitiesWidgetTitle.getText()).toContain('Job Listings:');//stored value needed browser.waitForAngular(); await XCloseLink.click().then(function() { browser.sleep(1000); @@ -2300,24 +2585,47 @@ function FindOpportunities() { function SubmitAResource() { it(': SubmitAResource, should click Find Resources link', async function () { var SubmitAResourceLink = element(by.css('tr:nth-child(5) > td:nth-child(3) > .text-color-7a')); - var WidgetTitle = element(by.css('.jrnys_lead-body-copy > .col-xs-12')); - var SubmitAResourceButton = element(by.css('.row:nth-child(7) .btn')); + var SubmitAResourceWidgetTitle = element(by.css('.jrnys_lead-body-copy > .row > .col-xs-12')); + var SubmitAResourceSubTextOne = element(by.css('.row:nth-child(2) > .col-sm-12')); + var TotalInJourneysText = element(by.css('.col-xs-offset-1 .col-xs-offset-1')); + var TotalInJourneysValue = element(by.css('.col-xs-offset-1 > .row .jrnys_lead-body-copy')); + var TotalInJourneysDivTitle = element(by.css('.col-sm-12 > .ng-binding')); + var MyResourceTitle = element(by.css('.row > .row .ng-binding')); + var XCloseLDivLinkOne = element(by.css('div:nth-child(2) > .close')); + var ForThisMapPointText = element(by.css('.display-right .col-xs-offset-1')); + var ForThisMapPointValue = element(by.css('.display-right .jrnys_lead-body-copy')); + var SubmitAResourceSubTextTwo = element(by.css('.row:nth-child(4) > .col-sm-12')); + var SubmitAResourceButton = element(by.css('.col-sm-12 > .jrnys_support-text')); var WidgetDivTitle = element(by.css('h3')); var WebsiteURLLink = element(by.css('.Tag:nth-child(2) > label')); - var XCloseDivLink = element(by.css('.modal-header > .close')); + var XCloseDivLinkTwo = element(by.css('.modal-header > .close')); var XCloseLink = element(by.css('.close')); await SubmitAResourceLink.click().then(function() { browser.sleep(2500); }); - expect(await WidgetTitle.getText()).toEqual('Submit a Resource'); + expect(await SubmitAResourceWidgetTitle.getText()).toEqual('Submit a Resource'); + expect(await SubmitAResourceSubTextOne.getText()).toEqual("Here's a summary of your submitted Resources"); + expect(await TotalInJourneysText.getText()).toContain('Total in Journeys'); + expect(await TotalInJourneysValue.getText()).toEqual('1'); + await TotalInJourneysValue.click().then(function() { + browser.sleep(1000); + }); + expect(await TotalInJourneysDivTitle.getText()).toEqual('My Submitted Resources'); + expect(await MyResourceTitle.getText()).toEqual('Test Doc'); + await XCloseLDivLinkOne.click().then(function() { + browser.sleep(1000); + }); + expect(await ForThisMapPointText.getText()).toContain('For this map point'); + expect(await ForThisMapPointValue.getText()).toEqual('0'); + expect(await SubmitAResourceSubTextTwo.getText()).toEqual('Help expand the system by submitting a resource.'); browser.waitForAngular(); await SubmitAResourceButton.click(); browser.waitForAngular(); expect(await WidgetDivTitle.getText()).toEqual('Submit a Resource'); browser.waitForAngular(); WebsiteURLLink.click(); - await XCloseDivLink.click().then(function() { + await XCloseDivLinkTwo.click().then(function() { browser.sleep(1000); }); browser.waitForAngular(); @@ -2330,25 +2638,29 @@ function SubmitAResource() { } function NearbyPlaces() { - it(': NearbyPlaces, should click Nearby Places link, expand 3rd card and play video', async function () { + it(': NearbyPlaces, should click Nearby Places link, expand 1st card and play video', async function () { var NearbyPlacesLink = element(by.css('tr:nth-child(3) > td:nth-child(4) > .text-color-7a')); - var NearbyPlcaesWidgetTitle = element(by.css('#nearByid > .jrnys_lead-body-copy')); - var NearbyPlacesTitle = element(by.css('.item:nth-child(1) > .col-xs-12:nth-child(3) .textSize:nth-child(1)')); - var NearbyPlacesSubTitle = element(by.css('.item:nth-child(1) > .col-xs-12:nth-child(3) .row .text-color-4a')); - var EllipsisNearyByPlaces = element(by.css('.item:nth-child(1) > .col-xs-12:nth-child(3) .col-sm-1')); - var DegreeTitle = element(by.css('#dropDownDataComputerandInformationResearchScientistsNearbyPlacesundefined > .row:nth-child(2) .item-title')); - var VideoIcon = element(by.css('#dropDownSocialOptionsComputerandInformationResearchScientistsNearbyPlacesundefined .far')); + var NearbyPlcaesWidgetTitle = element(by.css('.ng-scope > .fullHeight > .ng-binding')); + var NearbyPlacesTitle = element(by.id('territoryCardMobileTitle')); + var NearbyPlacesEllipsis = element(by.css('#\\35 d1377f6-b0bc-4750-945e-1f0d12df3807 .territoryCardIcon > .fas')); + var VideoIcon = element(by.css('#\\35 d1377f6-b0bc-4750-945e-1f0d12df3807 > div > table > tbody > tr:nth-child(3) > td > div > div:nth-child(1) > territory-card-more-back > div > div > div:nth-child(5) > div.territoryCardIconBackOfCard > career-one-stop-video > i'));//#dropDownSocialOptionsComputerandInformationResearchScientistsNearbyPlacesundefined .far')); var VideoTitle = element(by.css('.modal-content > .ng-scope > div > .ng-binding')); var XCloseVideoDivLink = element(by.css('.close:nth-child(2)')); - var DetailsIcon = element(by.css('#dropDownSocialOptionsComputerandInformationResearchScientistsNearbyPlacesundefined .row:nth-child(5) > .col-xs-9')); - var DegreeTitle = element(by.css('#dropDownDataComputerandInformationResearchScientistsNearbyPlacesundefined > .row:nth-child(2) .item-title')); - var DegreeData = element(by.css('#dropDownDataComputerandInformationResearchScientistsNearbyPlacesundefined > .row:nth-child(2) .item-body > .ng-binding')); - var SalaryTitle = element(by.css('#dropDownDataComputerandInformationResearchScientistsNearbyPlacesundefined > .row:nth-child(3) .item-title')); - var SalaryData = element(by.css('#dropDownDataComputerandInformationResearchScientistsNearbyPlacesundefined > .row:nth-child(3) .item-body > .ng-binding')); - var EmployedTitle = element(by.css('#dropDownDataComputerandInformationResearchScientistsNearbyPlacesundefined > .row:nth-child(4) .item-title')); - var EmployedData = element(by.css('#dropDownDataComputerandInformationResearchScientistsNearbyPlacesundefined > .row:nth-child(4) .item-body > .ng-binding')); - var GrowthTitle = element(by.css('#dropDownDataComputerandInformationResearchScientistsNearbyPlacesundefined > .row:nth-child(5) .item-title')); - var GrowthData = element(by.css('#dropDownDataComputerandInformationResearchScientistsNearbyPlacesundefined > .row:nth-child(5) .item-body > .ng-binding')); + var NearbyPlacesAtAGlanceIcon = element(by.css('#\\35 d1377f6-b0bc-4750-945e-1f0d12df3807 > div > table > tbody > tr:nth-child(3) > td > div > div:nth-child(1) > territory-card-more-back > div > div > div:nth-child(6) > div.territoryCardIconBackOfCard > i')); + var NearbyPlacesDescription = element(by.css('#\\35 d1377f6-b0bc-4750-945e-1f0d12df3807 > div > table > tbody > tr:nth-child(3) > td > div > div:nth-child(2) > territory-card-at-a-glance-back > div > div.territoryCardDescriptionText.ng-binding')); + var TypicalDegreeTitle = element(by.css('#\\35 d1377f6-b0bc-4750-945e-1f0d12df3807 > div > table > tbody > tr:nth-child(3) > td > div > div:nth-child(2) > territory-card-at-a-glance-back > div > div.ng-scope > div > div > table > tbody > tr:nth-child(1) > td:nth-child(2) > div')); + var DegreeDataOne = element(by.css('#\\35 d1377f6-b0bc-4750-945e-1f0d12df3807 > div > table > tbody > tr:nth-child(3) > td > div > div:nth-child(2) > territory-card-at-a-glance-back > div > div.ng-scope > div > div > table > tbody > tr:nth-child(2) > td:nth-child(2) > div')); + var DegreeDataTwo = element(by.css('#\\35 d1377f6-b0bc-4750-945e-1f0d12df3807 > div > table > tbody > tr:nth-child(3) > td > div > div:nth-child(2) > territory-card-at-a-glance-back > div > div.ng-scope > div > div > table > tbody > tr:nth-child(3) > td:nth-child(2) > div')); + var DegreeDataThree = element(by.css('#\\35 d1377f6-b0bc-4750-945e-1f0d12df3807 > div > table > tbody > tr:nth-child(3) > td > div > div:nth-child(2) > territory-card-at-a-glance-back > div > div.ng-scope > div > div > table > tbody > tr:nth-child(4) > td:nth-child(2) > div')); + var SalaryTitle = element(by.css('#\\35 d1377f6-b0bc-4750-945e-1f0d12df3807 > div > table > tbody > tr:nth-child(3) > td > div > div:nth-child(2) > territory-card-at-a-glance-back > div > div.ng-scope > div > div > table > tbody > tr:nth-child(16) > td:nth-child(2) > div')); + var SalaryData = element(by.css('#\\35 d1377f6-b0bc-4750-945e-1f0d12df3807 > div > table > tbody > tr:nth-child(3) > td > div > div:nth-child(2) > territory-card-at-a-glance-back > div > div.ng-scope > div > div > table > tbody > tr:nth-child(17) > td:nth-child(2) > div')); + var GrowthTitle = element(by.css('#\\35 d1377f6-b0bc-4750-945e-1f0d12df3807 > div > table > tbody > tr:nth-child(3) > td > div > div:nth-child(2) > territory-card-at-a-glance-back > div > div.ng-scope > div > div > table > tbody > tr:nth-child(19) > td:nth-child(2) > div')); + var GrowthDataOne = element(by.css('#\\35 d1377f6-b0bc-4750-945e-1f0d12df3807 > div > table > tbody > tr:nth-child(3) > td > div > div:nth-child(2) > territory-card-at-a-glance-back > div > div.ng-scope > div > div > table > tbody > tr:nth-child(20) > td.territoryCardBackOfCardItemText > div:nth-child(1)')); + var GrowthDataTwo = element(by.css('#\\35 d1377f6-b0bc-4750-945e-1f0d12df3807 > div > table > tbody > tr:nth-child(3) > td > div > div:nth-child(2) > territory-card-at-a-glance-back > div > div.ng-scope > div > div > table > tbody > tr:nth-child(20) > td.territoryCardBackOfCardItemText > div:nth-child(3)')); + var OpeningsTitle = element(by.css('#\\35 d1377f6-b0bc-4750-945e-1f0d12df3807 > div > table > tbody > tr:nth-child(3) > td > div > div:nth-child(2) > territory-card-at-a-glance-back > div > div.ng-scope > div > div > table > tbody > tr:nth-child(22) > td:nth-child(2) > div')); + var OpeningsData = element(by.css('#\\35 d1377f6-b0bc-4750-945e-1f0d12df3807 > div > table > tbody > tr:nth-child(3) > td > div > div:nth-child(2) > territory-card-at-a-glance-back > div > div.ng-scope > div > div > table > tbody > tr:nth-child(23) > td:nth-child(2) > div')); + var EmployedTitle = element(by.css('#\\35 d1377f6-b0bc-4750-945e-1f0d12df3807 > div > table > tbody > tr:nth-child(3) > td > div > div:nth-child(2) > territory-card-at-a-glance-back > div > div.ng-scope > div > div > table > tbody > tr:nth-child(25) > td:nth-child(2) > div')); + var EmployedData = element(by.css('#\\35 d1377f6-b0bc-4750-945e-1f0d12df3807 > div > table > tbody > tr:nth-child(3) > td > div > div:nth-child(2) > territory-card-at-a-glance-back > div > div.ng-scope > div > div > table > tbody > tr:nth-child(26) > td:nth-child(2) > div')); var XCloseLink = element(by.css('.close')); //browser.actions().mouseMove(element(by.css('#id > .ng-scope > .jrnys_lead-body-copy'))).perform().then(function() { @@ -2361,27 +2673,33 @@ function NearbyPlaces() { browser.waitForAngular(); expect(await NearbyPlcaesWidgetTitle.getText()).toEqual('Nearby Places'); browser.waitForAngular(); - expect(await NearbyPlacesTitle.getText()).toEqual('Computer and Information Research Scientists'); - expect(await NearbyPlacesSubTitle.getText()).toEqual('Network Systems'); - await EllipsisNearyByPlaces.click(); + expect(await NearbyPlacesTitle.getText()).toEqual('Computer and Information Systems Managers'); + await NearbyPlacesEllipsis.click(); browser.sleep(2500); await VideoIcon.click().then(function() { browser.sleep(10000); }); - expect(await VideoTitle.getText()).toEqual('Computer and Information Research Scientists'); + expect(await VideoTitle.getText()).toEqual('Computer and Information Systems Managers'); await XCloseVideoDivLink.click().then(function() { - browser.sleep(1000); + browser.sleep(2500); }); - await DetailsIcon.click(); - browser.sleep(2500); - expect(await DegreeTitle.getText()).toEqual('Degree Required'); - expect(await DegreeData.getText()).toEqual('Master Degree - 59%'); + await NearbyPlacesAtAGlanceIcon.click().then(function() { + browser.sleep(2500); + }); + expect(await NearbyPlacesDescription.getText()).toEqual('Plan, direct, or coordinate activities in such fields as electronic data processing, information systems, systems analysis, and computer programming.'); + expect(await TypicalDegreeTitle.getText()).toEqual('Typical Degree'); + expect(await DegreeDataOne.getText()).toEqual('College (4 Year) - 48%'); + expect(await DegreeDataTwo.getText()).toEqual('Some college - 26%'); + expect(await DegreeDataThree.getText()).toEqual("Master's degree - 14%"); expect(await SalaryTitle.getText()).toEqual('Average Annual Salary'); - expect(await SalaryData.getText()).toEqual('$114,520'); - expect(await EmployedTitle.getText()).toEqual('Currently Employed'); - expect(await EmployedData.getText()).toEqual('27,900'); + expect(await SalaryData.getText()).toEqual('$139,220'); expect(await GrowthTitle.getText()).toEqual('Projected Growth'); - expect(await GrowthData.getText()).toEqual('19.2%'); + expect(await GrowthDataOne.getText()).toEqual('12%'); + expect(await GrowthDataTwo.getText()).toEqual('ABOVE AVERAGE'); + expect(await OpeningsTitle.getText()).toEqual('Projected Job Openings'); + expect(await OpeningsData.getText()).toEqual('32,500'); + expect(await EmployedTitle.getText()).toEqual('Currently Employed'); + expect(await EmployedData.getText()).toEqual('367,600'); browser.waitForAngular(); await XCloseLink.click().then(function() { browser.sleep(1000); @@ -3139,51 +3457,151 @@ function MyJourneys() { } function MyJourneysPage() { - it(': MyJourneysPage, should navigate to My Journeys page and delete 1st journey', async function () { + it(': MyJourneysPage, should navigate to My Journeys page view and delete 1st journey', async function () { var MyJourneysHeaderLink = element(by.css('#nbMyJourneys .span-navbar-hover')); var PageTitle = element(by.css('.jrnys_lead-body-copy')); var PageSubTitle = element(by.css('.col-md-10 .ng-scope:nth-child(1)')); - var Select3rdJourney = element(by.xpath('//div[3]/div[4]/div/div/span')); - var Select1stJourney = element(by.xpath('//span[contains(.,"6 to Administrative Services Managers through Business Administration B.A./B.S.")]')); + var Select1stJourneyTitle = element(by.xpath('//span[contains(.,"6 to Administrative Services Managers through Business Administration B.A./B.S.")]')); + var SelectedJourneyBubbleOne = element(by.css('#mCSB_1_container > .firstWaypoint .lblClass')); + var SelectedJourneyBubbleTwo = element(by.css('#mCSB_1_container > .fullSize-Journey:nth-child(2) .lblClass')); + var SelectedJourneyBubbleThree = element(by.css('#mCSB_1_container > .fullSize-Journey:nth-child(3) .lblClass')); + var SelectedJourneyBubbleFour = element(by.css('#mCSB_1_container > .fullSize-Journey:nth-child(4) .lblClass')); + var SelectedJourneyBubbleFive = element(by.css('#mCSB_1_container > .fullSize-Journey:nth-child(5) .lblClass')); + var SelectedJourneyBubbleSix = element(by.css('#mCSB_1_container > .fullSize-Journey:nth-child(6) .lblClass')); + var SelectedJourneyBubbleSeven = element(by.css('#mCSB_1_container > .fullSize-Journey:nth-child(7) .lblClass')); + var SelectedJourneyBubbleEightOne = element(by.css('.fullSize-Journey:nth-child(8) .triple-line > .lblClass:nth-child(1)')); + var SelectedJourneyBubbleEightTwo = element(by.css('.fullSize-Journey:nth-child(8) .lblClass:nth-child(2)')); + var SelectedJourneyBubbleEightThree = element(by.css('.fullSize-Journey:nth-child(8) .lblClass:nth-child(3)')); + var SelectedJourneyBubbleNineOne = element(by.css('.fullSize-Journey:nth-child(9) .triple-line > .lblClass:nth-child(1)')); + var SelectedJourneyBubbleNineTwo = element(by.css('.fullSize-Journey:nth-child(9) .lblClass:nth-child(2)')); + var SelectedJourneyBubbleNineThree = element(by.css('.fullSize-Journey:nth-child(9) .lblClass:nth-child(3)')); + var SelectedJourneyBubbleTenOne = element(by.css('.fullSize-Journey:nth-child(10) .triple-line > .lblClass:nth-child(1)')); + var SelectedJourneyBubbleTenTwo = element(by.css('.fullSize-Journey:nth-child(10) .lblClass:nth-child(2)')); + var SelectedJourneyBubbleTenThree = element(by.css('.fullSize-Journey:nth-child(10) .lblClass:nth-child(3)')); + var SelectedJourneyTitle = element(by.css('.col-md-12 > .ng-binding')); + var SelectedJourneySubTitle = element(by.css('.select-waypointTitle')); + var SelectedJourneyRightArrow = element(by.css('.glyphicon-menu-right')); var JourneyLearnMoreSubTitle = element(by.css('.details-resourceRowTitle')); var ViewOnMapButton = element(by.css('.col-md-4 > .btn-info')); + var JourneyViewOnMapTitle = element(by.css('.ng-binding:nth-child(2)')); + var JourneyTitleOnMap = element(by.css('#journey-view-single > .side-bar-child-text')); + var HowAmIDoingButton = element(by.css('.btn-success')); + var DivTitle = element(by.css('h2')); + var DivSubTitle = element(by.css('p:nth-child(7)')); + var DivOkButton = element(by.css('.confirm')); var RemoveJourneyButton = element(by.css('#saveJourneyButton')); - var RemoveDivTitle = element(by.css('h2')); - var RemoveDivSubTitle = element(by.css('p:nth-child(7)')); - var RemoveDivDeleteButton = element(by.css('.confirm')); var EC = protractor.ExpectedConditions; + var BackLink = element(by.css('.btn-primary-back-mod')); + var PersistOnMapRadioButton = element(by.name('#e0049880-9613-4fd5-9ed2-eb468cdc2e55 input')); await MyJourneysHeaderLink.click().then(function() { browser.sleep(5000); }); await expect(PageTitle.getText()).toEqual('My Saved Journeys'); expect(await PageSubTitle.getText()).toEqual('Select a Journey to show it on the map'); - await Select1stJourney.click(); - browser.sleep(5000); + expect(await Select1stJourneyTitle.getText()).toEqual('6 to Administrative Services Managers through Business Administration B.A./B.S.'); + expect(await SelectedJourneyBubbleOne.getText()).toEqual('6'); + expect(await SelectedJourneyBubbleTwo.getText()).toEqual('7'); + expect(await SelectedJourneyBubbleThree.getText()).toEqual('8'); + expect(await SelectedJourneyBubbleFour.getText()).toEqual('9'); + expect(await SelectedJourneyBubbleFive.getText()).toEqual('10'); + expect(await SelectedJourneyBubbleSix.getText()).toEqual('11'); + expect(await SelectedJourneyBubbleSeven.getText()).toEqual('12'); + expect(await SelectedJourneyBubbleEightOne.getText()).toEqual('Business'); + expect(await SelectedJourneyBubbleEightTwo.getText()).toEqual('Administratio'); + expect(await SelectedJourneyBubbleEightThree.getText()).toEqual('n B.A./B.S.'); + expect(await SelectedJourneyBubbleNineOne.getText()).toEqual('National'); + expect(await SelectedJourneyBubbleNineTwo.getText()).toEqual('Chief'); + expect(await SelectedJourneyBubbleNineThree.getText()).toEqual('Engineer/Assi...'); + expect(await SelectedJourneyBubbleTenOne.getText()).toEqual('Administrativ'); + expect(await SelectedJourneyBubbleTenTwo.getText()).toEqual('e Services'); + expect(await SelectedJourneyBubbleTenThree.getText()).toEqual('Managers'); + await Select1stJourneyTitle.click().then(function() { + browser.sleep(5000); + }); + + expect(await SelectedJourneyTitle.getText()).toEqual('6 to Administrative Services Managers through Business Administration B.A./B.S.'); + expect(await SelectedJourneySubTitle.getText()).toEqual('6'); + await SelectedJourneyRightArrow.click().then(function() { + browser.sleep(2500); + }); + expect(await SelectedJourneySubTitle.getText()).toEqual('7'); + await SelectedJourneyRightArrow.click().then(function() { + browser.sleep(2500); + }); + expect(await SelectedJourneySubTitle.getText()).toEqual('8'); + await SelectedJourneyRightArrow.click().then(function() { + browser.sleep(2500); + }); + expect(await SelectedJourneySubTitle.getText()).toEqual('9'); + await SelectedJourneyRightArrow.click().then(function() { + browser.sleep(2500); + }); + expect(await SelectedJourneySubTitle.getText()).toEqual('10'); + await SelectedJourneyRightArrow.click().then(function() { + browser.sleep(2500); + }); + expect(await SelectedJourneySubTitle.getText()).toEqual('11'); + await SelectedJourneyRightArrow.click().then(function() { + browser.sleep(2500); + }); + expect(await SelectedJourneySubTitle.getText()).toEqual('12'); + await SelectedJourneyRightArrow.click().then(function() { + browser.sleep(2500); + }); + expect(await SelectedJourneySubTitle.getText()).toEqual('Business Administration B.A./B.S.'); + await SelectedJourneyRightArrow.click().then(function() { + browser.sleep(2500); + }); + expect(await SelectedJourneySubTitle.getText()).toEqual('National Chief Engineer/Assistant Engineer UFIV'); + await SelectedJourneyRightArrow.click().then(function() { + browser.sleep(2500); + }); + expect(await SelectedJourneySubTitle.getText()).toEqual('Administrative Services Managers'); + await SelectedJourneyRightArrow.click().then(function() { + browser.sleep(2500); + }); expect(await JourneyLearnMoreSubTitle.getText()).toEqual('Try these resources'); - await ViewOnMapButton.click(); - browser.sleep(10000); + await ViewOnMapButton.click().then(function() { + browser.sleep(5000); + }); + expect(await JourneyViewOnMapTitle.getText()).toEqual('Journey View'); + expect(await JourneyTitleOnMap.getText()).toEqual('6 to Administrative Services Managers through Business Administration B.A./B.S.'); await MyJourneysHeaderLink.click().then(function() { browser.sleep(5000); }); - await Select1stJourney.click(); - browser.sleep(5000); - await RemoveJourneyButton.click(); - browser.sleep(5000); - expect(await RemoveDivTitle.getText()).toEqual('Are you sure?'); - expect(await RemoveDivSubTitle.getText()).toEqual('You will not be able to recover this journey!'); - await RemoveDivDeleteButton.click(); - browser.sleep(5000); - expect(await RemoveDivTitle.getText()).toEqual('Deleted!'); - expect(await RemoveDivSubTitle.getText()).toEqual('Your journey has been deleted.'); - await RemoveDivDeleteButton.click(); + await Select1stJourneyTitle.click().then(function() { + browser.sleep(5000); + }); + await HowAmIDoingButton.click().then(function() { + browser.sleep(5000); + }); + expect(await DivTitle.getText()).toEqual('Oops!'); + expect(await DivSubTitle.getText()).toEqual("Sorry, we can't give you a quiz for this."); + await DivOkButton.click().then(function() { + browser.sleep(2500); + }); + await RemoveJourneyButton.click().then(function() { + browser.sleep(2500); + }); + expect(await DivTitle.getText()).toEqual('Are you sure?'); + expect(await DivSubTitle.getText()).toEqual('You will not be able to recover this journey!'); + await DivOkButton.click().then(function() { + browser.sleep(2500); + }); + expect(await DivTitle.getText()).toEqual('Deleted!'); + expect(await DivSubTitle.getText()).toEqual('Your journey has been deleted.'); + await DivOkButton.click(); browser.wait(EC.invisibilityOf(ViewOnMapButton)); browser.waitForAngular(); - await MyJourneysHeaderLink.click().then(function() { + await BackLink.click().then(function() { browser.sleep(5000); }); - /*browser.waitForAngular(); - browser.wait(EC.visibilityOf(Select1stJourney));*/ + await PersistOnMapRadioButton.click().then(function() { + browser.sleep(2500); + }); + browser.waitForAngular(); + browser.wait(EC.visibilityOf(Select1stJourneyTitle)); browser.waitForAngular(); browser.getCurrentUrl(); }); @@ -3260,6 +3678,7 @@ function MapInteraction() { var MapZoomInIcon = element(by.css('.glyphicon-plus')); var ExpandIcon = element(by.css('div:nth-child(2) > .back-btn-mod')); var MapSearchClearIcon = element(by.css('.glyphicon-remove')); + var DashboardHeaderLink = element(by.css('.ng-scope:nth-child(1) > a > .span-navbar-hover')); MapHeaderLink.click().then(function() { browser.sleep(5000); @@ -3418,7 +3837,9 @@ function MapInteraction() { expect(await ItemEmployedHeader.getText()).toEqual('CURRENTLY EMPLOYED'); expect(await ItemEmployedStat.getText()).toEqual('287,200'); await MapSearchClearIcon.click(); - browser.sleep(2500); + await DashboardHeaderLink.click().then(function() { + browser.sleep(5000); + }); browser.waitForAngular(); browser.getCurrentUrl(); }); @@ -3426,7 +3847,6 @@ function MapInteraction() { function MyActivityJourneys() { it(': MyActivityJourneys, should validate My Journeys widget under the My Activity Dashboard', async function () { - var DashboardHeaderLink = element(by.css('.ng-scope:nth-child(1) > a > .span-navbar-hover')); var MyDashboardLink = element(by.linkText('My Dashboards')); var MyActivityLink = element(by.linkText('My Activity')); var WidgetTitle = element(by.css('#myjourneys > .jrnys_lead-body-copy > span:nth-child(1)')); @@ -3453,9 +3873,6 @@ function MyActivityJourneys() { var JourneyProgressStepsFour = element(by.css('.journeyListWidgetJourneyContainer:nth-child(4) > div')); var CreateAJourneyButton = element(by.css('.text-right > .btn')); - await DashboardHeaderLink.click().then(function() { - browser.sleep(10000); - }); browser.actions().mouseMove(element(by.css('.dashTitleBlock > .jrnys_lead-body-copy'))).perform().then(function() { browser.sleep(1500); }); @@ -3549,7 +3966,7 @@ function SurveyMetrics() { expect(await MostRecentResultsTitle.getText()).toEqual('Most Recent Result'); expect(await MostRecentResultsStat.getText()).toEqual('Enterprising, Investigative, and Conventional'); expect(await SurveyHistoryTitle.getText()).toEqual('Survey History'); - expect(await SurveyHistoryStat.getText()).toContain('Last Taken 2019'); + expect(await SurveyHistoryStat.getText()).toContain('Last Taken 2020-'); expect(await TimesTakenTitle.getText()).toEqual('Times Taken'); expect(await NumberOfManualChangesTitle.getText()).toEqual('Number of Manual Changes'); await SurveyResultsViewAll.click().then(function() { @@ -3612,7 +4029,7 @@ function SurveyMetrics() { browser.sleep(1000); }); await SurveyResultsDivXCloseLink.click().then(function() { - browser.sleep(1000); + browser.sleep(5000); }); browser.waitForAngular(); browser.getCurrentUrl(); @@ -3624,17 +4041,27 @@ function Logins() { var LoginsWidgetTitle = element(by.css('.jrnys_lead-body-copy .col-lg-4')); var LastLoggedInHeader = element(by.css('.login-display-row:nth-child(1) > .col-lg-4')); var MonthOfHeader = element(by.css('.month-picker-lbl')); - var CalendarIcon = element(by.css('.fa-calendar')); - var NovemberLogins = element(by.xpath('//span[contains(.,"November")]')); - var ViewAllLink = element(by.css('.col-lg-4 > .text-color-7a')); + var TotalLoginsHeader = element(by.css('.row:nth-child(3) > .col-lg-4')); + var TotalLoginsData = element(by.css('.row:nth-child(3) > .col-lg-8')); + var WeeklyCeilingLogin = element(by.css('text:nth-child(19)')); var SundayHeader = element(by.css('text:nth-child(8)')); var MondayHeader = element(by.css('text:nth-child(9)')); + var MondayData = element(by.css('rect:nth-child(2)')); var TuesdayHeader = element(by.css('text:nth-child(10)')); + var TuesdayData = element(by.css('rect:nth-child(3)')); var WednesdayHeader = element(by.css('text:nth-child(11)')); + var WednesdayData = element(by.css('rect:nth-child(4)')); var ThursdayHeader = element(by.css('text:nth-child(12)')); + var ThursdayData = element(by.css('rect:nth-child(5)')); var FridayHeader = element(by.css('text:nth-child(13)')); + var FridayData = element(by.css('rect:nth-child(6)')); var SaturdayHeader = element(by.css('text:nth-child(14)')); + var CalendarIcon = element(by.css('.fa-calendar')); + var CalendarLeftIcon = element(by.css('.glyphicon-chevron-left')); + var MonthOfNovember = element(by.xpath('//span[contains(.,"November")]')); + var ViewAllLink = element(by.css('.col-lg-4 > .text-color-7a')); var LoginsDivTitle = element(by.css('.modalTitle')); + var November2019 = element(by.css('#loginMonthPicker > .month-picker-lbl')); var LastLoggedInDivHeader = element(by.css('.row:nth-child(2) > .col-lg-3')); var TotalLoginsDivHeader = element(by.css('.row:nth-child(3) > .col-lg-3')); var FrequencyOfLoginsDivHeader = element(by.css('.login-display-row:nth-child(4) > .col-xs-12')); @@ -3642,6 +4069,50 @@ function Logins() { var FavoriteDayDivHeaderOne = element(by.css('.col-md-8 > .ng-scope:nth-child(2) > .ng-binding')); var FavoriteDayDivHeaderTwo = element(by.css('.ng-scope:nth-child(3) > .ng-binding')); var FavoriteDayDivHeaderThree = element(by.css('.ng-scope:nth-child(4) > .ng-binding')); + var MonthLoginCeiling = element(by.css('text:nth-child(65)')); + var November1Header = element(by.css('#monthChart > text:nth-child(31)')); + var November2Header = element(by.css('#monthChart > text:nth-child(32)')); + var November3Header = element(by.css('#monthChart > text:nth-child(33)')); + var November4Header = element(by.css('#monthChart > text:nth-child(34)')); + var November5Header = element(by.css('#monthChart > text:nth-child(35)')); + var November6Header = element(by.css('#monthChart > text:nth-child(36)')); + var November7Header = element(by.css('#monthChart > text:nth-child(37)')); + var November8Header = element(by.css('#monthChart > text:nth-child(38)')); + var November9Header = element(by.css('#monthChart > text:nth-child(39)')); + var November10Header = element(by.css('#monthChart > text:nth-child(40)')); + var November11Header = element(by.css('#monthChart > text:nth-child(41)')); + var November12Header = element(by.css('#monthChart > text:nth-child(42)')); + var November13Header = element(by.css('#monthChart > text:nth-child(43)')); + var November14Header = element(by.css('#monthChart > text:nth-child(44)')); + var November15Header = element(by.css('#monthChart > text:nth-child(45)')); + var November16Header = element(by.css('#monthChart > text:nth-child(46)')); + var November17Header = element(by.css('#monthChart > text:nth-child(47)')); + var November18Header = element(by.css('#monthChart > text:nth-child(48)')); + var November18Data = element(by.css('#monthChart > rect:nth-child(18)')); + var November19Header = element(by.css('text:nth-child(49)')); + var November19Data = element(by.css('#monthChart > rect:nth-child(19)')); + var November20Header = element(by.css('text:nth-child(50)')); + var November21Header = element(by.css('text:nth-child(51)')); + var November22Header = element(by.css('text:nth-child(52)')); + var November23Header = element(by.css('#monthChart > text:nth-child(53)')); + var November24Header = element(by.css('text:nth-child(54)')); + var November25Header = element(by.css('text:nth-child(55)')); + var November26Header = element(by.css('text:nth-child(56)')); + var November27Header = element(by.css('text:nth-child(57)')); + var November28Header = element(by.css('text:nth-child(58)')); + var November29Header = element(by.css('text:nth-child(59)')); + var November30Header = element(by.css('text:nth-child(60)')); + var MonthlyTuesdayHeader = element(by.css('.day-selecter-container')); + var MonthlyTuesdayCeiling = element(by.css('#hourChart > text:nth-child(53)')); + var MonthlyTuesday12amHeader = element(by.css('text:nth-child(25)')); + var MonthlyTuesday3amHeader = element(by.css('text:nth-child(28)')); + var MonthlyTuesday6amHeader = element(by.css('#hourChart > text:nth-child(31)')); + var MonthlyTuesday9amHeader = element(by.css('#hourChart > text:nth-child(34)')); + var MonthlyTuesday12pmHeader = element(by.css('#hourChart > text:nth-child(37)')); + var MonthlyTuesday3pmHeader = element(by.css('#hourChart > text:nth-child(40)')); + var MonthlyTuesday3pmData = element(by.css('#hourChart > rect:nth-child(16)')); + var MonthlyTuesday6pmHeader = element(by.css('#hourChart > text:nth-child(43)')); + var MonthlyTuesday9pmHeader = element(by.css('#hourChart > text:nth-child(46)')); var LoginsDivXCloseLink = element(by.css('.close')); browser.executeScript('window.scrollTo(0, 235);').then(function() { @@ -3650,31 +4121,120 @@ function Logins() { expect(await LoginsWidgetTitle.getText()).toEqual('Logins View All'); expect(await LastLoggedInHeader.getText()).toEqual('Last Logged In:'); expect(await MonthOfHeader.getText()).not.toEqual('Month of November, 2019'); + expect(await TotalLoginsHeader.getText()).toEqual('Total Logins:'); + expect(await WeeklyCeilingLogin.getText()).toEqual('35'); + expect(await SundayHeader.getText()).toEqual('S'); + expect(await MondayHeader.getText()).toEqual('M'); + browser.actions().mouseMove(MondayData).perform().then(function() { + browser.sleep(2500); + }); + expect(await TuesdayHeader.getText()).toEqual('T'); + browser.actions().mouseMove(TuesdayData).perform().then(function() { + browser.sleep(2500); + }); + expect(await WednesdayHeader.getText()).toEqual('W'); + browser.actions().mouseMove(WednesdayData).perform().then(function() { + browser.sleep(2500); + }); + expect(await ThursdayHeader.getText()).toEqual('T'); + browser.actions().mouseMove(ThursdayData).perform().then(function() { + browser.sleep(2500); + }); + expect(await FridayHeader.getText()).toEqual('F'); + expect(await SaturdayHeader.getText()).toEqual('S'); await CalendarIcon.click().then(function() { browser.sleep(2500); }); - await NovemberLogins.click().then(function() { - browser.sleep(5000); + await CalendarLeftIcon.click().then(function() { + browser.sleep(2500); + }); + await MonthOfNovember.click().then(function() { + browser.sleep(2500); + }); + expect(await LoginsWidgetTitle.getText()).toEqual('Logins View All'); + expect(await LastLoggedInHeader.getText()).toEqual('Last Logged In:'); + expect(await MonthOfHeader.getText()).not.toEqual('Month of November, 2019'); + expect(await TotalLoginsHeader.getText()).toEqual('Total Logins:'); + expect(await TotalLoginsData.getText()).toEqual('404'); + expect(await MondayHeader.getText()).toEqual('M'); + browser.actions().mouseMove(MondayData).perform().then(function() { + browser.sleep(2500); + }); + expect(await TuesdayHeader.getText()).toEqual('T'); + browser.actions().mouseMove(TuesdayData).perform().then(function() { + browser.sleep(2500); + }); + expect(await WednesdayHeader.getText()).toEqual('W'); + browser.actions().mouseMove(WednesdayData).perform().then(function() { + browser.sleep(2500); + }); + expect(await ThursdayHeader.getText()).toEqual('T'); + browser.actions().mouseMove(ThursdayData).perform().then(function() { + browser.sleep(2500); }); - expect(await MonthOfHeader.getText()).toEqual('Month of November, 2019'); - expect(await SundayHeader.getText()).toContain('S'); - expect(await MondayHeader.getText()).toContain('M'); - expect(await TuesdayHeader.getText()).toContain('T'); - expect(await WednesdayHeader.getText()).toContain('W'); - expect(await ThursdayHeader.getText()).toContain('T'); - expect(await FridayHeader.getText()).toContain('F'); - expect(await SaturdayHeader.getText()).toContain('S'); await ViewAllLink.click().then(function() { browser.sleep(5000); }); - expect(await LoginsDivTitle.getText()).toContain('Login Results for Automated Regression'); - expect(await LastLoggedInDivHeader.getText()).toContain('Last Logged In:'); - expect(await TotalLoginsDivHeader.getText()).toContain('Total Logins:'); - expect(await FrequencyOfLoginsDivHeader.getText()).toContain('Frequency of logins for the month of November 2019:'); - expect(await FavoriteDaysToLoginDivHeader.getText()).toContain('Favorite days to login'); - expect(await FavoriteDayDivHeaderOne.getText()).toContain('Tuesday - 126'); - expect(await FavoriteDayDivHeaderTwo.getText()).toContain('Monday - 110'); - expect(await FavoriteDayDivHeaderThree.getText()).toContain('Thursday - 101'); + expect(await LoginsDivTitle.getText()).toEqual('Login Results for Automated Regression'); + expect(await November2019.getText()).toEqual('11/2019'); + expect(await LastLoggedInDivHeader.getText()).toEqual('Last Logged In:'); + expect(await TotalLoginsDivHeader.getText()).toEqual('Total Logins:'); + + expect(await FrequencyOfLoginsDivHeader.getText()).toEqual('Frequency of logins for the month of November 2019:'); + expect(await FavoriteDaysToLoginDivHeader.getText()).toEqual('Favorite days to login'); + expect(await FavoriteDayDivHeaderOne.getText()).toEqual('Tuesday - 132'); + expect(await FavoriteDayDivHeaderTwo.getText()).toEqual('Monday - 110'); + expect(await FavoriteDayDivHeaderThree.getText()).toEqual('Thursday - 101'); + expect(await MonthLoginCeiling.getText()).toEqual('60'); + expect(await November1Header.getText()).toEqual('1'); + expect(await November2Header.getText()).toEqual('2'); + expect(await November3Header.getText()).toEqual('3'); + expect(await November4Header.getText()).toEqual('4'); + expect(await November5Header.getText()).toEqual('5'); + expect(await November6Header.getText()).toEqual('6'); + expect(await November7Header.getText()).toEqual('7'); + expect(await November8Header.getText()).toEqual('8'); + expect(await November9Header.getText()).toEqual('9'); + expect(await November10Header.getText()).toEqual('10'); + expect(await November11Header.getText()).toEqual('11'); + expect(await November12Header.getText()).toEqual('12'); + expect(await November13Header.getText()).toEqual('13'); + expect(await November14Header.getText()).toEqual('14'); + expect(await November15Header.getText()).toEqual('15'); + expect(await November16Header.getText()).toEqual('16'); + expect(await November17Header.getText()).toEqual('17'); + expect(await November18Header.getText()).toEqual('18'); + browser.actions().mouseMove(November18Data).perform().then(function() { + browser.sleep(2500); + }); + expect(await November19Header.getText()).toEqual('19'); + browser.actions().mouseMove(November19Data).perform().then(function() { + browser.sleep(2500); + }); + expect(await November20Header.getText()).toEqual('20'); + expect(await November21Header.getText()).toEqual('21'); + expect(await November22Header.getText()).toEqual('22'); + expect(await November23Header.getText()).toEqual('23'); + expect(await November24Header.getText()).toEqual('24'); + expect(await November25Header.getText()).toEqual('25'); + expect(await November26Header.getText()).toEqual('26'); + expect(await November27Header.getText()).toEqual('27'); + expect(await November28Header.getText()).toEqual('28'); + expect(await November29Header.getText()).toEqual('29'); + expect(await November30Header.getText()).toEqual('30'); + expect(await MonthlyTuesdayHeader.getText()).toContain('Wednesday'); + expect(await MonthlyTuesdayCeiling.getText()).toEqual('10'); + expect(await MonthlyTuesday12amHeader.getText()).toEqual('12a'); + expect(await MonthlyTuesday3amHeader.getText()).toEqual('3a'); + expect(await MonthlyTuesday6amHeader.getText()).toEqual('6a'); + expect(await MonthlyTuesday9amHeader.getText()).toEqual('9a'); + expect(await MonthlyTuesday12pmHeader.getText()).toEqual('12p'); + expect(await MonthlyTuesday3pmHeader.getText()).toEqual('3p'); + browser.actions().mouseMove(MonthlyTuesday3pmData).perform().then(function() { + browser.sleep(2500); + }); + expect(await MonthlyTuesday6pmHeader.getText()).toEqual('6p'); + expect(await MonthlyTuesday9pmHeader.getText()).toEqual('9p'); await LoginsDivXCloseLink.click().then(function() { browser.sleep(2500); });