Cleanup some stuff

Author: ariporad

api.js

@@ -8,6 +8,7 @@ var Promise = require('bluebird');
 var figures = require('figures');
 var globby = require('globby');
 var chalk = require('chalk');
+var commondir = require('commondir');
 var resolveCwd = require('resolve-cwd');
 var fork = require('./lib/fork');
 var formatter = require('./lib/enhance-assert').formatter();
@@ -100,25 +101,6 @@ Api.prototype._handleTest = function (test) {
 	this.emit('test', test);
 };
 
-Api.prototype._findBase = function (files) {
-	this.base = files.reduce(function (base, file) {
-		file = path.relative('.', file);
-		file = file.split(path.sep);
-		if (base === false) {
-			return file;
-		}
-		return base.filter(function (part, i) {
-			return file[i].toLowerCase() === part.toLowerCase();
-		});
-	}, false).join(path.sep);
-
-	if (this.base === '' || this.base === '.') {
-		this.base = this.files[0] || 'test';
-	}
-
-	this.base += path.sep;
-};
-
 Api.prototype._prefixTitle = function (file) {
 	if (this.fileCount === 1) {
 		return '';
@@ -156,7 +138,7 @@ Api.prototype.run = function () {
 
 			self.fileCount = files.length;
 
-			self._findBase(files);
+			self.base = path.relative('.', commondir('.', files)) + path.sep;
 
 			var tests = files.map(self._runFile);
 
@@ -209,9 +191,7 @@ function handlePaths(files) {
 	if (files.length === 0) {
 		files = [
 			'test.js',
-			'**/test.js',
 			'test-*.js',
-			'**/test-*.js',
 			'test'
 		];
 	}

package.json

@@ -89,6 +89,7 @@
     "cacha": "^1.0.3",
     "chalk": "^1.0.0",
     "co-with-promise": "^4.6.0",
+    "commondir": "^1.0.1",
     "core-assert": "^0.1.0",
     "debug": "^2.2.0",
     "deeper": "^2.1.0",

test/api.js

@@ -259,14 +259,15 @@ test('absolute paths', function (t) {
 		});
 });
 
-test('recursive for directory', function (t) {
+test('search directories recursivly for files', function (t) {
 	t.plan(1);
 
-	var api = new Api([path.join(__dirname, 'fixture/subdir/in-a-subdir.js')]);
+	var api = new Api([path.join(__dirname, 'fixture/subdir')]);
 
 	api.run()
 		.then(function () {
-			t.is(api.passCount, 1);
+			t.is(api.passCount, 2);
+			t.is(api.failCount, 1);
 		});
 });
 

test/fixture/subdir/failing-subdir.js

@@ -1,8 +1,5 @@
-var test = require('../../../');
+import test from '../../../';
 
-test('subdir fail', function (t) {
+test('subdir fail', t => {
 	t.fail();
 });
-
-
-

test/fixture/subdir/in-a-subdir.js

@@ -1,5 +1,5 @@
-var test = require('../../../');
+import test from '../../../';
 
-test('subdir', function (t) {
+test('subdir', t => {
 	t.pass();
 });

test/fixture/subdir/nested/nested.js

@@ -0,0 +1,5 @@
+import test from '../../../../';
+
+test('subdir', t => {
+	t.pass();
+});