From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Wed, 1 Jun 2011 06:11:02 +0000 (+0000)
Subject: scm: cvs: run both of "inline" and "side by side" diff in functional test_diff_new_fi... 
X-Git-Tag: 1.3.0~1886
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=f58835f5ad141cb5265d16d00ac729a146e4af12;p=redmine.git

scm: cvs: run both of "inline" and "side by side" diff in functional test_diff_new_files test.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5978 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/test/functional/repositories_cvs_controller_test.rb b/test/functional/repositories_cvs_controller_test.rb
index e8eff306f..35f5ef669 100644
--- a/test/functional/repositories_cvs_controller_test.rb
+++ b/test/functional/repositories_cvs_controller_test.rb
@@ -157,19 +157,21 @@ class RepositoriesCvsControllerTest < ActionController::TestCase
     def test_diff_new_files
       @repository.fetch_changesets
       @repository.reload
-      get :diff, :id => PRJ_ID, :rev => 1, :type => 'inline'
-      assert_response :success
-      assert_template 'diff'
-      assert_tag :tag => 'td', :attributes => { :class => 'line-code diff_in' },
-                               :content => /watched.remove_watcher/
-      assert_tag :tag => 'th', :attributes => { :class => 'filename' },
-                               :content => /test\/README/
-      assert_tag :tag => 'th', :attributes => { :class => 'filename' },
-                               :content => /test\/images\/delete.png	/
-      assert_tag :tag => 'th', :attributes => { :class => 'filename' },
-                               :content => /test\/images\/edit.png/
-      assert_tag :tag => 'th', :attributes => { :class => 'filename' },
-                               :content => /test\/sources\/watchers_controller.rb/
+      ['inline', 'sbs'].each do |dt|
+        get :diff, :id => PRJ_ID, :rev => 1, :type => dt
+        assert_response :success
+        assert_template 'diff'
+        assert_tag :tag => 'td', :attributes => { :class => 'line-code diff_in' },
+                                 :content => /watched.remove_watcher/
+        assert_tag :tag => 'th', :attributes => { :class => 'filename' },
+                                 :content => /test\/README/
+        assert_tag :tag => 'th', :attributes => { :class => 'filename' },
+                                 :content => /test\/images\/delete.png	/
+        assert_tag :tag => 'th', :attributes => { :class => 'filename' },
+                                 :content => /test\/images\/edit.png/
+        assert_tag :tag => 'th', :attributes => { :class => 'filename' },
+                                 :content => /test\/sources\/watchers_controller.rb/
+      end
     end
 
     def test_annotate