3 files changed, 40 insertions, 0 deletions
diff --git a/test/fixtures/files/testfile.md b/test/fixtures/files/testfile.md
new file mode 100644
index 000000000..3606a410e
--- /dev/null
+++ b/test/fixtures/files/testfile.md
@@ -0,0 +1,3 @@
+# Header 1
+## Header 2
+### Header 3
diff --git a/test/fixtures/files/testfile.textile b/test/fixtures/files/testfile.textile
new file mode 100644
index 000000000..6339de56b
--- /dev/null
+++ b/test/fixtures/files/testfile.textile
@@ -0,0 +1,5 @@
+h1. Header 1
+
+h2. Header 2
+
+h3. Header 3
diff --git a/test/functional/attachments_controller_test.rb b/test/functional/attachments_controller_test.rb
index ff2838931..b9fad5ec2 100644
--- a/test/functional/attachments_controller_test.rb
+++ b/test/functional/attachments_controller_test.rb
@@ -205,6 +205,38 @@ class AttachmentsControllerTest < Redmine::ControllerTest
     end
   end
 
+  def test_show_text_file_formated_markdown
+    set_tmp_attachments_directory
+    a = Attachment.new(:container => Issue.find(1),
+                       :file => uploaded_test_file('testfile.md', 'text/plain'),
+                       :author => User.find(1))
+    assert a.save
+    assert_equal 'testfile.md', a.filename
+
+    get :show, :params => {
+        :id => a.id
+      }
+    assert_response :success
+    assert_equal 'text/html', @response.content_type
+    assert_select 'div.wiki', :html => "<h1>Header 1</h1>\n\n<h2>Header 2</h2>\n\n<h3>Header 3</h3>"
+  end
+
+  def test_show_text_file_fromated_textile
+    set_tmp_attachments_directory
+    a = Attachment.new(:container => Issue.find(1),
+                       :file => uploaded_test_file('testfile.textile', 'text/plain'),
+                       :author => User.find(1))
+    assert a.save
+    assert_equal 'testfile.textile', a.filename
+
+    get :show, :params => {
+        :id => a.id
+      }
+    assert_response :success
+    assert_equal 'text/html', @response.content_type
+    assert_select 'div.wiki', :html => "<h1>Header 1</h1>\n\n\n\t<h2>Header 2</h2>\n\n\n\t<h3>Header 3</h3>"
+  end
+
   def test_show_image
     @request.session[:user_id] = 2
     get :show, :params => {