diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2018-09-26 07:27:30 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2018-09-26 07:27:30 +0000 |
| commit | b9fa262165601a3b348d22ca1d8da53bda99e55b (patch) | |
| tree | 21bd632e051addfee01ab7a568b01f5b6428051a /test/integration | |
| parent | c171797673f549e434dd6b94f7262fd31a77b533 (diff) | |
| download | redmine-b9fa262165601a3b348d22ca1d8da53bda99e55b.tar.gz redmine-b9fa262165601a3b348d22ca1d8da53bda99e55b.zip | |
Adds preview option to the wiki toolbar (#27758).
Patch by Marius BALTEANU.
git-svn-id: http://svn.redmine.org/redmine/trunk@17521 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'test/integration')
| -rw-r--r-- | test/integration/attachments_test.rb | 5 | ||||
| -rw-r--r-- | test/integration/layout_test.rb | 2 | ||||
| -rw-r--r-- | test/integration/routing/previews_test.rb | 14 |
3 files changed, 11 insertions, 10 deletions
diff --git a/test/integration/attachments_test.rb b/test/integration/attachments_test.rb index 6fd58ed5f..0b3bf1862 100644 --- a/test/integration/attachments_test.rb +++ b/test/integration/attachments_test.rb @@ -77,8 +77,9 @@ class AttachmentsTest < Redmine::IntegrationTest token = ajax_upload('myupload.jpg', 'JPEG content') - post '/issues/preview/new/ecookbook', :params => { - :issue => {:tracker_id => 1, :description => 'Inline upload: !myupload.jpg!'}, + post '/issues/preview', :params => { + :issue => {:tracker_id => 1, :project_id => 'ecookbook'}, + :text => 'Inline upload: !myupload.jpg!', :attachments => {'1' => {:filename => 'myupload.jpg', :description => 'My uploaded file', :token => token}} } assert_response :success diff --git a/test/integration/layout_test.rb b/test/integration/layout_test.rb index a52943254..08e7214ce 100644 --- a/test/integration/layout_test.rb +++ b/test/integration/layout_test.rb @@ -63,7 +63,7 @@ class LayoutTest < Redmine::IntegrationTest Role.anonymous.add_permission! :add_issues get '/projects/ecookbook/issues/new' - assert_select 'head script[src^=?]', '/javascripts/jstoolbar/jstoolbar-textile.min.js?' + assert_select 'head script[src^=?]', '/javascripts/jstoolbar/jstoolbar.js?' end def test_calendar_header_tags diff --git a/test/integration/routing/previews_test.rb b/test/integration/routing/previews_test.rb index c6a78758d..c5b4eeaee 100644 --- a/test/integration/routing/previews_test.rb +++ b/test/integration/routing/previews_test.rb @@ -19,14 +19,14 @@ require File.expand_path('../../../test_helper', __FILE__) class RoutingPreviewsTest < Redmine::RoutingTest def test_previews - should_route 'GET /issues/preview/new/foo' => 'previews#issue', :project_id => 'foo' - should_route 'PUT /issues/preview/new/foo' => 'previews#issue', :project_id => 'foo' - should_route 'POST /issues/preview/new/foo' => 'previews#issue', :project_id => 'foo' - - should_route 'GET /issues/preview/edit/321' => 'previews#issue', :id => '321' - should_route 'PUT /issues/preview/edit/321' => 'previews#issue', :id => '321' - should_route 'POST /issues/preview/edit/321' => 'previews#issue', :id => '321' + should_route 'GET /issues/preview' => 'previews#issue' + should_route 'PUT /issues/preview' => 'previews#issue' + should_route 'POST /issues/preview' => 'previews#issue' should_route 'GET /news/preview' => 'previews#news' + + should_route 'GET /preview/text' => 'previews#text' + should_route 'PUT /preview/text' => 'previews#text' + should_route 'POST /preview/text' => 'previews#text' end end |