summaryrefslogtreecommitdiffstats
path: root/packages
diff options
context:
space:
mode:
authorSamy Pesse <samypesse@gmail.com>2016-10-12 11:04:09 +0200
committerSamy Pesse <samypesse@gmail.com>2016-10-12 11:04:09 +0200
commit5fed4e1cedd47e97422596cb1eb62ac3146c6aff (patch)
tree428c2778f32dd1ce54c9dcaab09a09bb26a875dc /packages
parentc71da9955ef605cbdb617bcd18b848f57bade1a2 (diff)
downloadgitbook-5fed4e1cedd47e97422596cb1eb62ac3146c6aff.zip
gitbook-5fed4e1cedd47e97422596cb1eb62ac3146c6aff.tar.gz
gitbook-5fed4e1cedd47e97422596cb1eb62ac3146c6aff.tar.bz2
Adapt findInstalled for unit tests
Diffstat (limited to 'packages')
-rw-r--r--packages/gitbook/src/plugins/__tests__/findInstalled.js2
-rw-r--r--packages/gitbook/src/plugins/findInstalled.js7
-rw-r--r--packages/gitbook/src/plugins/loadPlugin.js14
3 files changed, 14 insertions, 9 deletions
diff --git a/packages/gitbook/src/plugins/__tests__/findInstalled.js b/packages/gitbook/src/plugins/__tests__/findInstalled.js
index dcaa62b..e787761 100644
--- a/packages/gitbook/src/plugins/__tests__/findInstalled.js
+++ b/packages/gitbook/src/plugins/__tests__/findInstalled.js
@@ -17,7 +17,7 @@ describe('findInstalled', function() {
.then(function(plugins) {
expect(plugins.size >= gitbookPlugins.size).toBeTruthy();
- expect(plugins.has('fontsettings')).toBe(true);
+ expect(plugins.has('highlight')).toBe(true);
expect(plugins.has('search')).toBe(true);
});
});
diff --git a/packages/gitbook/src/plugins/findInstalled.js b/packages/gitbook/src/plugins/findInstalled.js
index 8839fc6..fb690c2 100644
--- a/packages/gitbook/src/plugins/findInstalled.js
+++ b/packages/gitbook/src/plugins/findInstalled.js
@@ -41,9 +41,14 @@ function readModule(modulePath, depth, parent) {
* @param {String} folder
* @param {Number} depth
* @param {String} parent
- * @return {OrderedMap<String:Plugin>}
+ * @return {Promise<OrderedMap<String:Plugin>>} plugins
*/
function findInstalled(folder, depth = 0, parent = null) {
+ // When tetsing with mock-fs
+ if (!folder) {
+ return Promise(OrderedMap());
+ }
+
// Search for gitbook-plugins in node_modules folder
const node_modules = path.join(folder, 'node_modules');
diff --git a/packages/gitbook/src/plugins/loadPlugin.js b/packages/gitbook/src/plugins/loadPlugin.js
index 4a349e2..167587a 100644
--- a/packages/gitbook/src/plugins/loadPlugin.js
+++ b/packages/gitbook/src/plugins/loadPlugin.js
@@ -15,13 +15,13 @@ function isModuleNotFound(err) {
}
/**
- Load a plugin in a book
-
- @param {Book} book
- @param {Plugin} plugin
- @param {String} pkgPath (optional)
- @return {Promise<Plugin>}
-*/
+ * Load a plugin in a book
+ *
+ * @param {Book} book
+ * @param {Plugin} plugin
+ * @param {String} pkgPath (optional)
+ * @return {Promise<Plugin>}
+ */
function loadPlugin(book, plugin) {
const logger = book.getLogger();