Updated testing framework

Makefile

@@ -110,6 +110,7 @@ dependencies:
 cleanup:
 	# cleanup assets
 	rm -rf public/assets
+	rm -rf .cache
 
 # needed for travis
 setup:
@@ -119,8 +120,9 @@ setup:
 
 
 test: cleanup lint
-	node ./fontello.js server --test
-	mocha --timeout 40000 ./test/server/
+	#node ./fontello.js server --test
+	@NODECA_ENV=test node ./fontello.js migrate --all
+	@NODECA_ENV=test ./fontello.js test
 
 
 todo:

cli/server.js

@@ -14,16 +14,7 @@ module.exports.parserParameters = {
 };
 
 
-module.exports.commandLineArguments = [
-  {
-    args: ['--test'],
-    options: {
-      help:   'Start server an terminates immediately, ' +
-              'with code 0 on init success.',
-      action: 'storeTrue'
-    }
-  }
-];
+module.exports.commandLineArguments = [];
 
 
 module.exports.run = function (N, args, callback) {
@@ -32,21 +23,5 @@ module.exports.run = function (N, args, callback) {
       'init:models',
       'init:bundle',
       'init:server'
-    ], N,
-
-    function (err) {
-      if (err) {
-        callback(err);
-        return;
-      }
-
-      // for `--test` just exit on success
-      if (args.test) {
-        process.stdout.write('Server exec test OK\n');
-        process.exit(0);
-      }
-
-      callback();
-    }
-  );
+    ], N, callback);
 };

cli/test.js

@@ -92,6 +92,9 @@ module.exports.run = function (N, args, callback) {
         }
       });
 
+      // Expose N to globals for tests
+      global.TEST_N = N;
+
       mocha.run(function (err) {
         if (err) {
           callback(err);

config/test.yml

@@ -3,7 +3,4 @@
 ^test:
   database:
 
-    mongo:
-      host: localhost
-      port: 27017
-      database: fontello-test
+    mongo: localhost/fontello-test

config/test.yml.example

@@ -0,0 +1,6 @@
+# Configuration for testing
+
+^test:
+  database:
+
+    mongo: localhost/fontello-test

test/server/ping.js

@@ -0,0 +1,25 @@
+/*global describe, it*/
+
+
+'use strict';
+
+
+var request = require('supertest')('http://localhost:3000');
+
+
+describe('HTTP alive', function () {
+
+  it('/ GET', function (done) {
+    request
+      .get('/')
+      .expect(/fontello/)
+      .expect(200, done);
+  });
+
+  it('/ HEAD', function (done) {
+    request
+      .head('/')
+      .expect('')
+      .expect(200, done);
+  });
+});