summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2018-08-07 13:53:39 +0100
committerFilipa Lacerda <filipa@gitlab.com>2018-08-07 14:05:53 +0100
commit0f0e70bc13a680efb438c0e6b6007c3f5fc98eca (patch)
tree9e39f4bc19064265b0bbca410cba73d000b64891
parentd8fc401229367a9d46f3282cb39ff593e51969dd (diff)
downloadgitlab-ce-0f0e70bc13a680efb438c0e6b6007c3f5fc98eca.tar.gz
Reset error state in success mutation to handle error-success state
-rw-r--r--app/assets/javascripts/reports/store/mutations.js2
-rw-r--r--changelogs/unreleased/49966-improve-junit-fe.yml5
-rw-r--r--spec/javascripts/reports/components/grouped_test_reports_app_spec.js2
-rw-r--r--spec/javascripts/reports/store/mutations_spec.js4
4 files changed, 12 insertions, 1 deletions
diff --git a/app/assets/javascripts/reports/store/mutations.js b/app/assets/javascripts/reports/store/mutations.js
index e806d120b51..1983a8c9e56 100644
--- a/app/assets/javascripts/reports/store/mutations.js
+++ b/app/assets/javascripts/reports/store/mutations.js
@@ -9,6 +9,8 @@ export default {
state.isLoading = true;
},
[types.RECEIVE_REPORTS_SUCCESS](state, response) {
+ // Make sure to clean previous state in case it was an error
+ state.hasError = false;
state.isLoading = false;
diff --git a/changelogs/unreleased/49966-improve-junit-fe.yml b/changelogs/unreleased/49966-improve-junit-fe.yml
new file mode 100644
index 00000000000..48971d3bfd6
--- /dev/null
+++ b/changelogs/unreleased/49966-improve-junit-fe.yml
@@ -0,0 +1,5 @@
+---
+title: Renders test reports for resolved failures and resets error state
+merge_request:
+author:
+type: fixed
diff --git a/spec/javascripts/reports/components/grouped_test_reports_app_spec.js b/spec/javascripts/reports/components/grouped_test_reports_app_spec.js
index c40227b74df..333cefe5f8a 100644
--- a/spec/javascripts/reports/components/grouped_test_reports_app_spec.js
+++ b/spec/javascripts/reports/components/grouped_test_reports_app_spec.js
@@ -154,7 +154,7 @@ describe('Grouped Test Reports App', () => {
expect(vm.$el.querySelector('.js-mr-code-resolved-issues').textContent).toContain(
resolvedFailures.suites[0].resolved_failures[1].name,
);
- done()
+ done();
}, 0);
});
});
diff --git a/spec/javascripts/reports/store/mutations_spec.js b/spec/javascripts/reports/store/mutations_spec.js
index 8f99d2675a5..7d19b16efb9 100644
--- a/spec/javascripts/reports/store/mutations_spec.js
+++ b/spec/javascripts/reports/store/mutations_spec.js
@@ -72,6 +72,10 @@ describe('Reports Store Mutations', () => {
expect(stateCopy.isLoading).toEqual(false);
});
+ it('should reset hasError', () => {
+ expect(stateCopy.hasError).toEqual(false);
+ });
+
it('should set summary counts', () => {
expect(stateCopy.summary.total).toEqual(mockedResponse.summary.total);
expect(stateCopy.summary.resolved).toEqual(mockedResponse.summary.resolved);