From c36152ff8c41fad2f413f253eb7ac5c927e47c56 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Fri, 13 Mar 2020 15:09:21 +0000
Subject: Add latest changes from gitlab-org/gitlab@master

---
 .../components/grouped_test_reports_app_spec.js      | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

(limited to 'spec/javascripts')

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 154aa881d2d..bafc47c952a 100644
--- a/spec/javascripts/reports/components/grouped_test_reports_app_spec.js
+++ b/spec/javascripts/reports/components/grouped_test_reports_app_spec.js
@@ -84,12 +84,10 @@ describe('Grouped Test Reports App', () => {
       setTimeout(() => {
         expect(vm.$el.querySelector('.gl-spinner')).toBeNull();
         expect(vm.$el.querySelector('.js-code-text').textContent.trim()).toEqual(
-          'Test summary contained 2 failed/error test results out of 11 total tests',
+          'Test summary contained 2 failed out of 11 total tests',
         );
 
-        expect(vm.$el.textContent).toContain(
-          'rspec:pg found 2 failed/error test results out of 8 total tests',
-        );
+        expect(vm.$el.textContent).toContain('rspec:pg found 2 failed out of 8 total tests');
 
         expect(vm.$el.textContent).toContain('New');
         expect(vm.$el.textContent).toContain(
@@ -112,12 +110,10 @@ describe('Grouped Test Reports App', () => {
       setTimeout(() => {
         expect(vm.$el.querySelector('.gl-spinner')).toBeNull();
         expect(vm.$el.querySelector('.js-code-text').textContent.trim()).toEqual(
-          'Test summary contained 2 failed/error test results out of 11 total tests',
+          'Test summary contained 2 errors out of 11 total tests',
         );
 
-        expect(vm.$el.textContent).toContain(
-          'karma found 2 failed/error test results out of 3 total tests',
-        );
+        expect(vm.$el.textContent).toContain('karma found 2 errors out of 3 total tests');
 
         expect(vm.$el.textContent).toContain('New');
         expect(vm.$el.textContent).toContain(
@@ -140,17 +136,15 @@ describe('Grouped Test Reports App', () => {
       setTimeout(() => {
         expect(vm.$el.querySelector('.gl-spinner')).toBeNull();
         expect(vm.$el.querySelector('.js-code-text').textContent.trim()).toEqual(
-          'Test summary contained 2 failed/error test results and 2 fixed test results out of 11 total tests',
+          'Test summary contained 2 failed and 2 fixed test results out of 11 total tests',
         );
 
         expect(vm.$el.textContent).toContain(
-          'rspec:pg found 1 failed/error test result and 2 fixed test results out of 8 total tests',
+          'rspec:pg found 1 failed and 2 fixed test results out of 8 total tests',
         );
 
         expect(vm.$el.textContent).toContain('New');
-        expect(vm.$el.textContent).toContain(
-          ' java ant found 1 failed/error test result out of 3 total tests',
-        );
+        expect(vm.$el.textContent).toContain(' java ant found 1 failed out of 3 total tests');
         done();
       }, 0);
     });
-- 
cgit v1.2.1