rework TODOs

provide some dummy tests cases

CHANGELOG.md

@@ -1,3 +1,13 @@
+<a name="4.9.1"></a>
+## [4.9.1](https://github.com/docsifyjs/docsify/compare/v4.9.0...v4.9.1) (2019-02-21)
+
+
+### Bug Fixes
+
+* github assets url ([#774](https://github.com/docsifyjs/docsify/issues/774)) ([140bf10](https://github.com/docsifyjs/docsify/commit/140bf10))
+
+
+
 <a name="4.9.0"></a>
 # [4.9.0](https://github.com/docsifyjs/docsify/compare/v4.8.6...v4.9.0) (2019-02-19)
 

docs/_coverpage.md

@@ -1,6 +1,6 @@
 ![logo](_media/icon.svg)
 
-# docsify <small>4.9.0</small>
+# docsify <small>4.9.1</small>
 
 > A magical documentation site generator.
 

lib/docsify.js

@@ -3157,7 +3157,7 @@ slugify.clear = function () {
 };
 
 function replace(m, $1) {
-  return '<img class="emoji" src="https://assets-cdn.github.com/images/icons/emoji/' + $1 + '.png" alt="' + $1 + '" />'
+  return '<img class="emoji" src="https://github.githubassets.com/images/icons/emoji/' + $1 + '.png" alt="' + $1 + '" />'
 }
 
 function emojify(text) {
@@ -5046,7 +5046,7 @@ function initGlobalAPI () {
     dom: dom,
     get: get,
     slugify: slugify,
-    version: '4.9.0'
+    version: '4.9.1'
   };
   window.DocsifyCompiler = Compiler;
   window.marked = marked;

lib/plugins/emoji.js

@@ -893,7 +893,7 @@ var AllGithubEmoji = [
 window.emojify = function (match, $1) {
   return AllGithubEmoji.indexOf($1) === -1 ?
     match :
-    '<img class="emoji" src="https://assets-cdn.github.com/images/icons/emoji/' +
+    '<img class="emoji" src="https://github.githubassets.com/images/icons/emoji/' +
       $1 +
       '.png" alt="' +
       $1 +

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "docsify",
-  "version": "4.9.0",
+  "version": "4.9.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -8791,12 +8791,6 @@
         "async-limiter": "~1.0.0"
       }
     },
-    "xhr2": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/xhr2/-/xhr2-0.1.4.tgz",
-      "integrity": "sha1-f4dliEdxbbUCYyOBL4GMras4el8=",
-      "dev": true
-    },
     "xml-name-validator": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "docsify",
-  "version": "4.9.0",
+  "version": "4.9.1",
   "description": "A magical documentation generator.",
   "author": {
     "name": "qingwei-li",
@@ -27,7 +27,7 @@
     "dev": "run-p serve watch:*",
     "dev:ssr": "run-p serve:ssr watch:*",
     "lint": "eslint {src,packages} --fix",
-    "test": "mocha",
+    "test": "mocha test/*/**",
     "css": "stylus src/themes/*.styl -u autoprefixer-stylus",
     "watch:css": "run-p 'css -- -o themes -w'",
     "watch:js": "node build/build.js",
@@ -72,8 +72,7 @@
     "rollup-plugin-node-resolve": "^3.0.0",
     "rollup-plugin-replace": "^2.0.0",
     "rollup-plugin-uglify": "^2.0.1",
-    "stylus": "^0.54.5",
-    "xhr2": "^0.1.4"
+    "stylus": "^0.54.5"
   },
   "keywords": [
     "doc",

packages/docsify-server-renderer/package-lock.json

@@ -37,5 +37,5 @@
       "integrity": "sha1-6DWIAbhrg7F1YNTjw4LXrvIQCUQ="
     }
   },
-  "version": "4.9.0"
+  "version": "4.9.1"
 }

packages/docsify-server-renderer/package.json

