Make common_mark the default text formatting for new installations (#34863).

git-svn-id: https://svn.redmine.org/redmine/trunk@21897 e93f8b46-1217-0410-a6f0-8f06a7374b81

2 files changed, 6 insertions, 1 deletions

diff --git a/test/functional/attachments_controller_test.rb b/test/functional/attachments_controller_test.rb
index 43d7c35e0..71c54a774 100644
--- a/test/functional/attachments_controller_test.rb
+++ b/test/functional/attachments_controller_test.rb
@@ -219,7 +219,7 @@ class AttachmentsControllerTest < Redmine::ControllerTest
     get(:show, :params => {:id => a.id})
     assert_response :success
     assert_equal 'text/html', @response.media_type
-    assert_select 'div.wiki', :html => "<h1>Header 1</h1>\n\n<h2>Header 2</h2>\n\n<h3>Header 3</h3>"
+    assert_select 'div.wiki', :html => "<h1>Header 1</h1>\n<h2>Header 2</h2>\n<h3>Header 3</h3>"
   end
 
   def test_show_text_file_formatted_textile
diff --git a/test/unit/setting_test.rb b/test/unit/setting_test.rb
index f8d35a6a6..5d4986760 100644
--- a/test/unit/setting_test.rb
+++ b/test/unit/setting_test.rb
@@ -145,4 +145,9 @@ class SettingTest < ActiveSupport::TestCase
       end
     end
   end
+
+  def test_default_text_formatting_for_new_installations_is_common_mark
+    assert_equal 'common_mark', Setting.text_formatting
+    assert_equal 'common_mark', Setting.find_by(:name => 'text_formatting').value
+  end
 end