Fix listAll to add default plugins after normal ones

2 files changed, 18 insertions, 28 deletions

diff --git a/lib/plugins/__tests__/listAll.js b/lib/plugins/__tests__/listAll.js
index f9711a7..6a08c84 100644
--- a/lib/plugins/__tests__/listAll.js
+++ b/lib/plugins/__tests__/listAll.js
@@ -1,36 +1,38 @@
 var PluginDependency = require('../../models/pluginDependency');
 var listAll = require('../listAll');
+var toNames = require('../toNames');
 
 describe('listAll', function() {
     it('must list default', function() {
         var deps = PluginDependency.listFromString('ga,great');
         var plugins = listAll(deps);
+        var names = toNames(plugins);
 
-        expect(plugins.size).toBe(8);
-
-        expect(plugins.has('ga')).toBe(true);
-        expect(plugins.has('great')).toBe(true);
-
-        expect(plugins.has('search')).toBe(true);
+        expect(names).toEqual([
+            'ga', 'great',
+            'highlight', 'search', 'lunr', 'sharing', 'fontsettings',
+            'theme-default' ]);
     });
 
     it('must list from array with -', function() {
         var deps = PluginDependency.listFromString('ga,-great');
         var plugins = listAll(deps);
+        var names = toNames(plugins);
 
-        expect(plugins.size).toBe(7);
-
-        expect(plugins.has('ga')).toBe(true);
-        expect(plugins.has('great')).toBe(false);
+        expect(names).toEqual([
+            'ga',
+            'highlight', 'search', 'lunr', 'sharing', 'fontsettings',
+            'theme-default' ]);
     });
 
     it('must remove default plugins using -', function() {
         var deps = PluginDependency.listFromString('ga,-search');
         var plugins = listAll(deps);
+        var names = toNames(plugins);
 
-        expect(plugins.size).toBe(6);
-
-        expect(plugins.has('ga')).toBe(true);
-        expect(plugins.has('search')).toBe(false);
+        expect(names).toEqual([
+            'ga',
+            'highlight', 'lunr', 'sharing', 'fontsettings',
+            'theme-default' ]);
     });
 });
diff --git a/lib/plugins/__tests__/sortPlugins.js b/lib/plugins/__tests__/sortPlugins.js
index 99955fb..4aa26a3 100644
--- a/lib/plugins/__tests__/sortPlugins.js
+++ b/lib/plugins/__tests__/sortPlugins.js
@@ -2,21 +2,9 @@ var Immutable = require('immutable');
 
 var Plugin = require('../../models/plugin');
 var sortPlugins = require('../sortPlugins');
+var toNames = require('../toNames');
 
-/**
- * Return list of plugin names
- * @param {OrderedMap<String:Plugin} plugins
- * @return {Array<String>}
- */
-function toNames(plugins) {
-    return plugins
-        .map(function(plugin) {
-            return plugin.getName();
-        })
-        .toArray();
-}
-
-describe.only('sortPlugins', function() {
+describe('sortPlugins', function() {
     it('must load themes after plugins', function() {
         var allPlugins = Immutable.OrderedMap([
             ['hello', Plugin.createFromString('hello')],