fix for babel integration (also fixes #9)

aureooms-archive · Apr 8, 2015 · 0b422f4 · 0b422f4
1 parent c12a7dd
commit 0b422f4
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 20 deletions.
diff --git a/js/bin/aureooms-node-package-test.js b/js/bin/aureooms-node-package-test.js
@@ -8,6 +8,4 @@ var config = pkg.config;
 var data = fs.readFileSync(config, 'utf8');
 var opt = JSON.parse(data);
 
-if ( opt.babel ) require( "babel-core/polyfill" ) ;
-
-pkg.test(opt.name, opt.code.main, opt.code.test);
+pkg.test( opt ) ;
diff --git a/js/dist/pkg.js b/js/dist/pkg.js
@@ -129,11 +129,12 @@
 	exports.list = list;
 	/* js/src/test.js */
 
-	var test = function test(name, codepath, testpath) {
+	var test = function test(opt) {
 
 		var path = require('path');
 		var argv = require('optimist').argv;
 		var testrunner = require('qunit');
+		var extend = require('node.extend');
 
 		testrunner.options.maxBlockDuration = 20000;
 		testrunner.options.coverage = true;
@@ -142,6 +143,10 @@
 		testrunner.options.log.assertions = false;
 		testrunner.options.log.summary = false;
 
+		if (opt.babel) testrunner.options.deps = 'node_modules/babel-core/polyfill';
+
+		extend(true, testrunner.options, opt.test);
+
 		var n = argv._.length || 1;
 		var failed = 0;
 		var done = 0;
@@ -160,10 +165,10 @@
 		var run = function run(item) {
 			testrunner.run({
 				code: {
-					path: path.normalize(codepath.join('/')),
-					namespace: name.replace('-', '')
+					path: path.normalize(opt.code.main.join('/')),
+					namespace: opt.name.replace('-', '')
 				},
-				tests: testpath.concat(item).join('/')
+				tests: opt.code.test.concat(item).join('/')
 			}, cb);
 		};
 

diff --git a/js/dist/pkg.js.map b/js/dist/pkg.js.map
diff --git a/js/dist/pkg.min.js b/js/dist/pkg.min.js
diff --git a/js/src/test.js b/js/src/test.js
@@ -1,17 +1,22 @@
 
 
-var test = function(name, codepath, testpath){
+var test = function ( opt ) {
 
 	var path = require('path');
 	var argv = require('optimist').argv;
 	var testrunner = require('qunit');
+	var extend = require('node.extend');
 
-	testrunner.options.maxBlockDuration = 20000;
-	testrunner.options.coverage = true;
-	testrunner.options.log.tests = false;
-	testrunner.options.log.testing = false;
-	testrunner.options.log.assertions = false;
-	testrunner.options.log.summary = false;
+	testrunner.options.maxBlockDuration = 20000 ;
+	testrunner.options.coverage = true ;
+	testrunner.options.log.tests = false ;
+	testrunner.options.log.testing = false ;
+	testrunner.options.log.assertions = false ;
+	testrunner.options.log.summary = false ;
+
+	if ( opt.babel ) testrunner.options.deps = "node_modules/babel-core/polyfill" ;
+
+	extend( true , testrunner.options , opt.test ) ;
 
 	var n = argv._.length || 1;
 	var failed = 0;
@@ -32,10 +37,10 @@ var test = function(name, codepath, testpath){
 		testrunner.run(
 			{
 				code : {
-					path : path.normalize(codepath.join('/')),
-					namespace : name.replace( '-' , '' )
+					path : path.normalize(opt.code.main.join('/')),
+					namespace : opt.name.replace( '-' , '' )
 				},
-				tests : testpath.concat(item).join('/')
+				tests : opt.code.test.concat(item).join('/')
 			}, cb
 		);
 	};

diff --git a/test/js/run.js b/test/js/run.js
@@ -7,4 +7,4 @@ var config = pkg.config;
 var data = fs.readFileSync(config, 'utf8');
 var opt = JSON.parse(data);
 
-pkg.test(opt.name, opt.code.main, opt.code.test);
+pkg.test( opt ) ;