Add latest changes from gitlab-org/gitlab@master

4 files changed, 27 insertions, 13 deletions

diff --git a/spec/frontend/reports/components/grouped_test_reports_app_spec.js b/spec/frontend/reports/components/grouped_test_reports_app_spec.js
index ae2718db17f..66d429017b2 100644
--- a/spec/frontend/reports/components/grouped_test_reports_app_spec.js
+++ b/spec/frontend/reports/components/grouped_test_reports_app_spec.js
@@ -264,7 +264,9 @@ describe('Grouped test reports app', () => {
         });
 
         it('renders the recent failures count on the test case', () => {
-          expect(findIssueDescription().text()).toContain('Failed 8 times in the last 14 days');
+          expect(findIssueDescription().text()).toContain(
+            'Failed 8 times in master in the last 14 days',
+          );
         });
       });
 
diff --git a/spec/frontend/reports/mock_data/recent_failures_report.json b/spec/frontend/reports/mock_data/recent_failures_report.json
index a47bc30a8e5..bc86d788ee2 100644
--- a/spec/frontend/reports/mock_data/recent_failures_report.json
+++ b/spec/frontend/reports/mock_data/recent_failures_report.json
@@ -10,7 +10,10 @@
           "name": "Test#sum when a is 1 and b is 2 returns summary",
           "execution_time": 0.009411,
           "system_output": "Failure/Error: is_expected.to eq(3)\n\n  expected: 3\n       got: -1\n\n  (compared using ==)\n./spec/test_spec.rb:12:in `block (4 levels) in <top (required)>'",
-          "recent_failures": 8
+          "recent_failures": {
+            "count": 8,
+            "base_branch": "master"
+          }
         },
         {
           "result": "failure",
@@ -33,7 +36,10 @@
           "result": "failure",
           "name": "Test#sum when a is 100 and b is 200 returns summary",
           "execution_time": 0.000562,
-          "recent_failures": 3
+          "recent_failures": {
+            "count": 3,
+            "base_branch": "master"
+          }
         }
       ],
       "resolved_failures": [],
diff --git a/spec/frontend/reports/store/mutations_spec.js b/spec/frontend/reports/store/mutations_spec.js
index 82a399c876d..c1c5862a37c 100644
--- a/spec/frontend/reports/store/mutations_spec.js
+++ b/spec/frontend/reports/store/mutations_spec.js
@@ -46,7 +46,10 @@ describe('Reports Store Mutations', () => {
               name: 'StringHelper#concatenate when a is git and b is lab returns summary',
               execution_time: 0.0092435,
               system_output: "Failure/Error: is_expected.to eq('gitlab')",
-              recent_failures: 4,
+              recent_failures: {
+                count: 4,
+                base_branch: 'master',
+              },
             },
           ],
           resolved_failures: [
diff --git a/spec/frontend/reports/store/utils_spec.js b/spec/frontend/reports/store/utils_spec.js
index 8977268115e..5249e9ffcce 100644
--- a/spec/frontend/reports/store/utils_spec.js
+++ b/spec/frontend/reports/store/utils_spec.js
@@ -188,9 +188,9 @@ describe('Reports store utils', () => {
   describe('countRecentlyFailedTests', () => {
     it('counts tests with more than one recent failure in a report', () => {
       const report = {
-        new_failures: [{ recent_failures: 2 }],
-        existing_failures: [{ recent_failures: 1 }],
-        resolved_failures: [{ recent_failures: 20 }, { recent_failures: 5 }],
+        new_failures: [{ recent_failures: { count: 2 } }],
+        existing_failures: [{ recent_failures: { count: 1 } }],
+        resolved_failures: [{ recent_failures: { count: 20 } }, { recent_failures: { count: 5 } }],
       };
       const result = utils.countRecentlyFailedTests(report);
 
@@ -200,14 +200,17 @@ describe('Reports store utils', () => {
     it('counts tests  with more than one recent failure in an array of reports', () => {
       const reports = [
         {
-          new_failures: [{ recent_failures: 2 }],
-          existing_failures: [{ recent_failures: 20 }, { recent_failures: 5 }],
-          resolved_failures: [{ recent_failures: 2 }],
+          new_failures: [{ recent_failures: { count: 2 } }],
+          existing_failures: [
+            { recent_failures: { count: 20 } },
+            { recent_failures: { count: 5 } },
+          ],
+          resolved_failures: [{ recent_failures: { count: 2 } }],
         },
         {
-          new_failures: [{ recent_failures: 8 }, { recent_failures: 14 }],
-          existing_failures: [{ recent_failures: 1 }],
-          resolved_failures: [{ recent_failures: 7 }, { recent_failures: 5 }],
+          new_failures: [{ recent_failures: { count: 8 } }, { recent_failures: { count: 14 } }],
+          existing_failures: [{ recent_failures: { count: 1 } }],
+          resolved_failures: [{ recent_failures: { count: 7 } }, { recent_failures: { count: 5 } }],
         },
       ];
       const result = utils.countRecentlyFailedTests(reports);