diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-18 11:18:50 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-18 11:18:50 +0000 |
commit | 8c7f4e9d5f36cff46365a7f8c4b9c21578c1e781 (patch) | |
tree | a77e7fe7a93de11213032ed4ab1f33a3db51b738 /app/assets/javascripts/reports | |
parent | 00b35af3db1abfe813a778f643dad221aad51fca (diff) | |
download | gitlab-ce-8c7f4e9d5f36cff46365a7f8c4b9c21578c1e781.tar.gz |
Add latest changes from gitlab-org/gitlab@13-1-stable-ee
Diffstat (limited to 'app/assets/javascripts/reports')
3 files changed, 26 insertions, 21 deletions
diff --git a/app/assets/javascripts/reports/components/grouped_test_reports_app.vue b/app/assets/javascripts/reports/components/grouped_test_reports_app.vue index 0f7a0e60dc0..a670cad5f9f 100644 --- a/app/assets/javascripts/reports/components/grouped_test_reports_app.vue +++ b/app/assets/javascripts/reports/components/grouped_test_reports_app.vue @@ -98,25 +98,27 @@ export default { :has-issues="reports.length > 0" class="mr-widget-section grouped-security-reports mr-report" > - <div slot="body" class="mr-widget-grouped-section report-block"> - <template v-for="(report, i) in reports"> - <summary-row - :key="`summary-row-${i}`" - :summary="reportText(report)" - :status-icon="getReportIcon(report)" - /> - <issues-list - v-if="shouldRenderIssuesList(report)" - :key="`issues-list-${i}`" - :unresolved-issues="unresolvedIssues(report)" - :new-issues="newIssues(report)" - :resolved-issues="resolvedIssues(report)" - :component="$options.componentNames.TestIssueBody" - class="report-block-group-list" - /> - </template> + <template #body> + <div class="mr-widget-grouped-section report-block"> + <template v-for="(report, i) in reports"> + <summary-row + :key="`summary-row-${i}`" + :summary="reportText(report)" + :status-icon="getReportIcon(report)" + /> + <issues-list + v-if="shouldRenderIssuesList(report)" + :key="`issues-list-${i}`" + :unresolved-issues="unresolvedIssues(report)" + :new-issues="newIssues(report)" + :resolved-issues="resolvedIssues(report)" + :component="$options.componentNames.TestIssueBody" + class="report-block-group-list" + /> + </template> - <modal :title="modalTitle" :modal-data="modalData" /> - </div> + <modal :title="modalTitle" :modal-data="modalData" /> + </div> + </template> </report-section> </template> diff --git a/app/assets/javascripts/reports/components/summary_row.vue b/app/assets/javascripts/reports/components/summary_row.vue index 9cbe2a690a0..b9fc902cd3a 100644 --- a/app/assets/javascripts/reports/components/summary_row.vue +++ b/app/assets/javascripts/reports/components/summary_row.vue @@ -54,7 +54,10 @@ export default { <ci-icon v-else :status="iconStatus" :size="24" /> </div> <div class="report-block-list-issue-description"> - <div class="report-block-list-issue-description-text"> + <div + class="report-block-list-issue-description-text" + data-testid="test-summary-row-description" + > {{ summary }}<span v-if="popoverOptions" class="text-nowrap" > <popover v-if="popoverOptions" :options="popoverOptions" class="align-top" /> diff --git a/app/assets/javascripts/reports/components/test_issue_body.vue b/app/assets/javascripts/reports/components/test_issue_body.vue index 7700f49bf7d..c41238070b1 100644 --- a/app/assets/javascripts/reports/components/test_issue_body.vue +++ b/app/assets/javascripts/reports/components/test_issue_body.vue @@ -26,7 +26,7 @@ export default { </script> <template> <div class="report-block-list-issue-description prepend-top-5 append-bottom-5"> - <div class="report-block-list-issue-description-text"> + <div class="report-block-list-issue-description-text" data-testid="test-issue-body-description"> <button type="button" class="btn-link btn-blank text-left break-link vulnerability-name-button" |