Improve testing for sortPlugins

1 files changed, 7 insertions, 15 deletions

diff --git a/lib/plugins/__tests__/sortPlugins.js b/lib/plugins/__tests__/sortPlugins.js
index 2e1b594..0f54646 100644
--- a/lib/plugins/__tests__/sortPlugins.js
+++ b/lib/plugins/__tests__/sortPlugins.js
@@ -1,17 +1,6 @@
 var PluginDependency = require('../../models/pluginDependency');
 var sortPlugins = require('../sortPlugins');
 var listAll = require('../listAll');
-var THEME_PREFIX = require('../../constants/themePrefix');
-
-
-/**
-    Check if a plugin is a theme given its name
-
-    @return {Boolean}
-*/
-function isTheme(name) {
-    return (name && name.indexOf(THEME_PREFIX) === 0);
-}
 
 describe('sortPlugins', function() {
     it('must load themes after plugins', function() {
@@ -24,11 +13,11 @@ describe('sortPlugins', function() {
                 themes = sorted.slice(-2);
 
             var pluginsOk = plugins.every(function(plugin) {
-                return !isTheme(plugin.getName());
+                return !plugin.isTheme();
             });
 
             var themesOk = themes.every(function(theme) {
-                return isTheme(theme.getName());
+                return theme.isTheme();
             });
 
             expect(pluginsOk).toBe(true);
@@ -38,6 +27,9 @@ describe('sortPlugins', function() {
             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');
         });
     });
 
@@ -51,11 +43,11 @@ describe('sortPlugins', function() {
                 themes = sorted.slice(-2);
 
             var pluginsOk = plugins.every(function(plugin) {
-                return !isTheme(plugin.getName());
+                return !plugin.isTheme();
             });
 
             var themesOk = themes.every(function(theme) {
-                return isTheme(theme.getName());
+                return theme.isTheme();
             });
 
             expect(pluginsOk).toBe(true);