sortPlugins should not be async

1 files changed, 34 insertions, 36 deletions

diff --git a/lib/plugins/__tests__/sortPlugins.js b/lib/plugins/__tests__/sortPlugins.js
index 0f54646..2d7a66d 100644
--- a/lib/plugins/__tests__/sortPlugins.js
+++ b/lib/plugins/__tests__/sortPlugins.js
@@ -7,56 +7,54 @@ describe('sortPlugins', function() {
         var deps = PluginDependency.listFromString('theme-faq'),
             allPlugins = listAll(deps);
 
-        return sortPlugins(allPlugins, [])
-        .then(function(sorted) {
-            var plugins = sorted.slice(0, -2),
-                themes = sorted.slice(-2);
+        var sorted = sortPlugins(allPlugins, []);
 
-            var pluginsOk = plugins.every(function(plugin) {
-                return !plugin.isTheme();
-            });
+        var plugins = sorted.slice(0, -2),
+            themes = sorted.slice(-2);
 
-            var themesOk = themes.every(function(theme) {
-                return theme.isTheme();
-            });
+        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(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);
+        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');
-        });
+        // theme-default should be last
+        expect(themes.last().getName()).toBe('theme-default');
     });
 
     it('must load themes after plugins with a complex dependencies list', function() {
         var deps = PluginDependency.listFromString('comment,theme-faq,-search,ga'),
             allPlugins = listAll(deps);
 
-        return sortPlugins(allPlugins, [])
-        .then(function(sorted) {
-            var plugins = sorted.slice(0, -2),
-                themes = sorted.slice(-2);
+        var sorted = sortPlugins(allPlugins, []);
 
-            var pluginsOk = plugins.every(function(plugin) {
-                return !plugin.isTheme();
-            });
+        var plugins = sorted.slice(0, -2),
+            themes = sorted.slice(-2);
 
-            var themesOk = themes.every(function(theme) {
-                return theme.isTheme();
-            });
-
-            expect(pluginsOk).toBe(true);
-            expect(plugins.has('search')).toBe(false);
+        var pluginsOk = plugins.every(function(plugin) {
+            return !plugin.isTheme();
+        });
 
-            expect(themesOk).toBe(true);
-            expect(themes.size).toBe(2);
-            expect(themes.has('theme-faq')).toBe(true);
-            expect(themes.has('theme-default')).toBe(true);
+        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);
     });
 });
\ No newline at end of file