More tests 'n stuff

remy · remy · commit dcc11165f23e · 2014-07-17T13:18:03.000+01:00
diff --git a/lib/index.js b/lib/index.js
@@ -46,6 +46,10 @@
     var processors = bin.processors || {};
     var meta = bin.meta || (bin.url ? '<!-- source: http://jsbin.com/' + bin.url + '/' + (bin.revision || '') + ' -->\n' : '');
 
+    if (meta && meta.slice(-1) !== '\n') {
+      meta += '\n'; // a nice new line for the meta data
+    }
+
     /**
      * 1. strip the doctype and print it then add comment (<!-- file... etc)
      * 2. in remaining code:
@@ -117,13 +121,25 @@
 
     // If we have the raw panel content - go ahead and stick that in scripts at the bottom.
     if (source) {
+
+      if (source.css === css) {
+        delete source.css;
+      }
+      if (source.javascript === javascript) {
+        delete source.javascript;
+      }
+      if (source.html === html) {
+        delete source.html;
+      }
+
       var sourceScripts = ['html', 'css', 'javascript'].map(function (type) {
         if (source[type] === undefined) {
           return '';
         }
+
         var content = safeForHTML(source[type]);
         if (content) {
-          return '\n<script id="jsbin-source-' + type + '" type="text/' + (processors[type] || type) + '">\n' + content + '</script>';
+          return '\n<script id="jsbin-source-' + type + '" type="text/' + (processors[type] || type) + '">' + content + '</script>';
         }
       }).join('\n');
 
diff --git a/package.json b/package.json
@@ -24,6 +24,7 @@
   "homepage": "https://github.com/jsbin/bin-to-file",
   "devDependencies": {
     "mocha": "~1.20.1",
-    "w3cjs": "~0.1.25"
+    "w3cjs": "~0.1.25",
+    "cheerio": "~0.17.0"
   }
 }
diff --git a/test/empty.test.js b/test/empty.test.js
@@ -0,0 +1,20 @@
+'use strict';
+/*global describe, it, beforeEach */
+var assert = require('assert');
+var toFile = require('../');
+var fs = require('fs');
+var path = require('path');
+
+describe('empty bin', function () {
+  var html = '';
+
+  beforeEach(function () {
+    html = fs.readFileSync(path.join(__dirname, 'fixtures', 'simple.html'), 'utf8');
+  });
+
+  it('should insert JS at end when missing </body>', function () {
+    var file = toFile({ html: html, javascript: '', css: '' });
+
+    assert(file === html, 'output is exactly the same');
+  });
+});
diff --git a/test/fixtures/messedup.html b/test/fixtures/messedup.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+<body>
+  <style>body { font-family: "Helvetica", "Myriad Pro", sans-serif; } h1{font-size:3em} #readme{width:700px;margin:0 auto}</style>
+<meta charset=utf-8 />
+<title>JS Bin</t</head>
+<body>
+  <div id="readme">
+    <article class="markdown-body">
+      <h1>
+<a name="how-to-find-the-pin-url" class="anchor" href="#how-to-find-the-pin-url"><span class="mini-icon mini-icon-link"></span></a>How to find for the Pin URL</h1>
diff --git a/test/full.test.js b/test/full.test.js
@@ -0,0 +1,34 @@
+'use strict';
+/*global describe, it, beforeEach */
+var assert = require('assert');
+var toFile = require('../');
+var fs = require('fs');
+var path = require('path');
+var cheerio = require('cheerio');
+
+describe('full bin insert', function () {
+  var html = '';
+
+  beforeEach(function () {
+    html = fs.readFileSync(path.join(__dirname, 'fixtures', 'simple.html'), 'utf8');
+  });
+
+  it('should also store source panel content', function () {
+    // var html = fs.readFileSync(path.join(__dirname, 'fixtures', 'messedup.html'), 'utf8');
+    var javascript = 'alert("Hello world");';
+    var css = 'body { background: red; }';
+    var meta = '<!-- test -->';
+    var modifiedHTML = html + '<!-- tested -->\n<script>alert("foo");</script>';
+    var file = toFile({ html: html, javascript: javascript, css: css, meta: meta, source: { html: modifiedHTML, javascript: javascript + '\n// tested', css: css + '\n/* tested */'} });
+
+    var $ = cheerio.load(file);
+    var sourceHTML = $('#jsbin-source-html').text();
+
+    assert(sourceHTML.indexOf('<\\!-- tested -->') !== -1, 'source HTML is present');
+
+    $ = cheerio.load(sourceHTML.replace(/<\\!--/, '<!--').replace(/<\\\/script>/i, '</script>'));
+
+    assert($.html() === modifiedHTML, 'pulling HTML back out is correct');
+
+  });
+})

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@`
`24`	`24`	`"homepage": "https://github.com/jsbin/bin-to-file",`
`25`	`25`	`"devDependencies": {`
`26`	`26`	`"mocha": "~1.20.1",`
`27`		`- "w3cjs": "~0.1.25"`
	`27`	`+ "w3cjs": "~0.1.25",`
	`28`	`+ "cheerio": "~0.17.0"`
`28`	`29`	`}`
`29`	`30`	`}`