summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dzaporozhets@gitlab.com>2015-02-06 17:55:30 +0000
committerDmitriy Zaporozhets <dzaporozhets@gitlab.com>2015-02-06 17:55:30 +0000
commit6b61c9049815cdcc2b22a572441adba0e3dc230d (patch)
tree304964ca0a4fd0b42691ef1f929ab905e27ed0a1 /spec
parent07715ce5d5eca8da99e942e80de42c268ab363bd (diff)
parent639c93b4f2bd492a214065b5fdc47da2f5d8614d (diff)
downloadgitlab-ce-6b61c9049815cdcc2b22a572441adba0e3dc230d.tar.gz
Merge branch 'markdown-preview-via-post' into 'master'
Don't have Markdown preview fail for long comments/wiki pages. See https://github.com/gitlabhq/gitlabhq/issues/8611. See merge request !1479
Diffstat (limited to 'spec')
-rw-r--r--spec/routing/project_routing_spec.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/routing/project_routing_spec.rb b/spec/routing/project_routing_spec.rb
index e36b266a1ff..b8f9d2bf20a 100644
--- a/spec/routing/project_routing_spec.rb
+++ b/spec/routing/project_routing_spec.rb
@@ -60,7 +60,7 @@ end
# project GET /:id(.:format) projects#show
# PUT /:id(.:format) projects#update
# DELETE /:id(.:format) projects#destroy
-# markdown_preview_project GET /:id/markdown_preview(.:format) projects#markdown_preview
+# markdown_preview_project POST /:id/markdown_preview(.:format) projects#markdown_preview
describe ProjectsController, 'routing' do
it 'to #create' do
post('/projects').should route_to('projects#create')
@@ -91,7 +91,7 @@ describe ProjectsController, 'routing' do
end
it 'to #markdown_preview' do
- get('/gitlab/gitlabhq/markdown_preview').should(
+ post('/gitlab/gitlabhq/markdown_preview').should(
route_to('projects#markdown_preview', id: 'gitlab/gitlabhq')
)
end