Removing coffee-script and porting the fixture code to es6 (#25)

package.json

@@ -10,9 +10,8 @@
     "lint": "eslint .",
     "pretest": "npm run lint",
     "test-unit": "babel-node --debug node_modules/mocha/bin/_mocha ./test/unit/",
-    "test-unit-legacy": "babel-node --debug node_modules/mocha/bin/_mocha ./test/legacy/",
     "test-integration": "babel-node --debug node_modules/mocha/bin/_mocha ./test/integration/",
-    "test": "npm run test-unit && npm run test-unit-legacy && npm run test-integration",
+    "test": "npm run test-unit && npm run test-integration",
     "start": "node example/start.js",
     "build-and-test": "npm run build && npm test"
   },
@@ -55,8 +54,7 @@
     "express-device": "^0.3.11",
     "express-winston": "^2.0.0",
     "method-override": "^2.3.1",
-    "ejs": "^2.2.3",
-    "coffee-script": "^1.10.0"
+    "ejs": "^2.2.3"
   },
   "devDependencies": {
     "babel-cli": "^6.5.1",

test/fixtures/config/test.js

@@ -0,0 +1,6 @@
+module.exports = function () {
+  return this.properties({
+    Port: 9088,
+    RootWebPath: '/user/agustin/test/'
+  });
+}

test/fixtures/controllers/MockController.js

@@ -0,0 +1,12 @@
+module.exports = function (BaseController) {
+
+  class MockController extends BaseController {
+    configure(app) {
+      super.configure(app);
+      app.get("/", (req, res) => { res.status(200).send("SomeIndex") });
+      app.get("/with-error", (req, res) => { throw new Error("Throwing a basic error") });
+    }
+  }
+
+  return new MockController();
+}

test/fixtures/controllers/PromiseMiddlewareTestController.js

@@ -0,0 +1,36 @@
+module.exports = function (BaseController, Promise) {
+
+  class PromiseMiddlewareTestController extends BaseController {
+
+    configure(app) {
+      super.configure(app);
+      app.get('/promise-middleware-test--jsonasync', this.getJsonAsync);
+      app.get('/promise-middleware-test--renderasync', this.getRenderAsync);
+      app.get('/promise-middleware-test--sendAsync', this.getSendAsync);
+      app.get('/promise-middleware-test--sendStatusAsync', this.getSendStatusAsync);
+      app.get('/promise-middleware-test--formatAsync', this.getFormatAsync);
+    }
+
+    getJsonAsync(req, res) {
+      res.jsonAsync(Promise.resolve('jsonAsync success'));
+    }
+
+    getRenderAsync(req, res) {
+      res.renderAsync('renderView', Promise.resolve({ microapp: 'renderAsync success' }));
+    }
+
+    getSendAsync(req, res) {
+      res.sendAsync(Promise.resolve('sendAsync success'));
+    }
+
+    getSendStatusAsync(req, res) {
+      res.sendStatusAsync(Promise.resolve({ status: 200 }));
+    }
+
+    getFormatAsync(req, res) {
+      res.formatAsync(Promise.resolve('formatAsync success'));
+    }
+  }
+
+  return new PromiseMiddlewareTestController();
+};

test/fixtures/controllers/ServerErrorTestController.js

@@ -0,0 +1,25 @@
+module.exports = function (BaseController, SpurErrors) {
+
+  class ServerErrorTestController extends BaseController {
+    configure(app) {
+      super.configure(app);
+      app.get('/500-error-test', this.getErrorTest.bind(this));
+      app.get('/500-standard-error-test', this.getStandardErrorTest.bind(this));
+      app.get('/404-error-test', this.getNotFoundErrorTest.bind(this));
+    }
+
+    getErrorTest(req, res) {
+      throw SpurErrors.InternalServerError.create('Some dumb server error');
+    }
+
+    getStandardErrorTest(req, res) {
+      throw 'Some dumb server error';
+    }
+
+    getNotFoundErrorTest() {
+      throw SpurErrors.NotFoundError.create('Some dumb not found error');
+    }
+  }
+
+  return new ServerErrorTestController();
+};

test/fixtures/injector.js

@@ -0,0 +1,28 @@
+const path = require('path');
+const spur = require('spur-ioc');
+const spurCommon = require('spur-common');
+const localInjector = require('../../src/injector');
+const registerConfig = require('spur-common/registerConfig');
+const colors = require('colors');
+
+module.exports = function () {
+
+  const ioc = spur.create('test-spur-web');
+
+  registerConfig(ioc, path.join(__dirname, 'config'));
+
+  ioc.merge(spurCommon());
+  ioc.merge(localInjector());
+
+  ioc.registerFolders(__dirname, [
+    'controllers/',
+    'middleware/',
+    'runtime/'
+  ]);
+
+  ioc.registerDependencies({
+    colors: colors
+  });
+
+  return ioc;
+};

test/fixtures/middleware/TestBaseMiddleware.js

@@ -0,0 +1,12 @@
+module.exports = function (BaseMiddleware, Logger) {
+
+  class TestBaseMiddleware extends BaseMiddleware {
+
+    configure() {
+      super.configure();
+      Logger.log('Subclass called');
+    }
+  }
+
+  return new TestBaseMiddleware();
+};

test/fixtures/runtime/TestWebServer.js

@@ -0,0 +1,19 @@
+module.exports = function (BaseWebServer, Logger, path) {
+
+  class TestWebServer extends BaseWebServer {
+
+    registerDefaultMiddleware(){
+      super.registerDefaultMiddleware();
+      this.registerEjsTemplates();
+    }
+
+    registerEjsTemplates() {
+      Logger.log('EJS Template Registration');
+
+      this.app.set('view engine', 'ejs');
+      this.app.set('views', path.join(__dirname, '../views'));
+    }
+  }
+
+  return new TestWebServer();
+}

test/globals.js

@@ -6,7 +6,7 @@ global.chai = require('chai');
 global.expect = global.chai.expect;
 
 global.srcDir = path.resolve(__dirname, '../src');
-global.injector = require(path.join(__dirname, 'fixtures', 'injector.coffee'));
+global.injector = require(path.join(__dirname, 'fixtures', 'injector'));
 
 process.env.NODE_ENV = 'test';