From fb9de8cbf609e929ec263c4f2e9293c8b00d7b36 Mon Sep 17 00:00:00 2001
From: Matthew Iversen <teh.ivo@gmail.com>
Date: Thu, 5 Dec 2013 12:20:11 +1100
Subject: [PATCH] Fix tests to expect maruku 0.7 output

---
 features/markdown.feature           | 8 ++++----
 features/site_configuration.feature | 8 ++++----
 test/test_excerpt.rb                | 2 +-
 test/test_post.rb                   | 2 +-
 test/test_tags.rb                   | 6 +++---
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/features/markdown.feature b/features/markdown.feature
index 7aedbe44..a3803233 100644
--- a/features/markdown.feature
+++ b/features/markdown.feature
@@ -13,8 +13,8 @@ Feature: Markdown
     When I run jekyll
     Then the _site directory should exist
     And I should see "Index" in "_site/index.html"
-    And I should see "<h1 id='my_title'>My Title</h1>" in "_site/2009/03/27/hackers.html"
-    And I should see "<h1 id='my_title'>My Title</h1>" in "_site/index.html"
+    And I should see "<h1 id=\"my_title\">My Title</h1>" in "_site/2009/03/27/hackers.html"
+    And I should see "<h1 id=\"my_title\">My Title</h1>" in "_site/index.html"
 
   Scenario: Markdown in pagination on index
     Given I have a configuration file with "paginate" set to "5"
@@ -26,5 +26,5 @@ Feature: Markdown
     When I run jekyll
     Then the _site directory should exist
     And I should see "Index" in "_site/index.html"
-    And I should see "<h1 id='my_title'>My Title</h1>" in "_site/index.html"
-    
\ No newline at end of file
+    And I should see "<h1 id=\"my_title\">My Title</h1>" in "_site/index.html"
+    
diff --git a/features/site_configuration.feature b/features/site_configuration.feature
index 4f807eae..4052315d 100644
--- a/features/site_configuration.feature
+++ b/features/site_configuration.feature
@@ -67,28 +67,28 @@ Feature: Site configuration
     And I have a configuration file with "markdown" set to "rdiscount"
     When I run jekyll
     Then the _site directory should exist
-    And I should see "<a href="http://google.com">Google</a>" in "_site/index.html"
+    And I should see "<a href=\"http://google.com\">Google</a>" in "_site/index.html"
 
   Scenario: Use Kramdown for markup
     Given I have an "index.markdown" page that contains "[Google](http://google.com)"
     And I have a configuration file with "markdown" set to "kramdown"
     When I run jekyll
     Then the _site directory should exist
-    And I should see "<a href="http://google.com">Google</a>" in "_site/index.html"
+    And I should see "<a href=\"http://google.com\">Google</a>" in "_site/index.html"
 
   Scenario: Use Redcarpet for markup
     Given I have an "index.markdown" page that contains "[Google](http://google.com)"
     And I have a configuration file with "markdown" set to "redcarpet"
     When I run jekyll
     Then the _site directory should exist
-    And I should see "<a href="http://google.com">Google</a>" in "_site/index.html"
+    And I should see "<a href=\"http://google.com\">Google</a>" in "_site/index.html"
 
   Scenario: Use Maruku for markup
     Given I have an "index.markdown" page that contains "[Google](http://google.com)"
     And I have a configuration file with "markdown" set to "maruku"
     When I run jekyll
     Then the _site directory should exist
-    And I should see "<a href='http://google.com'>Google</a>" in "_site/index.html"
+    And I should see "<a href=\"http://google.com\">Google</a>" in "_site/index.html"
 
   Scenario: Highlight code with pygments
     Given I have an "index.html" file that contains "{% highlight ruby %} puts 'Hello world!' {% endhighlight %}"
diff --git a/test/test_excerpt.rb b/test/test_excerpt.rb
index 234d51ba..410e9e75 100644
--- a/test/test_excerpt.rb
+++ b/test/test_excerpt.rb
@@ -66,7 +66,7 @@ class TestExcerpt < Test::Unit::TestCase
         end
 
         should "be the first paragraph of the page" do
-          assert_equal "<p>First paragraph with <a href='http://www.jekyllrb.com/'>link ref</a>.</p>", @extracted_excerpt.content
+          assert_equal "<p>First paragraph with <a href=\"http://www.jekyllrb.com/\">link ref</a>.</p>", @extracted_excerpt.content
         end
 
         should "link properly" do
diff --git a/test/test_post.rb b/test/test_post.rb
index 57979c65..a61fc674 100644
--- a/test/test_post.rb
+++ b/test/test_post.rb
@@ -284,7 +284,7 @@ class TestPost < Test::Unit::TestCase
         end
 
         should "return rendered HTML" do
-          assert_equal "<p>First paragraph with <a href='http://www.jekyllrb.com/'>link ref</a>.</p>",
+          assert_equal "<p>First paragraph with <a href=\"http://www.jekyllrb.com/\">link ref</a>.</p>",
                        @post.excerpt
         end
 
diff --git a/test/test_tags.rb b/test/test_tags.rb
index 07547900..0368c6db 100644
--- a/test/test_tags.rb
+++ b/test/test_tags.rb
@@ -252,7 +252,7 @@ CONTENT
       end
 
       should "write script tag" do
-        assert_match "<script src='https://gist.github.com/#{@gist}.js'>\s</script>", @result
+        assert_match "<script src='https://gist.github.com/#{@gist}.js'><![CDATA[\s]]></script>", @result
       end
     end
 
@@ -272,7 +272,7 @@ CONTENT
         end
 
         should "write script tag with specific file in gist" do
-          assert_match "<script src='https://gist.github.com/#{@gist}.js?file=#{@filename}'>\s</script>", @result
+          assert_match "<script src='https://gist.github.com/#{@gist}.js?file=#{@filename}'><![CDATA[\s]]></script>", @result
         end
       end
 
@@ -308,7 +308,7 @@ CONTENT
       end
 
       should "write script tag with specific file in gist" do
-        assert_match "<script src='https://gist.github.com/#{@gist}.js?file=#{@filename}'>\s</script>", @result
+        assert_match "<script src='https://gist.github.com/#{@gist}.js?file=#{@filename}'><![CDATA[\s]]></script>", @result
       end
     end