From 6529035ee128c9b995a7a85d347f20ed1412f3ab Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Tue, 26 Jun 2012 16:57:09 +0000 Subject: Fixed that wiki diff may produce html (#11209). git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9895 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- test/functional/wiki_controller_test.rb | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'test') diff --git a/test/functional/wiki_controller_test.rb b/test/functional/wiki_controller_test.rb index b87a26aee..f4e82d7d0 100644 --- a/test/functional/wiki_controller_test.rb +++ b/test/functional/wiki_controller_test.rb @@ -495,11 +495,19 @@ class WikiControllerTest < ActionController::TestCase end def test_diff - get :diff, :project_id => 1, :id => 'CookBook_documentation', :version => 2, :version_from => 1 + content = WikiPage.find(1).content + assert_difference 'WikiContent::Version.count', 2 do + content.text = "Line removed\nThis is a sample text for testing diffs" + content.save! + content.text = "This is a sample text for testing diffs\nLine added" + content.save! + end + + get :diff, :project_id => 1, :id => 'CookBook_documentation', :version => content.version, :version_from => (content.version - 1) assert_response :success assert_template 'diff' - assert_tag :tag => 'span', :attributes => { :class => 'diff_in'}, - :content => /updated/ + assert_select 'span.diff_out', :text => 'Line removed' + assert_select 'span.diff_in', :text => 'Line added' end def test_annotate -- cgit v1.2.3