Merge branch 'codeclimate-requests' into 'master'

Makes code quality requests in parallel

Closes #2910

See merge request gitlab-org/gitlab-ee!3033

ee/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_code_quality.vue

@@ -111,20 +111,17 @@ export default {
 
     this.isLoading = true;
 
+    Promise.all([
       this.service.fetchCodeclimate(head_path)
-      .then(resp => resp.json())
-      .then((data) => {
-        this.mr.setCodeclimateHeadMetrics(data);
+        .then(resp => resp.json()),
       this.service.fetchCodeclimate(base_path)
-          .then(response => response.json())
-          .then(baseData => this.mr.setCodeclimateBaseMetrics(baseData))
-          .then(() => this.mr.compareCodeclimateMetrics())
-          .then(() => {
+        .then(resp => resp.json()),
+    ])
+      .then((values) => {
+        this.mr.compareCodeclimateMetrics(values[0], values[1]);
         this.isLoading = false;
       })
       .catch(() => this.handleError());
-      })
-      .catch(() => this.handleError());
   },
 };
 </script>

ee/app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js

@@ -53,24 +53,12 @@ export default class MergeRequestStore extends CEMergeRequestStore {
   initCodeclimate(data) {
     this.codeclimate = data.codeclimate;
     this.codeclimateMetrics = {
-      headIssues: [],
-      baseIssues: [],
       newIssues: [],
       resolvedIssues: [],
     };
   }
 
-  setCodeclimateHeadMetrics(data) {
-    this.codeclimateMetrics.headIssues = data;
-  }
-
-  setCodeclimateBaseMetrics(data) {
-    this.codeclimateMetrics.baseIssues = data;
-  }
-
-  compareCodeclimateMetrics() {
-    const { headIssues, baseIssues } = this.codeclimateMetrics;
-
+  compareCodeclimateMetrics(headIssues, baseIssues) {
     this.codeclimateMetrics.newIssues = this.filterByFingerprint(headIssues, baseIssues);
     this.codeclimateMetrics.resolvedIssues = this.filterByFingerprint(baseIssues, headIssues);
   }

spec/javascripts/vue_mr_widget/stores/mr_widget_store_spec.js

@@ -54,36 +54,9 @@ describe('MergeRequestStore', () => {
     });
   });
 
-  describe('setCodeclimateHeadMetrics', () => {
-    it('should set defaults', () => {
-      expect(store.codeclimate).toEqual(mockData.codeclimate);
-      expect(store.codeclimateMetrics).toEqual({
-        headIssues: [],
-        baseIssues: [],
-        newIssues: [],
-        resolvedIssues: [],
-      });
-    });
-
-    it('should set the provided head metrics', () => {
-      store.setCodeclimateHeadMetrics(headIssues);
-      expect(store.codeclimateMetrics.headIssues).toEqual(headIssues);
-    });
-  });
-
-  describe('setCodeclimateBaseMetrics', () => {
-    it('should set the provided base metrics', () => {
-      store.setCodeclimateBaseMetrics(baseIssues);
-
-      expect(store.codeclimateMetrics.baseIssues).toEqual(baseIssues);
-    });
-  });
-
   describe('compareCodeclimateMetrics', () => {
     beforeEach(() => {
-      store.setCodeclimateHeadMetrics(headIssues);
-      store.setCodeclimateBaseMetrics(baseIssues);
-      store.compareCodeclimateMetrics();
+      store.compareCodeclimateMetrics(headIssues, baseIssues);
     });
 
     it('should return the new issues', () => {