diff options
author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-04-25 17:17:49 +0000 |
---|---|---|
committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-04-25 17:17:49 +0000 |
commit | 5e57a1a9d9478162ac4f27ae96b2ccaf55a1aba7 (patch) | |
tree | 93e57765139714bd82dede475725516c448c0d55 /test/functional/wiki_controller_test.rb | |
parent | 34e20c4373b7f5a20ab3a132feae3f70f21ec477 (diff) | |
download | redmine-5e57a1a9d9478162ac4f27ae96b2ccaf55a1aba7.tar.gz redmine-5e57a1a9d9478162ac4f27ae96b2ccaf55a1aba7.zip |
Merged rails-3.2 branch.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9528 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'test/functional/wiki_controller_test.rb')
-rw-r--r-- | test/functional/wiki_controller_test.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/functional/wiki_controller_test.rb b/test/functional/wiki_controller_test.rb index 54a3f650d..ce0c8480f 100644 --- a/test/functional/wiki_controller_test.rb +++ b/test/functional/wiki_controller_test.rb @@ -198,7 +198,7 @@ class WikiControllerTest < ActionController::TestCase assert_tag 'textarea', :attributes => { :name => 'content[text]' }, - :content => WikiPage.find_by_title('Another_page').content.text + :content => "\n"+WikiPage.find_by_title('Another_page').content.text end def test_edit_section @@ -213,7 +213,7 @@ class WikiControllerTest < ActionController::TestCase assert_tag 'textarea', :attributes => { :name => 'content[text]' }, - :content => section + :content => "\n"+section assert_tag 'input', :attributes => { :name => 'section', :type => 'hidden', :value => '2' } assert_tag 'input', @@ -294,7 +294,7 @@ class WikiControllerTest < ActionController::TestCase assert_template 'edit' assert_error_tag :descendant => {:content => /Comment is too long/} - assert_tag :tag => 'textarea', :attributes => {:id => 'content_text'}, :content => 'edited' + assert_tag :tag => 'textarea', :attributes => {:id => 'content_text'}, :content => "\nedited" assert_tag :tag => 'input', :attributes => {:id => 'content_version', :value => '1'} end |