prefer redcarpet over rdiscount

alexch · Aug 9, 2011 · ebf4883 · ebf4883
1 parent 8c94d07
commit ebf4883
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/lib/tilt.rb b/lib/tilt.rb
@@ -172,8 +172,8 @@ def clear
   register MarukuTemplate,    'markdown', 'mkd', 'md'
   register KramdownTemplate,  'markdown', 'mkd', 'md'
   register BlueClothTemplate, 'markdown', 'mkd', 'md'
-  register RedcarpetTemplate, 'markdown', 'mkd', 'md'
   register RDiscountTemplate, 'markdown', 'mkd', 'md'
+  register RedcarpetTemplate, 'markdown', 'mkd', 'md'
 
   require 'tilt/textile'
   register RedClothTemplate, 'textile'

diff --git a/test/tilt_redcarpettemplate_test.rb b/test/tilt_redcarpettemplate_test.rb
@@ -21,9 +21,19 @@ class RedcarpetTemplateTest < Test::Unit::TestCase
       %w[md mkd markdown].each do |ext|
         mappings = Tilt.mappings[ext]
         blue_idx = mappings.index(Tilt::BlueClothTemplate)
-        rdis_idx = mappings.index(Tilt::RedcarpetTemplate)
-        assert rdis_idx < blue_idx,
-          "#{rdis_idx} should be lower than #{blue_idx}"
+        redc_idx = mappings.index(Tilt::RedcarpetTemplate)
+        assert redc_idx < blue_idx,
+          "#{redc_idx} should be lower than #{blue_idx}"
+      end
+    end
+
+    test "registered above RDiscount" do
+      %w[md mkd markdown].each do |ext|
+        mappings = Tilt.mappings[ext]
+        rdis_idx = mappings.index(Tilt::RDiscountTemplate)
+        redc_idx = mappings.index(Tilt::RedcarpetTemplate)
+        assert redc_idx < rdis_idx,
+          "#{redc_idx} should be lower than #{rdis_idx}"
       end
     end