More sane & clear tests for Markout output

karmi · Jul 3, 2009 · 69e7a43 · 69e7a43
1 parent 98f1f42
commit 69e7a43
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 9 deletions.
diff --git a/test/fixtures/markdown.html b/test/fixtures/markdown.html
@@ -65,7 +65,7 @@
 h1, h2, h3, h4, h5, h6 {
   color: #222;
 }
-h1, h2 {
+h1, h2, h3, h4 {
   color: #172533;
   font-weight: normal;
 }
@@ -87,8 +87,7 @@
 
 h3 {
   color: #172533;
-  font-size: 1.1em;
-  font-weight:bold;
+  font-size: 1.3em;
   letter-spacing:-1px;
   padding: 1em 0 0 0;
   margin: 1.8em 0 0.25em 0;
@@ -99,6 +98,14 @@
   text-decoration:underline;
 }
 
+h4 {
+  font-size: 1.15em;
+  letter-spacing:-1px;
+  padding: 0.5em 0 0 0;
+  margin: 1em 0 0.25em 0;
+  border-top: 1px solid #e0e6ee;
+}
+
 p {
   margin: 0 0 0.8em 0;
 }
@@ -165,10 +172,12 @@
 }
 
 #history .revision h4 {
+  font-size: 95%;
   margin: 0;
   padding: 0 0 0 0.7em;
 }
 #history .revision.expanded h4 {
+  font-size: 100%;
 }
 
 #history .revision .detail {

diff --git a/test/fixtures/markdown.txt b/test/fixtures/markdown.txt
@@ -232,4 +232,4 @@ also deserve thanks for their feedback.
   [Michel Fortin]:		http://www.michelf.com/projects/php-markdown/
   [html2text]:          http://www.aaronsw.com/2002/html2text/
 
-  [tfmenu]: mt_textformat_menu.png
+  [tfmenu]: mt_textformat_menu.png
diff --git a/test/markout_output_test.rb b/test/markout_output_test.rb
@@ -1,9 +1,14 @@
 require File.join(File.dirname(__FILE__), 'test_helper')
 require 'markout/output'
+require 'tempfile'
 
 module Markout
   class OutputTest < Test::Unit::TestCase
 
+    def setup
+      default_output
+    end
+
     def test_default_initialization
       assert_nothing_raised { default_output }
       assert_not_nil @output.document
@@ -13,13 +18,15 @@ def test_default_initialization
     end
 
     def test_export
-      default_output
-      assert_equal fixture('markdown.html'), @output.export, "Exported text does not match output"
+      tmpfile = Tempfile.new('markout_test.html')
+      tmpfile.puts @output.export
+      tmpfile.close
+      # Hats down to @kubicek for the "let's diff huge chunks of text in tests!" idea!!!
+      diff = `diff -u #{File.expand_path(File.dirname(__FILE__))}/fixtures/markdown.html #{tmpfile.path}`
+      assert diff.chomp == '', "Fixture HTML does not match Markout output, see diff below:\n" + diff
     end
 
-    def test_export_to_file
-      # TODO
-    end
+    private
 
     def default_output
       @output = Output.new( fixture_file('markdown.txt'), :history => false )