summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2011-06-01 06:10:37 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2011-06-01 06:10:37 +0000
commit28f3d9a8710e8cb6a6b46fe138efc8af52f8b5f3 (patch)
tree6811bf5018dadce505b5c03ba3f48e9f89aab126
parent6bcdd2a097b24f7f43480908b522fedb9f232d51 (diff)
downloadredmine-28f3d9a8710e8cb6a6b46fe138efc8af52f8b5f3.tar.gz
redmine-28f3d9a8710e8cb6a6b46fe138efc8af52f8b5f3.zip
scm: cvs: run both of "inline" and "side by side" diff in functional test_diff test.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5977 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--test/functional/repositories_cvs_controller_test.rb16
1 files changed, 9 insertions, 7 deletions
diff --git a/test/functional/repositories_cvs_controller_test.rb b/test/functional/repositories_cvs_controller_test.rb
index 715c4ea18..e8eff306f 100644
--- a/test/functional/repositories_cvs_controller_test.rb
+++ b/test/functional/repositories_cvs_controller_test.rb
@@ -143,13 +143,15 @@ class RepositoriesCvsControllerTest < ActionController::TestCase
def test_diff
@repository.fetch_changesets
@repository.reload
- get :diff, :id => PRJ_ID, :rev => 3, :type => 'inline'
- assert_response :success
- assert_template 'diff'
- assert_tag :tag => 'td', :attributes => { :class => 'line-code diff_out' },
- :content => /before_filter :require_login/
- assert_tag :tag => 'td', :attributes => { :class => 'line-code diff_in' },
- :content => /with one change/
+ ['inline', 'sbs'].each do |dt|
+ get :diff, :id => PRJ_ID, :rev => 3, :type => dt
+ assert_response :success
+ assert_template 'diff'
+ assert_tag :tag => 'td', :attributes => { :class => 'line-code diff_out' },
+ :content => /before_filter :require_login/
+ assert_tag :tag => 'td', :attributes => { :class => 'line-code diff_in' },
+ :content => /with one change/
+ end
end
def test_diff_new_files