diff options
| author | blackst0ne <blackst0ne.ru@gmail.com> | 2018-10-26 11:09:48 +1100 |
|---|---|---|
| committer | blackst0ne <blackst0ne.ru@gmail.com> | 2018-10-26 11:09:48 +1100 |
| commit | e40f8f27a1ad56d55b321a2891675bd85c440147 (patch) | |
| tree | 469d12cef7f7a82b1d8a9ca78cbabf0af1e84392 /spec/features/merge_requests | |
| parent | e211ef4e9d3a1d1b44872b600d694afc38d4d820 (diff) | |
| download | gitlab-ce-e40f8f27a1ad56d55b321a2891675bd85c440147.tar.gz | |
Update other links
Diffstat (limited to 'spec/features/merge_requests')
| -rw-r--r-- | spec/features/merge_requests/user_squashes_merge_request_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/features/merge_requests/user_squashes_merge_request_spec.rb b/spec/features/merge_requests/user_squashes_merge_request_spec.rb index ec1153b7f7f..8ecdec491b8 100644 --- a/spec/features/merge_requests/user_squashes_merge_request_spec.rb +++ b/spec/features/merge_requests/user_squashes_merge_request_spec.rb @@ -65,7 +65,7 @@ describe 'User squashes a merge request', :js do context 'when squash is enabled on merge request creation' do before do - visit project_new_merge_request_path(project, merge_request: { target_branch: 'master', source_branch: source_branch }) + visit project_new_merge_request_path(project, merge_request_source_branch: source_branch, merge_request: { target_branch: 'master' }) check 'merge_request[squash]' click_on 'Submit merge request' wait_for_requests @@ -95,7 +95,7 @@ describe 'User squashes a merge request', :js do context 'when squash is not enabled on merge request creation' do before do - visit project_new_merge_request_path(project, merge_request: { target_branch: 'master', source_branch: source_branch }) + visit project_new_merge_request_path(project, merge_request_source_branch: source_branch, merge_request: { target_branch: 'master' }) click_on 'Submit merge request' wait_for_requests end |