Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'spec/features/merge_request/user_sees_merge_widget_spec.rb')
-rw-r--r--spec/features/merge_request/user_sees_merge_widget_spec.rb12
1 files changed, 6 insertions, 6 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 d9b5ec17a4a..a85700fc721 100644
--- a/spec/features/merge_request/user_sees_merge_widget_spec.rb
+++ b/spec/features/merge_request/user_sees_merge_widget_spec.rb
@@ -104,7 +104,7 @@ RSpec.describe 'Merge request > User sees merge widget', :js do
before do
create(:service, project: project,
active: true,
- type: 'CiService',
+ type: 'DroneCiService',
category: 'ci')
visit project_merge_request_path(project, merge_request)
@@ -154,9 +154,9 @@ RSpec.describe 'Merge request > User sees merge widget', :js do
end
it 'shows information about blocked pipeline' do
- expect(page).to have_content("Pipeline blocked")
+ expect(page).to have_content("Merge blocked")
expect(page).to have_content(
- "The pipeline for this merge request requires a manual action")
+ "pipeline must succeed. It's waiting for a manual action to continue.")
expect(page).to have_css('.ci-status-icon-manual')
end
end
@@ -274,10 +274,10 @@ RSpec.describe 'Merge request > User sees merge widget', :js do
visit project_merge_request_path(project, merge_request)
end
- it 'has info button when MWBS button' do
+ it 'has confirm button when MWBS button' do
# Wait for the `ci_status` and `merge_check` requests
wait_for_requests
- expect(page).to have_selector('.accept-merge-request.btn-info')
+ expect(page).to have_selector('.accept-merge-request.btn-confirm')
end
end
@@ -432,7 +432,7 @@ RSpec.describe 'Merge request > User sees merge widget', :js do
it 'user cannot remove source branch', :sidekiq_might_not_need_inline do
expect(page).not_to have_field('remove-source-branch-input')
- expect(page).to have_content('Deletes source branch')
+ expect(page).to have_content('The source branch will be deleted')
end
end