1. by bumping version of dependend jsdom to 0.2.19 fixed problems wit…

…h using juice with node 9.3 (used node-gyp instead node-waf) 2. fixed problems with inproper construction of test/cases - in .html/.out files was invalid html documents, jsdom automaticly fix them by wrapping using <html><body></body></html> tags, so all test/cases/* were wrong 3. added new test/cases/empty* test to ensure that juice is shy and tidy and conserve unstyled tags and empty documents.
Automattic · Nov 25, 2012 · 0ccd3fc · 0ccd3fc
1 parent 91c2407
commit 0ccd3fc
Show file tree

Hide file tree

Showing 29 changed files with 59 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,2 @@
 node_modules
+*~
diff --git a/lib/juice.js b/lib/juice.js
@@ -121,7 +121,7 @@ function juice (html, css, options) {
   });
 
   var inner = document.innerHTML;
-
+  
   // free the associated memory
   // with lazily created parentWindow
   document.parentWindow.close();

diff --git a/package.json b/package.json
@@ -1,14 +1,15 @@
 {
     "name": "juice"
-  , "version": "0.0.6"
+  , "version": "0.0.7"
   , "description": "Inlines css into html source"
   , "contributors": [
         { "name": "Guillermo Rauch", "email": "guillermo@learnboost.com" }
       , { "name": "Arian Stolwijk", "email": "arian@aryweb.nl" }
+      , { "name": "Paweł Marzec", "email": "rork@cojestgrane.pl" }
     ]
   , "dependencies": {
         "cssom": "0.2.3"
-      , "jsdom": "0.2.15"
+      , "jsdom": "0.2.19"
       , "mootools-slick-parser": "1.3.2"
     }
   , "devDependencies": {

diff --git a/test/cases/cascading.html b/test/cases/cascading.html
@@ -1,3 +1,4 @@
+<html><body>
 <ul>
   <li>
     <ul>
@@ -9,3 +10,4 @@
     </ul>
   </li>
 </ul>
+</body></html>
diff --git a/test/cases/cascading.out b/test/cases/cascading.out
@@ -1,3 +1,4 @@
+<html><body>
 <ul>
   <li style="display: block; color: #f00;">
     <ul>
@@ -9,3 +10,4 @@
     </ul>
   </li>
 </ul>
+</body></html>
diff --git a/test/cases/class+id.html b/test/cases/class+id.html
@@ -1 +1,3 @@
+<html><body>
 <p id="test" class="woot">Woot</p>
+</body></html>
diff --git a/test/cases/class+id.out b/test/cases/class+id.out
@@ -1 +1,3 @@
+<html><body>
 <p id="test" class="woot" style="border: 1px solid #f00; display: inline-block;">Woot</p>
+</body></html>
diff --git a/test/cases/class.html b/test/cases/class.html
@@ -1,2 +1,5 @@
+<html><body>
 <div class="woot">Test</div>
 <div class="woot">Test</div>
+</body></html>
+
diff --git a/test/cases/class.out b/test/cases/class.out
@@ -1,2 +1,4 @@
+<html><body>
 <div class="woot" style="overflow: hidden;">Test</div>
 <div class="woot" style="overflow: hidden;">Test</div>
+</body></html>
diff --git a/test/cases/css-quotes.html b/test/cases/css-quotes.html
@@ -1 +1,3 @@
+<html><body>
 <p>woot</p>
+</body></html>
diff --git a/test/cases/css-quotes.out b/test/cases/css-quotes.out
@@ -1 +1,3 @@
+<html><body>
 <p style="background: url(/woot);">woot</p>
+</body></html>
diff --git a/test/cases/direct-descendents.html b/test/cases/direct-descendents.html
@@ -1 +1,3 @@
+<html><body>
 <p><em><em>woot</em></em></p>
+</body></html>
diff --git a/test/cases/direct-descendents.out b/test/cases/direct-descendents.out
@@ -1 +1,3 @@
+<html><body>
 <p><em style="background: blue; color: red;"><em style="background: blue;">woot</em></em></p>
+</body></html>
diff --git a/test/cases/id.html b/test/cases/id.html
@@ -1 +1,3 @@
+<html><body>
 <div id="test">woot</div>
+</body></html>
diff --git a/test/cases/id.out b/test/cases/id.out
@@ -1 +1,3 @@
+<html><body>
 <div id="test" style="display: none;">woot</div>
+</body></html>
diff --git a/test/cases/ignore-pseudos.html b/test/cases/ignore-pseudos.html
@@ -1 +1,3 @@
+<html><body>
 <a href="#">Test</a>
+</body></html>
diff --git a/test/cases/ignore-pseudos.out b/test/cases/ignore-pseudos.out
@@ -1 +1,3 @@
+<html><body>
 <a href="#" style="text-decoration: underline;">Test</a>
+</body></html>
diff --git a/test/cases/important.html b/test/cases/important.html
@@ -1 +1,3 @@
+<html><body>
 <a id="a" style="color: blue; background: green;">woot</a>
+</body></html>
diff --git a/test/cases/important.out b/test/cases/important.out
@@ -1 +1,3 @@
+<html><body>
 <a id="a" style="color: red; background: blue; border-style: dashed;">woot</a>
+</body></html>
diff --git a/test/cases/preserve-events.html b/test/cases/preserve-events.html
@@ -1,2 +1,4 @@
+<html><body>
 <a href="#" onclick="return false;">Google</a>
 <p onclick="return false;">Google</p>
+</body></html>
diff --git a/test/cases/preserve-events.out b/test/cases/preserve-events.out
@@ -1,2 +1,4 @@
+<html><body>
 <a href="#" onclick="return false;">Google</a>
 <p onclick="return false;" style="color: red;">Google</p>
+</body></html>
diff --git a/test/cases/regression-selector-newline.html b/test/cases/regression-selector-newline.html
@@ -1,2 +1,4 @@
+<html><body>
 <a href="#">Test</a>
 <p>Test</p>
+</body></html>
diff --git a/test/cases/regression-selector-newline.out b/test/cases/regression-selector-newline.out
@@ -1,2 +1,4 @@
+<html><body>
 <a href="#" style="color: red;">Test</a>
 <p style="color: red;">Test</p>
+</body></html>
diff --git a/test/cases/specificity.html b/test/cases/specificity.html
@@ -1,5 +1,7 @@
+<html><body>
 <div id="wrap" a="b">
   <div class="wrap" id="wrap-2">
     <div id="a"></div>
   </div>
 </div>
+</body></html>
diff --git a/test/cases/specificity.out b/test/cases/specificity.out
@@ -1,5 +1,7 @@
+<html><body>
 <div id="wrap" a="b">
   <div class="wrap" id="wrap-2" style="display: inline-block;">
     <div id="a" style="color: red; display: block; background: green; border-color: green;"></div>
   </div>
 </div>
+</body></html>
diff --git a/test/cases/style-preservation.html b/test/cases/style-preservation.html
@@ -1 +1,3 @@
+<html><body>
 <p style="color: red;">The color should stay intact</p>
+</body></html>
diff --git a/test/cases/style-preservation.out b/test/cases/style-preservation.out
@@ -1 +1,4 @@
+<html><body>
 <p style="color: red; background: blue;">The color should stay intact</p>
+</body></html>
+
diff --git a/test/cases/tag.html b/test/cases/tag.html
@@ -1 +1,3 @@
+<html><body>
 <p>Test</p>
+</body></html>
diff --git a/test/cases/tag.out b/test/cases/tag.out
@@ -1 +1,3 @@
+<html><body>
 <p style="border: 1px solid #f00; margin: 1px;">Test</p>
+</body></html>