1 files changed, 31 insertions, 41 deletions

diff --git a/lib/plugins/__tests__/sortPlugins.js b/lib/plugins/__tests__/sortPlugins.js
index 2d7a66d..c50c851 100644
--- a/lib/plugins/__tests__/sortPlugins.js
+++ b/lib/plugins/__tests__/sortPlugins.js
@@ -8,28 +8,21 @@ describe('sortPlugins', function() {
             allPlugins = listAll(deps);
 
         var sorted = sortPlugins(allPlugins, []);
-
-        var plugins = sorted.slice(0, -2),
-            themes = sorted.slice(-2);
-
-        var pluginsOk = plugins.every(function(plugin) {
-            return !plugin.isTheme();
-        });
-
-        var themesOk = themes.every(function(theme) {
-            return theme.isTheme();
-        });
-
-        expect(pluginsOk).toBe(true);
-        expect(plugins.has('search')).toBe(true);
-
-        expect(themesOk).toBe(true);
-        expect(themes.size).toBe(2);
-        expect(themes.has('theme-faq')).toBe(true);
-        expect(themes.has('theme-default')).toBe(true);
-
-        // theme-default should be last
-        expect(themes.last().getName()).toBe('theme-default');
+        var names = sorted
+            .map(function(plugin) {
+                return plugin.getName();
+            })
+            .toArray();
+
+        expect(names).toEqual([
+            'fontsettings',
+            'sharing',
+            'lunr',
+            'search',
+            'highlight',
+            'theme-faq',
+            'theme-default'
+        ]);
     });
 
     it('must load themes after plugins with a complex dependencies list', function() {
@@ -37,24 +30,21 @@ describe('sortPlugins', function() {
             allPlugins = listAll(deps);
 
         var sorted = sortPlugins(allPlugins, []);
-
-        var plugins = sorted.slice(0, -2),
-            themes = sorted.slice(-2);
-
-        var pluginsOk = plugins.every(function(plugin) {
-            return !plugin.isTheme();
-        });
-
-        var themesOk = themes.every(function(theme) {
-            return theme.isTheme();
-        });
-
-        expect(pluginsOk).toBe(true);
-        expect(plugins.has('search')).toBe(false);
-
-        expect(themesOk).toBe(true);
-        expect(themes.size).toBe(2);
-        expect(themes.has('theme-faq')).toBe(true);
-        expect(themes.has('theme-default')).toBe(true);
+        var names = sorted
+            .map(function(plugin) {
+                return plugin.getName();
+            })
+            .toArray();
+
+        expect(names).toEqual([
+            'ga',
+            'comment',
+            'fontsettings',
+            'sharing',
+            'lunr',
+            'highlight',
+            'theme-faq',
+            'theme-default'
+        ]);
     });
 });
\ No newline at end of file