diff --git a/tests/artifacts/xdmod/report_builder/output/cd_enum_templates.json b/tests/artifacts/xdmod/report_builder/output/cd_enum_templates.json index b28eaf3939..41f6de57a9 100644 --- a/tests/artifacts/xdmod/report_builder/output/cd_enum_templates.json +++ b/tests/artifacts/xdmod/report_builder/output/cd_enum_templates.json @@ -7,13 +7,7 @@ "name": "Quarterly Report - Center Director", "description": "Quarterly Report - Center Director", "use_submenu": "0" - }, - { - "id": "2", - "name": "Dashboard Tab Report", - "description": "Dashboard Tab Report", - "use_submenu": "0" } ], - "count": 2 + "count": 1 } diff --git a/tests/artifacts/xdmod/report_builder/output/cs_enum_templates.json b/tests/artifacts/xdmod/report_builder/output/cs_enum_templates.json index 477bb96eb6..d924259329 100644 --- a/tests/artifacts/xdmod/report_builder/output/cs_enum_templates.json +++ b/tests/artifacts/xdmod/report_builder/output/cs_enum_templates.json @@ -1,13 +1,6 @@ { "status": "success", "success": true, - "templates": [ - { - "id": "3", - "name": "Dashboard Tab Report", - "description": "Dashboard Tab Report", - "use_submenu": "0" - } - ], - "count": 1 + "templates": [], + "count": 0 } diff --git a/tests/artifacts/xdmod/ui/output/reportGenerator.json b/tests/artifacts/xdmod/ui/output/reportGenerator.json index 7ff3b613c3..0372dba9a5 100644 --- a/tests/artifacts/xdmod/ui/output/reportGenerator.json +++ b/tests/artifacts/xdmod/ui/output/reportGenerator.json @@ -1,6 +1,6 @@ { "centerstaff": { - "report_templates_available": true + "report_templates_available": false }, "centerdirector": { "report_templates": [ @@ -140,79 +140,6 @@ "timeframeType": "Year to date" } ] - }, - { - "name": "Dashboard Tab Report", - "created_name": "Dashboard Tab Report", - "created_reports_count": 8, - "reports_created": 1, - "delivery_format": "PDF", - "charts": [ - { - "realm": "Jobs", - "startDate": "previousQuarterStartDate", - "endDate": "previousQuarterEndDate", - "title": "Total CPU Hours and Jobs", - "drillDetails": "", - "timeframeType": "Previous quarter" - }, - { - "realm": "Jobs", - "startDate": "previousQuarterStartDate", - "endDate": "previousQuarterEndDate", - "title": "Percent Utilization", - "drillDetails": "", - "timeframeType": "Previous quarter" - }, - { - "realm": "Jobs", - "startDate": "previousQuarterStartDate", - "endDate": "previousQuarterEndDate", - "title": "CPU Hours and Number of Jobs - Top 20 Users", - "drillDetails": "", - "timeframeType": "Previous quarter" - }, - { - "realm": "Jobs", - "startDate": "previousQuarterStartDate", - "endDate": "previousQuarterEndDate", - "title": "CPU Hours and Number of Jobs", - "drillDetails": "by Resource", - "timeframeType": "Previous quarter" - }, - { - "realm": "Jobs", - "startDate": "previousQuarterStartDate", - "endDate": "previousQuarterEndDate", - "title": "CPU Hours, Number of Jobs, and Wait Time per Job", - "drillDetails": "by Job Size", - "timeframeType": "Previous quarter" - }, - { - "realm": "Jobs", - "startDate": "previousQuarterStartDate", - "endDate": "previousQuarterEndDate", - "title": "CPU Hours and User Expansion Factor", - "drillDetails": "by Job Size", - "timeframeType": "Previous quarter" - }, - { - "realm": "Jobs", - "startDate": "previousQuarterStartDate", - "endDate": "previousQuarterEndDate", - "title": "Wait Hours per Job", - "drillDetails": "by Queue", - "timeframeType": "Previous quarter" - }, - { - "realm": "Jobs", - "startDate": "previousQuarterStartDate", - "endDate": "previousQuarterEndDate", - "title": "CPU Hours and Number of Jobs", - "drillDetails": "by Queue", - "timeframeType": "Previous quarter" - } - ] } ], "center": "" diff --git a/tests/ui/test/specs/xdmod/reportGenerator.js b/tests/ui/test/specs/xdmod/reportGenerator.js index faf9582c2f..91f5ddfcca 100644 --- a/tests/ui/test/specs/xdmod/reportGenerator.js +++ b/tests/ui/test/specs/xdmod/reportGenerator.js @@ -233,78 +233,6 @@ describe('Report Generator', function () { timeframeType: 'Year to date' } ] - }, - { - name: expected.centerdirector.report_templates[1].name, - chartsPerPage: 1, - schedule: 'Once', - deliveryFormat: 'PDF', - charts: [ - { - realm: 'Jobs', - startDate: previousQuarterStartDate, - endDate: previousQuarterEndDate, - title: 'Total CPU Hours and Jobs', - drillDetails: '', - timeframeType: 'Previous quarter' - }, - { - realm: 'Jobs', - startDate: previousQuarterStartDate, - endDate: previousQuarterEndDate, - title: 'Percent Utilization', - drillDetails: '', - timeframeType: 'Previous quarter' - }, - { - realm: 'Jobs', - startDate: previousQuarterStartDate, - endDate: previousQuarterEndDate, - title: 'CPU Hours and Number of Jobs - Top 20 Users', - drillDetails: '', - timeframeType: 'Previous quarter' - }, - { - realm: 'Jobs', - startDate: previousQuarterStartDate, - endDate: previousQuarterEndDate, - title: 'CPU Hours and Number of Jobs', - drillDetails: 'by Resource', - timeframeType: 'Previous quarter' - }, - { - realm: 'Jobs', - startDate: previousQuarterStartDate, - endDate: previousQuarterEndDate, - title: 'CPU Hours, Number of Jobs, and Wait Time per Job', - drillDetails: 'by Job Size', - timeframeType: 'Previous quarter' - }, - { - realm: 'Jobs', - startDate: previousQuarterStartDate, - endDate: previousQuarterEndDate, - title: 'CPU Hours and User Expansion Factor', - drillDetails: 'by Job Size', - timeframeType: 'Previous quarter' - }, - { - realm: 'Jobs', - startDate: previousQuarterStartDate, - endDate: previousQuarterEndDate, - title: 'Wait Hours per Job', - drillDetails: 'by Queue', - timeframeType: 'Previous quarter' - }, - { - realm: 'Jobs', - startDate: previousQuarterStartDate, - endDate: previousQuarterEndDate, - title: 'CPU Hours and Number of Jobs', - drillDetails: 'by Queue', - timeframeType: 'Previous quarter' - } - ] } ]; @@ -380,7 +308,7 @@ describe('Report Generator', function () { it('No available charts listed', function () { expect(reportGeneratorPage.getAvailableCharts().length, 'No charts in the list of available charts').to.be.equal(0); }); - it('Report templates available', function () { + it('No report templates available', function () { expect(reportGeneratorPage.isNewBasedOnEnabled()).to.equal(expected.centerstaff.report_templates_available); }); }); diff --git a/tests/ui/test/specs/xdmod/reportGenerator.page.js b/tests/ui/test/specs/xdmod/reportGenerator.page.js index fe74dd112f..a79a89c3c5 100644 --- a/tests/ui/test/specs/xdmod/reportGenerator.page.js +++ b/tests/ui/test/specs/xdmod/reportGenerator.page.js @@ -1034,8 +1034,8 @@ class ReportGenerator { browser.waitForVisible(this.selectors.myReports.toolbar.downloadAsPdfButton()); browser.click(this.selectors.myReports.toolbar.downloadAsPdfButton()); // Wait for check mark image to appear and disappear. - browser.waitForVisible(this.selectors.checkmarkMask(), 10000); - browser.waitForInvisible(this.selectors.checkmarkMask(), 10000); + browser.waitForVisible(this.selectors.checkmarkMask(), 60000); + browser.waitForInvisible(this.selectors.checkmarkMask(), 60000); } /**