summaryrefslogtreecommitdiff
path: root/spec/features
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-03-13 15:09:21 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-03-13 15:09:21 +0000
commitc36152ff8c41fad2f413f253eb7ac5c927e47c56 (patch)
treebbf300da207de3e8bbf272d44111ceedb18f5833 /spec/features
parent286fe61013674fe2d245ffc8d2233baf09923e70 (diff)
downloadgitlab-ce-c36152ff8c41fad2f413f253eb7ac5c927e47c56.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/features')
-rw-r--r--spec/features/merge_request/user_sees_merge_widget_spec.rb22
1 files changed, 11 insertions, 11 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 94f57cdda74..eca011bc786 100644
--- a/spec/features/merge_request/user_sees_merge_widget_spec.rb
+++ b/spec/features/merge_request/user_sees_merge_widget_spec.rb
@@ -585,10 +585,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/error test result out of 2 total tests')
+ expect(page).to have_content('Test summary contained 1 failed 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/error test result out of 1 total test')
+ expect(page).to have_content('junit found 1 failed out of 1 total test')
expect(page).to have_content('New')
expect(page).to have_content('addTest')
end
@@ -630,9 +630,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/error test result out of 2 total tests')
+ expect(page).to have_content('Test summary contained 1 failed out of 2 total tests')
within(".js-report-section-container") do
- expect(page).to have_content('rspec found 1 failed/error test result out of 1 total test')
+ expect(page).to have_content('rspec found 1 failed 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')
@@ -718,10 +718,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/error test result out of 2 total tests')
+ expect(page).to have_content('Test summary contained 1 error 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/error test result out of 1 total test')
+ expect(page).to have_content('junit found 1 error out of 1 total test')
expect(page).to have_content('New')
expect(page).to have_content('addTest')
end
@@ -762,9 +762,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/error test result out of 2 total tests')
+ expect(page).to have_content('Test summary contained 1 error out of 2 total tests')
within(".js-report-section-container") do
- expect(page).to have_content('rspec found 1 failed/error test result out of 1 total test')
+ expect(page).to have_content('rspec found 1 error 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 4 and b is 4 returns summary')
@@ -857,10 +857,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/error test results out of 20 total tests')
+ expect(page).to have_content('Test summary contained 20 failed out of 20 total tests')
within(".js-report-section-container") do
- 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('rspec found 10 failed out of 10 total tests')
+ expect(page).to have_content('junit found 10 failed 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