diff options
| author | Douwe Maan <douwe@selenight.nl> | 2017-06-14 01:12:31 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2017-06-29 02:17:44 +0300 |
| commit | 70b05a83772abc59b3c914c84bc4d2c07749884d (patch) | |
| tree | 44dfcd05aa111d36e5db08777611856a7c5eb99a /spec/features/projects/merge_request_button_spec.rb | |
| parent | 92f87f6d8bdd4424334131132394df343c006a63 (diff) | |
Split up MergeRequestsController
Diffstat (limited to 'spec/features/projects/merge_request_button_spec.rb')
| -rw-r--r-- | spec/features/projects/merge_request_button_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/features/projects/merge_request_button_spec.rb b/spec/features/projects/merge_request_button_spec.rb index 6de8855016d..58054bbbbed 100644 --- a/spec/features/projects/merge_request_button_spec.rb +++ b/spec/features/projects/merge_request_button_spec.rb @@ -23,7 +23,7 @@ feature 'Merge Request button', feature: true do end it 'shows Create merge request button' do - href = new_namespace_project_merge_request_path(project.namespace, + href = namespace_project_new_merge_request_path(project.namespace, project, merge_request: { source_branch: 'feature', target_branch: 'master' }) @@ -67,7 +67,7 @@ feature 'Merge Request button', feature: true do let(:user) { forked_project.owner } it 'shows Create merge request button' do - href = new_namespace_project_merge_request_path(forked_project.namespace, + href = namespace_project_new_merge_request_path(forked_project.namespace, forked_project, merge_request: { source_branch: 'feature', target_branch: 'master' }) |