Add latest changes from gitlab-org/gitlab@master

1 files changed, 7 insertions, 7 deletions

diff --git a/spec/features/merge_request/user_sees_merge_widget_spec.rb b/spec/features/merge_request/user_sees_merge_widget_spec.rb
index d19835741e3..6b6226ad1c5 100644
--- a/spec/features/merge_request/user_sees_merge_widget_spec.rb
+++ b/spec/features/merge_request/user_sees_merge_widget_spec.rb
@@ -536,10 +536,10 @@ describe 'Merge request > User sees merge widget', :js do
           within(".js-reports-container") do
             click_button 'Expand'
 
-            expect(page).to have_content('Test summary contained 1 failed test result out of 2 total tests')
+            expect(page).to have_content('Test summary contained 1 failed/error test result out of 2 total tests')
             within(".js-report-section-container") do
               expect(page).to have_content('rspec found no changed test results out of 1 total test')
-              expect(page).to have_content('junit found 1 failed test result out of 1 total test')
+              expect(page).to have_content('junit found 1 failed/error test result out of 1 total test')
               expect(page).to have_content('New')
               expect(page).to have_content('addTest')
             end
@@ -581,9 +581,9 @@ describe 'Merge request > User sees merge widget', :js do
           within(".js-reports-container") do
             click_button 'Expand'
 
-            expect(page).to have_content('Test summary contained 1 failed test result out of 2 total tests')
+            expect(page).to have_content('Test summary contained 1 failed/error test result out of 2 total tests')
             within(".js-report-section-container") do
-              expect(page).to have_content('rspec found 1 failed test result out of 1 total test')
+              expect(page).to have_content('rspec found 1 failed/error test result out of 1 total test')
               expect(page).to have_content('junit found no changed test results out of 1 total test')
               expect(page).not_to have_content('New')
               expect(page).to have_content('Test#sum when a is 1 and b is 3 returns summary')
@@ -677,10 +677,10 @@ describe 'Merge request > User sees merge widget', :js do
           within(".js-reports-container") do
             click_button 'Expand'
 
-            expect(page).to have_content('Test summary contained 20 failed test results out of 20 total tests')
+            expect(page).to have_content('Test summary contained 20 failed/error test results out of 20 total tests')
             within(".js-report-section-container") do
-              expect(page).to have_content('rspec found 10 failed test results out of 10 total tests')
-              expect(page).to have_content('junit found 10 failed test results out of 10 total tests')
+              expect(page).to have_content('rspec found 10 failed/error test results out of 10 total tests')
+              expect(page).to have_content('junit found 10 failed/error test results out of 10 total tests')
 
               expect(page).to have_content('Test#sum when a is 1 and b is 3 returns summary', count: 2)
             end