diff options
| author | blackst0ne <blackst0ne.ru@gmail.com> | 2018-10-23 04:00:28 +0300 |
|---|---|---|
| committer | blackst0ne <blackst0ne.ru@gmail.com> | 2018-10-23 04:00:28 +0300 |
| commit | e211ef4e9d3a1d1b44872b600d694afc38d4d820 (patch) | |
| tree | a3b350275fcfb93f69b21fd6252b1a264fb187cc /spec/requests/api/internal_spec.rb | |
| parent | 4cf1845e7ea5d9a52fe5af49dd1644f98a921010 (diff) | |
Make new merge request URL more friendly when pushing code
Diffstat (limited to 'spec/requests/api/internal_spec.rb')
| -rw-r--r-- | spec/requests/api/internal_spec.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/requests/api/internal_spec.rb b/spec/requests/api/internal_spec.rb index e0b5b34f9c4..5fbcc8ec55d 100644 --- a/spec/requests/api/internal_spec.rb +++ b/spec/requests/api/internal_spec.rb @@ -665,7 +665,7 @@ describe API::Internal do expect(json_response).to match [{ "branch_name" => "new_branch", - "url" => "http://#{Gitlab.config.gitlab.host}/#{project.namespace.name}/#{project.path}/merge_requests/new?merge_request%5Bsource_branch%5D=new_branch", + "url" => "http://#{Gitlab.config.gitlab.host}/#{project.namespace.name}/#{project.path}/merge_requests/new/new_branch", "new_merge_request" => true }] end @@ -686,7 +686,7 @@ describe API::Internal do expect(json_response).to match [{ "branch_name" => "new_branch", - "url" => "http://#{Gitlab.config.gitlab.host}/#{project.namespace.name}/#{project.path}/merge_requests/new?merge_request%5Bsource_branch%5D=new_branch", + "url" => "http://#{Gitlab.config.gitlab.host}/#{project.namespace.name}/#{project.path}/merge_requests/new/new_branch", "new_merge_request" => true }] end @@ -819,7 +819,7 @@ describe API::Internal do expect(json_response['merge_request_urls']).to match [{ "branch_name" => "new_branch", - "url" => "http://#{Gitlab.config.gitlab.host}/#{project.namespace.name}/#{project.path}/merge_requests/new?merge_request%5Bsource_branch%5D=new_branch", + "url" => "http://#{Gitlab.config.gitlab.host}/#{project.namespace.name}/#{project.path}/merge_requests/new/new_branch", "new_merge_request" => true }] end |