fixed: assertion testing

petersirka · petersirka · commit 2135a7f42db0 · 2014-01-25T16:32:05.000+01:00
diff --git a/index.js b/index.js
@@ -3271,11 +3271,20 @@ Framework.prototype.test = function(stop, names, cb) {
 	} else
 		names = names || [];
 
+	var counter = 0;
 	self.isTest = true;
 
-	fs.readdirSync(utils.combine(self.config['directory-tests'])).forEach(function(name) {
+	var dir = self.config['directory-tests'];
 
-		var filename = path.join(directory, self.config['directory-tests'], name);
+	if (!fs.existsSync(utils.combine(dir))) {
+		if (cb) cb();
+		if (stop) setTimeout(function() { framework.stop(); }, 500);
+		return self;
+	}
+
+	fs.readdirSync(utils.combine(dir)).forEach(function(name) {
+
+		var filename = path.join(directory, dir, name);
 
 		if (path.extname(filename).toLowerCase() !== '.js')
 			return;
@@ -3301,20 +3310,27 @@ Framework.prototype.test = function(stop, names, cb) {
 			else if (isLoad)
 				test.load(self, name);
 
+			counter++;
+
 		} catch (ex) {
-			self.stop();
+			setTimeout(function() { framework.stop(); }, 500);
 			throw ex;
 		}
-
 	});
 
+	if (counter === 0) {
+		if (cb) cb();		
+		if (stop) setTimeout(function() { framework.stop(); }, 500);
+		return self;
+	}
+
 	setTimeout(function() {
 		self.testing(stop, function() {
 			self.isTest = false;
 			if (cb)
 				cb();
 		});
-	}, 500);
+	}, 100);
 
 	return self;
 };
diff --git a/minify/total.js/index.js b/minify/total.js/index.js
diff --git a/test/app.framework-test.js b/test/app.framework-test.js
@@ -0,0 +1,5 @@
+var framework = require('../index');
+var http = require('http');
+
+framework.run(http, true, 8001);
+framework.test(true);
diff --git a/test/app.tmp.js b/test/app.tmp.js
@@ -81,13 +81,3 @@ fs.createReadStream('/users/petersirka/desktop/a.jpg').pipe(p.stdin);
 
 //var socket = new tls.connect(465, 'smtp.gmail.com');
 //var isSended = false;
-
-function b() {
-	console.log(arguments);
-}
-
-function a() {
-	b.call(this, arguments);
-}
-
-a('Peter', 243);
diff --git a/test/components/products.js b/test/components/products.js
@@ -1,7 +1,6 @@
 // optional
 exports.install = function(framework) {
 	// component doesn't support routing
-	console.log('OK');
 };
 
 // optional
diff --git a/test/tests/test.js b/test/tests/test.js
@@ -0,0 +1,9 @@
+var assert = require('assert');
+
+exports.run = function(framework) {
+
+	framework.assert('validation', function(name) {
+		assert('1' === '2', name);
+	});
+
+};
