Merge branch '49966-improve-junit-fe' into 'master'

Resolve "Improve JUnit support"

See merge request gitlab-org/gitlab-ce!21067

2 files changed, 3 insertions, 1 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 5bc3c2c4d21..140475b4dfa 100644
--- a/app/assets/javascripts/reports/components/grouped_test_reports_app.vue
+++ b/app/assets/javascripts/reports/components/grouped_test_reports_app.vue
@@ -69,7 +69,7 @@
         return (
           report.existing_failures.length > 0 ||
           report.new_failures.length > 0 ||
-          report.resolved_failures > 0
+          report.resolved_failures.length > 0
         );
       },
     },
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;