summaryrefslogtreecommitdiff
path: root/spec/features/projects/merge_requests/user_edits_merge_request_spec.rb
diff options
context:
space:
mode:
Diffstat (limited to 'spec/features/projects/merge_requests/user_edits_merge_request_spec.rb')
-rw-r--r--spec/features/projects/merge_requests/user_edits_merge_request_spec.rb5
1 files changed, 3 insertions, 2 deletions
diff --git a/spec/features/projects/merge_requests/user_edits_merge_request_spec.rb b/spec/features/projects/merge_requests/user_edits_merge_request_spec.rb
index f6e3997383f..3d19a2923b9 100644
--- a/spec/features/projects/merge_requests/user_edits_merge_request_spec.rb
+++ b/spec/features/projects/merge_requests/user_edits_merge_request_spec.rb
@@ -1,6 +1,8 @@
require 'spec_helper'
describe 'User edits a merge request', :js do
+ include Select2Helper
+
let(:project) { create(:project, :repository) }
let(:merge_request) { create(:merge_request, source_project: project, target_project: project) }
let(:user) { create(:user) }
@@ -15,8 +17,7 @@ describe 'User edits a merge request', :js do
it 'changes the target branch' do
expect(page).to have_content('Target branch')
- first('.target_branch').click
- select('merge-test', from: 'merge_request_target_branch', visible: false)
+ select2('merge-test', from: '#merge_request_target_branch')
click_button('Save changes')
expect(page).to have_content("Request to merge #{merge_request.source_branch} into merge-test")