From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Sun, 20 Nov 2011 06:13:48 +0000 (+0000)
Subject: attachment: update functional tests to switch "side by side" and "inline" for patches... 
X-Git-Tag: 1.3.0~151
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=00f9581380ea35c4e2e29fab61b84e7fd39a2d97;p=redmine.git

attachment: update functional tests to switch "side by side" and "inline" for patches (#9612)

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

diff --git a/test/functional/attachments_controller_test.rb b/test/functional/attachments_controller_test.rb
index f6ed040b5..5855bf638 100644
--- a/test/functional/attachments_controller_test.rb
+++ b/test/functional/attachments_controller_test.rb
@@ -37,31 +37,35 @@ class AttachmentsControllerTest < ActionController::TestCase
   end
 
   def test_show_diff
-    get :show, :id => 14 # 060719210727_changeset_utf8.diff
-    assert_response :success
-    assert_template 'diff'
-    assert_equal 'text/html', @response.content_type
-
-    assert_tag 'th',
-      :attributes => {:class => /filename/},
-      :content => /issues_controller.rb\t\(révision 1484\)/
-    assert_tag 'td',
-      :attributes => {:class => /line-code/},
-      :content => /Demande créée avec succès/
+    ['inline', 'sbs'].each do |dt|
+    # 060719210727_changeset_utf8.diff
+      get :show, :id => 14, :type => dt
+      assert_response :success
+      assert_template 'diff'
+      assert_equal 'text/html', @response.content_type
+      assert_tag 'th',
+        :attributes => {:class => /filename/},
+        :content => /issues_controller.rb\t\(révision 1484\)/
+      assert_tag 'td',
+        :attributes => {:class => /line-code/},
+        :content => /Demande créée avec succès/
+    end
   end
 
   def test_show_diff_should_strip_non_utf8_content
-    get :show, :id => 5 # 060719210727_changeset_iso8859-1.diff
-    assert_response :success
-    assert_template 'diff'
-    assert_equal 'text/html', @response.content_type
-
-    assert_tag 'th',
-      :attributes => {:class => /filename/},
-      :content => /issues_controller.rb\t\(rvision 1484\)/
-    assert_tag 'td',
-      :attributes => {:class => /line-code/},
-      :content => /Demande cre avec succs/
+    ['inline', 'sbs'].each do |dt|
+      # 060719210727_changeset_iso8859-1.diff
+      get :show, :id => 5, :type => dt
+      assert_response :success
+      assert_template 'diff'
+      assert_equal 'text/html', @response.content_type
+      assert_tag 'th',
+        :attributes => {:class => /filename/},
+        :content => /issues_controller.rb\t\(rvision 1484\)/
+      assert_tag 'td',
+        :attributes => {:class => /line-code/},
+        :content => /Demande cre avec succs/
+    end
   end
 
   def test_show_text_file