summaryrefslogtreecommitdiff
path: root/spec/routing
diff options
context:
space:
mode:
authorsue445 <sue445@sue445.net>2014-04-18 00:13:31 +0900
committersue445 <sue445@sue445.net>2014-05-11 23:50:14 +0900
commita3d8be09c6c62e39301d82e47b710717ff68245f (patch)
treef93561c0908a8314ebf2fd802a87808c06761085 /spec/routing
parent4ba5acd23826831d5db52e66db5238a9030264a3 (diff)
downloadgitlab-ce-a3d8be09c6c62e39301d82e47b710717ff68245f.tar.gz
Fix can not automerge if description is too long
Diffstat (limited to 'spec/routing')
-rw-r--r--spec/routing/project_routing_spec.rb7
1 files changed, 5 insertions, 2 deletions
diff --git a/spec/routing/project_routing_spec.rb b/spec/routing/project_routing_spec.rb
index 97f7392e50a..fa9762625d7 100644
--- a/spec/routing/project_routing_spec.rb
+++ b/spec/routing/project_routing_spec.rb
@@ -213,7 +213,7 @@ describe Projects::RefsController, "routing" do
end
# diffs_project_merge_request GET /:project_id/merge_requests/:id/diffs(.:format) projects/merge_requests#diffs
-# automerge_project_merge_request GET /:project_id/merge_requests/:id/automerge(.:format) projects/merge_requests#automerge
+# automerge_project_merge_request POST /:project_id/merge_requests/:id/automerge(.:format) projects/merge_requests#automerge
# automerge_check_project_merge_request GET /:project_id/merge_requests/:id/automerge_check(.:format) projects/merge_requests#automerge_check
# branch_from_project_merge_requests GET /:project_id/merge_requests/branch_from(.:format) projects/merge_requests#branch_from
# branch_to_project_merge_requests GET /:project_id/merge_requests/branch_to(.:format) projects/merge_requests#branch_to
@@ -230,7 +230,10 @@ describe Projects::MergeRequestsController, "routing" do
end
it "to #automerge" do
- get("/gitlab/gitlabhq/merge_requests/1/automerge").should route_to('projects/merge_requests#automerge', project_id: 'gitlab/gitlabhq', id: '1')
+ post('/gitlab/gitlabhq/merge_requests/1/automerge').should route_to(
+ 'projects/merge_requests#automerge',
+ project_id: 'gitlab/gitlabhq', id: '1'
+ )
end
it "to #automerge_check" do