#178 Place app.use for executor in the right order.

Added tests for raw rest commands

src/server/standalone.js

@@ -460,7 +460,16 @@ define(['logManager',
             __app.use(Passport.initialize());
             __app.use(Passport.session());
 
+            if (CONFIG.enableExecutor) {
+                var executorRest = requirejs('executor/Executor');
+                __app.use('/rest/executor', executorRest);
+                __logger.info('Executor listening at rest/executor');
+            } else {
+                __logger.info('Executor not enabled. Add "enableExecutor: true" to config.js for activation.');
+            }
+
             setupExternalRestModules();
+
         });
 
         __logger.info("creating login routing rules for the static server");
@@ -598,14 +607,6 @@ define(['logManager',
         //var blobBackend = new BlobS3Backend();
         BlobServer.createExpressBlob(__app, blobBackend, ensureAuthenticated, __logger);
 
-        if (CONFIG.enableExecutor) {
-            var executorRest = requirejs('executor/Executor');
-            __app.use('/rest/executor/', executorRest);
-            __logger.info('Executor listening at rest/executor');
-        } else {
-            __logger.info('Executor not enabled. Add "enableExecutor: true" to config.js for activation.');
-        }
-
         //client contents - js/html/css
         //stuff that considered not protected 
         __app.get(/^\/.*\.(css|ico|ttf|woff|js)$/, function (req, res) {

test/middleware/executor/Executor.spec.js

@@ -0,0 +1,60 @@
+/*globals require, describe, it, afterEach, WebGMEGlobal, WebGME*/
+
+/**
+ * @author pmeijer / https://github.com/pmeijer
+ */
+
+require('../../_globals.js');
+
+var agent = require('superagent').agent(),
+    should = require('chai').should(),
+    server,
+    serverBaseUrl;
+
+describe('Executor', function () {
+    'use strict';
+
+    afterEach(function (done) {
+        server.stop(done);
+    });
+
+    it('should return 200 at rest/executor/worker/ with enableExecutor=true', function (done) {
+        var config = WebGMEGlobal.getConfig();
+        config.port = 9001;
+        config.enableExecutor = true;
+
+        serverBaseUrl = 'http://127.0.0.1:' + config.port;
+
+        server = WebGME.standaloneServer(config);
+        server.start(function () {
+            agent.get(serverBaseUrl + '/rest/executor/worker/').end(function (err, res) {
+                if (err) {
+                    done(err);
+                    return;
+                }
+                should.equal(res.status, 200);
+                done();
+            });
+        });
+    });
+
+    it('should return 404 at rest/executor/worker/ with enableExecutor=false', function (done) {
+        var config = WebGMEGlobal.getConfig();
+        config.port = 9001;
+        config.enableExecutor = false;
+
+        serverBaseUrl = 'http://127.0.0.1:' + config.port;
+
+        server = WebGME.standaloneServer(config);
+        server.start(function () {
+            agent.get(serverBaseUrl + '/rest/executor/worker/').end(function (err, res) {
+                if (err) {
+                    done(err);
+                    return;
+                }
+                should.equal(res.status, 404);
+                done();
+            });
+        });
+    });
+});