summaryrefslogtreecommitdiffstats
path: root/test/functional/repositories_bazaar_controller_test.rb
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2011-06-01 06:11:28 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2011-06-01 06:11:28 +0000
commit958612451bfcb74093fc93d84d2d32becec9eb95 (patch)
tree39eec7eeea6c75e5708298c6c31fd9c3161eac2e /test/functional/repositories_bazaar_controller_test.rb
parentf58835f5ad141cb5265d16d00ac729a146e4af12 (diff)
downloadredmine-958612451bfcb74093fc93d84d2d32becec9eb95.tar.gz
redmine-958612451bfcb74093fc93d84d2d32becec9eb95.zip
scm: bazaar: 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@5979 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'test/functional/repositories_bazaar_controller_test.rb')
-rw-r--r--test/functional/repositories_bazaar_controller_test.rb20
1 files changed, 11 insertions, 9 deletions
diff --git a/test/functional/repositories_bazaar_controller_test.rb b/test/functional/repositories_bazaar_controller_test.rb
index 9b50e8999..fb9438c05 100644
--- a/test/functional/repositories_bazaar_controller_test.rb
+++ b/test/functional/repositories_bazaar_controller_test.rb
@@ -110,15 +110,17 @@ class RepositoriesBazaarControllerTest < ActionController::TestCase
def test_diff
# Full diff of changeset 3
- get :diff, :id => PRJ_ID, :rev => 3
- assert_response :success
- assert_template 'diff'
- # Line 11 removed
- assert_tag :tag => 'th',
- :content => /11/,
- :sibling => { :tag => 'td',
- :attributes => { :class => /diff_out/ },
- :content => /Display more information/ }
+ ['inline', 'sbs'].each do |dt|
+ get :diff, :id => PRJ_ID, :rev => 3, :type => dt
+ assert_response :success
+ assert_template 'diff'
+ # Line 11 removed
+ assert_tag :tag => 'th',
+ :content => '11',
+ :sibling => { :tag => 'td',
+ :attributes => { :class => /diff_out/ },
+ :content => /Display more information/ }
+ end
end
def test_annotate