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 | |
parent | 53ae6b7e3f83591ad251a3f771f5bf3b8cf087ba (diff) | |
download | gitlab-ce-b84eeb256c4a780d902faee1f99ca9a711b3214a.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/reports')
4 files changed, 28 insertions, 8 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" /> diff --git a/app/assets/javascripts/reports/store/mutations.js b/app/assets/javascripts/reports/store/mutations.js index 2a37f5b74fa..68f6de3a7ee 100644 --- a/app/assets/javascripts/reports/store/mutations.js +++ b/app/assets/javascripts/reports/store/mutations.js @@ -16,6 +16,7 @@ export default { state.summary.total = response.summary.total; state.summary.resolved = response.summary.resolved; state.summary.failed = response.summary.failed; + state.summary.errored = response.summary.errored; state.status = response.status; state.reports = response.suites; @@ -29,6 +30,7 @@ export default { total: 0, resolved: 0, failed: 0, + errored: 0, }; state.status = null; }, diff --git a/app/assets/javascripts/reports/store/state.js b/app/assets/javascripts/reports/store/state.js index d0b2d0a37f5..4f9eb53e787 100644 --- a/app/assets/javascripts/reports/store/state.js +++ b/app/assets/javascripts/reports/store/state.js @@ -13,6 +13,7 @@ export default () => ({ total: 0, resolved: 0, failed: 0, + errored: 0, }, /** @@ -23,10 +24,14 @@ export default () => ({ * total: {Number}, * resolved: {Number}, * failed: {Number}, + * errored: {Number}, * }, * new_failures: {Array.<Object>}, * resolved_failures: {Array.<Object>}, * existing_failures: {Array.<Object>}, + * new_errors: {Array.<Object>}, + * resolved_errors: {Array.<Object>}, + * existing_errors: {Array.<Object>}, * } */ reports: [], diff --git a/app/assets/javascripts/reports/store/utils.js b/app/assets/javascripts/reports/store/utils.js index 7381f038eaf..ce3ffaae703 100644 --- a/app/assets/javascripts/reports/store/utils.js +++ b/app/assets/javascripts/reports/store/utils.js @@ -8,10 +8,11 @@ import { } from '../constants'; const textBuilder = results => { - const { failed, resolved, total } = results; + const { failed, errored, resolved, total } = results; - const failedString = failed - ? n__('%d failed/error test result', '%d failed/error test results', failed) + const failedOrErrored = (failed || 0) + (errored || 0); + const failedString = failedOrErrored + ? n__('%d failed/error test result', '%d failed/error test results', failedOrErrored) : null; const resolvedString = resolved ? n__('%d fixed test result', '%d fixed test results', resolved) @@ -20,7 +21,7 @@ const textBuilder = results => { let resultsString = s__('Reports|no changed test results'); - if (failed) { + if (failedOrErrored) { if (resolved) { resultsString = sprintf(s__('Reports|%{failedString} and %{resolvedString}'), { failedString, |