Fix server when runnign without plugins, fix test

teem2 · Jul 27, 2015 · a233910 · a233910
1 parent 6233e45
commit a233910
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/compositions/smoke/requestor.dre b/compositions/smoke/requestor.dre
@@ -97,10 +97,10 @@ SOFTWARE. -->
           assert.isUndefined(req1.success_data, 'Request did not succeed so the success method should not be called.');
 
           assert.equal(req1.error_status, 404, 'Request to bad url should fail as a 404.');
-          assert.equal(req1.error_data, "NOT FOUND", 'Server response will be "NOT FOUND".');
+          assert.equal(req1.error_data, "FILE NOT FOUND", 'Server response will be "NOT FOUND".');
 
           assert.equal(req1.always_status, 404, 'Request to bad url should trigger always method as a 404.');
-          assert.equal(req1.always_data, "NOT FOUND", 'Server response for always method will be "NOT FOUND".');
+          assert.equal(req1.always_data, "FILE NOT FOUND", 'Server response for always method will be "NOT FOUND".');
 
 
           // Success with json (Removing \r is needed for Windows)

diff --git a/core/pluginloader.js b/core/pluginloader.js
@@ -29,19 +29,25 @@ define(function(require, exports, module) {
 
         this.__findPlugins = function() {
             var pluginDirs = this.args['-plugin'];
+            if (!pluginDirs) {
+                pluginDirs = []
+            }
             if (!Array.isArray(pluginDirs)) {
                 pluginDirs = [pluginDirs]
             }
 
             var errors = [];
             for (var i=0;i<pluginDirs.length;i++) {
-                var dir = path.resolve(pluginDirs[i]);
-                if (fs.existsSync(dir + '/index.dre')) {
-                    if (!define['PLUGIN']) {
-                        define['PLUGIN'] = [];
+                var pdir = pluginDirs[i];
+                if (pdir) {
+                    var dir = path.resolve(pdir);
+                    if (fs.existsSync(dir + '/index.dre')) {
+                        if (!define['PLUGIN']) {
+                            define['PLUGIN'] = [];
+                        }
+                        define['PLUGIN'].push(dir + '/node_modules/');
+                        this.__loadPlugin(dir, errors);
                     }
-                    define['PLUGIN'].push(dir + '/node_modules/');
-                    this.__loadPlugin(dir, errors);
                 }
             }