@@ -1,6 +1,6 @@
 {
   "name": "docsify-server-renderer",
-  "version": "4.9.0",
+  "version": "4.9.1",
   "description": "docsify server renderer",
   "author": {
     "name": "qingwei-li",

src/core/render/emojify.js

@@ -1,7 +1,7 @@
 import {inBrowser} from '../util/env'
 
 function replace(m, $1) {
-  return '<img class="emoji" src="https://assets-cdn.github.com/images/icons/emoji/' + $1 + '.png" alt="' + $1 + '" />'
+  return '<img class="emoji" src="https://github.githubassets.com/images/icons/emoji/' + $1 + '.png" alt="' + $1 + '" />'
 }
 
 export function emojify(text) {

src/plugins/emoji.js

@@ -892,7 +892,7 @@ const AllGithubEmoji = [
 window.emojify = function (match, $1) {
   return AllGithubEmoji.indexOf($1) === -1 ?
     match :
-    '<img class="emoji" src="https://assets-cdn.github.com/images/icons/emoji/' +
+    '<img class="emoji" src="https://github.githubassets.com/images/icons/emoji/' +
       $1 +
       '.png" alt="' +
       $1 +

test/_helper.js

@@ -1,45 +1,10 @@
 // load ES6 modules in Node.js on the fly
 require = require('esm')(module/*, options*/)
 
+const path = require('path')
 const {expect} = require('chai')
 
 const {JSDOM} = require('jsdom')
-const XMLHttpRequest = require('xhr2') // JSDOM doesn't support XMLHttpRequest
-// TODO: try to fix tests when using `<div id="app"></div>` in body
-const markup = `<!DOCTYPE html>
-<html>
-  <head></head>
-  <body></body>
-</html>`
-// TODO: this may not work if tests are mutate the DOM, instead a new instance needs to be created
-// for every test case but that will slow down the tests
-const dom = new JSDOM(markup) 
-
-global.window = dom.window
-global.document = dom.window.document
-global.navigator = dom.window.navigator
-global.location = dom.window.location
-global.XMLHttpRequest = XMLHttpRequest
-
-const {initMixin} = require('../src/core/init')
-const {routerMixin} = require('../src/core//router')
-const {renderMixin} = require('../src/core//render')
-const {fetchMixin} = require('../src/core/fetch')
-const {eventMixin} = require('../src/core//event')
-
-// mimic src/core/index.js but for Node.js
-
-function Docsify() {
-  this._init()
-}
-
-const proto = Docsify.prototype
-
-initMixin(proto)
-routerMixin(proto)
-renderMixin(proto)
-fetchMixin(proto)
-eventMixin(proto)
 
 function ready(callback) {
   const state = document.readyState
@@ -50,16 +15,64 @@ function ready(callback) {
 
   document.addEventListener('DOMContentLoaded', callback)
 }
-let docsify = null
-module.exports.init = function(callback) {
+module.exports.init = function(fixture = 'default', config = {}, markup) {
+	if (markup == null) {
+		markup = `<!DOCTYPE html>
+		<html>
+		  <head></head>
+		  <body>
+		  	<div id="app"></div>
+		  	<script>
+		  		window.$docsify = ${JSON.stringify(config, null, 2)}
+		  	</script>
+		  </body>
+		</html>`
+	}
+	const rootPath = path.join(__dirname, 'fixtures', fixture)
+		
+	const dom = new JSDOM(markup) 
+	dom.reconfigure({ url: 'file:///' + rootPath })
+
+	global.window = dom.window
+	global.document = dom.window.document
+	global.navigator = dom.window.navigator
+	global.location = dom.window.location
+	global.XMLHttpRequest = dom.window.XMLHttpRequest
+
+	// mimic src/core/index.js but for Node.js
+	function Docsify() {
+	  this._init()
+	}
+
+	const proto = Docsify.prototype
+
+	const {initMixin} = require('../src/core/init')
+	const {routerMixin} = require('../src/core//router')
+	const {renderMixin} = require('../src/core//render')
+	const {fetchMixin} = require('../src/core/fetch')
+	const {eventMixin} = require('../src/core//event')
+
+	initMixin(proto)
+	routerMixin(proto)
+	renderMixin(proto)
+	fetchMixin(proto)
+	eventMixin(proto)
+
+	const NOT_INIT_PATTERN = '<!--main-->'
+
 	return new Promise((resolve, reject) => {
-		// return cached version / TODO: see above: this might not scale, new instance of JSDOM is reqiured
-		if (docsify != null) {
-			return resolve(docsify)
-		}
-		ready(_ => {
-			docsify = new Docsify()
-			return resolve(docsify)
+		ready(() => {
+			const docsify = new Docsify()
+			// NOTE: I was not able to get it working with a callback, but polling works usually at the first time
+			const id = setInterval(() => {
+				if (dom.window.document.body.innerHTML.indexOf(NOT_INIT_PATTERN) == -1) {
+					clearInterval(id)
+					return resolve({
+						docsify: docsify,
+						dom: dom
+					})
+				}
+			}, 10)
 		})
 		
 	})

test/fixtures/default/README.md

@@ -0,0 +1,6 @@
+<!-- 
+
+create your own fixture directory
+if you need a custom README.md or sidebar
+
+-->

test/fixtures/simple/README.md

@@ -0,0 +1,18 @@
+# Heading
+
+[another page](other.md)
+
+## II 1
+
+### III 1
+
+#### IV 1
+
+##### V 1
+
+
+## II 2
+
+### III 2
+
+#### IV 2

test/fixtures/simple/other-page.md

@@ -0,0 +1,16 @@
+# Other
+
+## two 1
+
+### three 1
+
+#### four 1
+
+##### five 1 
+
+
+## two 2
+
+### three 2
+
+#### four 2

test/integration/render.js

@@ -0,0 +1,14 @@
+const path = require('path')
+
+const {expect} = require('chai')
+
+const {init, expectSameDom} = require('../_helper')
+
+describe('full docsify initialization', function() {
+	it('TODO: check generated markup', async function() {
+		const {docsify, dom} = await init('simple', {loadSidebar: true})
+  		console.log(dom.window.document.body.innerHTML)
+  		// TODO: add some expectations
+	})
+
+})

test/integration/router.js

@@ -0,0 +1,14 @@
+const path = require('path')
+
+const {expect} = require('chai')
+
+const {init, expectSameDom} = require('../_helper')
+
+describe('router', function() {
+	it('TODO: trigger to load another page', async function() {
+		const {docsify} = await init()
+  		window.location = '/?foo=bar'
+  		// TODO: add some expectations
+	})
+
+})

test/unit/render.js

@@ -2,18 +2,18 @@ const path = require('path')
 
 const {expect} = require('chai')
 
-const {init, expectSameDom} = require('./_helper')
+const {init, expectSameDom} = require('../_helper')
 
 describe('render', function() {
 	it('important content (tips)', async function() {
-		docsify = await init()
+		const {docsify, dom} = await init()
   		const output = docsify.compiler.compile('!> **Time** is money, my friend!')
   		expect(output).equal('<p class="tip"><strong>Time</strong> is money, my friend!</p>')
 	})
 
 	describe('lists', function() {
 		it('as unordered task list', async function() {
-			docsify = await init()
+			const {docsify, dom} = await init()
 			const output = docsify.compiler.compile(`
 - [x] Task 1
 - [ ] Task 2
@@ -26,7 +26,7 @@ describe('render', function() {
 		})
 
 		it('as ordered task list', async function() {
-			docsify = await init()
+			const {docsify, dom} = await init()
 			const output = docsify.compiler.compile(`
 1. [ ] Task 1
 2. [x] Task 2`)
@@ -37,7 +37,7 @@ describe('render', function() {
 		})
 
 		it('normal unordered', async function() {
-			docsify = await init()
+			const {docsify, dom} = await init()
 			const output = docsify.compiler.compile(`
 - [linktext](link)
 - just text`)
@@ -48,7 +48,7 @@ describe('render', function() {
 		})
 
 		it('unordered with custom start', async function() {
-			docsify = await init()
+			const {docsify, dom} = await init()
 			const output = docsify.compiler.compile(`
 1. first
 2. second
@@ -67,7 +67,7 @@ text
 		})
 
 		it('nested', async function() {
-			docsify = await init()
+			const {docsify, dom} = await init()
 			const output = docsify.compiler.compile(`
 - 1
 - 2