summaryrefslogtreecommitdiffstats
path: root/test/functional/repositories_git_controller_test.rb
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2011-06-01 04:15:45 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2011-06-01 04:15:45 +0000
commitab75fb1c82897214c4cae41e571323dc4ae7a4d6 (patch)
tree69b60ea11a986d86266aed0bf5587bbec600c08d /test/functional/repositories_git_controller_test.rb
parente9d7e3133265a6c7d0e77ce89d52c99e99bee7b1 (diff)
downloadredmine-ab75fb1c82897214c4cae41e571323dc4ae7a4d6.tar.gz
redmine-ab75fb1c82897214c4cae41e571323dc4ae7a4d6.zip
scm: git: run both "inline" and "side by side" diff in functional test_diff test.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5972 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'test/functional/repositories_git_controller_test.rb')
-rw-r--r--test/functional/repositories_git_controller_test.rb25
1 files changed, 15 insertions, 10 deletions
diff --git a/test/functional/repositories_git_controller_test.rb b/test/functional/repositories_git_controller_test.rb
index 06af9cd47..38675af60 100644
--- a/test/functional/repositories_git_controller_test.rb
+++ b/test/functional/repositories_git_controller_test.rb
@@ -192,16 +192,21 @@ class RepositoriesGitControllerTest < ActionController::TestCase
@repository.fetch_changesets
@repository.reload
# Full diff of changeset 2f9c0091
- get :diff, :id => PRJ_ID, :rev => '2f9c0091c754a91af7a9c478e36556b4bde8dcf7'
- assert_response :success
- assert_template 'diff'
- # Line 22 removed
- assert_tag :tag => 'th',
- :content => /22/,
- :sibling => { :tag => 'td',
- :attributes => { :class => /diff_out/ },
- :content => /def remove/ }
- assert_tag :tag => 'h2', :content => /2f9c0091/
+ ['inline', 'sbs'].each do |dt|
+ get :diff,
+ :id => PRJ_ID,
+ :rev => '2f9c0091c754a91af7a9c478e36556b4bde8dcf7',
+ :type => dt
+ assert_response :success
+ assert_template 'diff'
+ # Line 22 removed
+ assert_tag :tag => 'th',
+ :content => /22/,
+ :sibling => { :tag => 'td',
+ :attributes => { :class => /diff_out/ },
+ :content => /def remove/ }
+ assert_tag :tag => 'h2', :content => /2f9c0091/
+ end
end
def test_diff_two_revs