diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-17 12:09:20 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-17 12:09:20 +0000 |
commit | b84eeb256c4a780d902faee1f99ca9a711b3214a (patch) | |
tree | 32918aadbea9210eace50efbce9afbfb8cd3ba84 /app/assets/javascripts/reports/components | |
parent | 53ae6b7e3f83591ad251a3f771f5bf3b8cf087ba (diff) | |
download | gitlab-ce-b84eeb256c4a780d902faee1f99ca9a711b3214a.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/reports/components')
-rw-r--r-- | app/assets/javascripts/reports/components/grouped_test_reports_app.vue | 20 |
1 files changed, 16 insertions, 4 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 82601363aa4..88d174f96ed 100644 --- a/app/assets/javascripts/reports/components/grouped_test_reports_app.vue +++ b/app/assets/javascripts/reports/components/grouped_test_reports_app.vue @@ -62,9 +62,21 @@ export default { return ( report.existing_failures.length > 0 || report.new_failures.length > 0 || - report.resolved_failures.length > 0 + report.resolved_failures.length > 0 || + report.existing_errors.length > 0 || + report.new_errors.length > 0 || + report.resolved_errors.length > 0 ); }, + unresolvedIssues(report) { + return report.existing_failures.concat(report.existing_errors); + }, + newIssues(report) { + return report.new_failures.concat(report.new_errors); + }, + resolvedIssues(report) { + return report.resolved_failures.concat(report.resolved_errors); + }, }, }; </script> @@ -87,9 +99,9 @@ export default { <issues-list v-if="shouldRenderIssuesList(report)" :key="`issues-list-${i}`" - :unresolved-issues="report.existing_failures" - :new-issues="report.new_failures" - :resolved-issues="report.resolved_failures" + :unresolved-issues="unresolvedIssues(report)" + :new-issues="newIssues(report)" + :resolved-issues="resolvedIssues(report)" :component="$options.componentNames.TestIssueBody" class="report-block-group-list" /> |