simpler test setup, runner test path fix

Author: ShMcK

src/runner.js

@@ -1,13 +1,7 @@
 "use strict";
 var utils_1 = require('./utils');
 var createRunner_1 = require('./createRunner');
-var path = require('path');
 function runner(files, config, handleResult, handleLog) {
-    files = files.map(function (subArray) {
-        return subArray.map(function (test) {
-            return path.join(config.tutorialDir, test);
-        });
-    });
     var tests = utils_1.concatAll(files);
     var runner = createRunner_1.createRunner(config, tests);
     var result = {

test/result-fail.spec.js

@@ -4,26 +4,20 @@ var chaiAsPromised = require("chai-as-promised");
 chai.use(chaiAsPromised);
 var expect = chai.expect;
 
-var runner = require('../src/runner').runner;
 var rootDir = __dirname.split('/');
 var config = {
   dir: rootDir.slice(0, rootDir.length - 1).join('/'),
-  tutorialDir: __dirname + '/tests'
-};
-var handleLog = function(log) {
-  return log;
-};
-var handleResult = function(result) {
-  return result;
+  tutorialDir: path.join(__dirname, 'tests')
 };
+var getRunner = require('./utils').getRunner;
 
 describe('result-failure', function() {
 
   it('returns taskPosition 0 if first test fails', function() {
     var files = [
       ['fail-01.js']
     ];
-    var run = runner(files, config, handleResult, handleLog);
+    var run = getRunner(files);
     var expected = {
       pass: false,
       taskPosition: 0,
@@ -38,7 +32,7 @@ it('returns taskPosition 1 if second test fails', function() {
   var files = [
     ['pass-01.js'], ['fail-01.js']
   ];
-  var run = runner(files, config, handleResult, handleLog);
+  var run = getRunner(files);
   var expected = {
     pass: false,
     taskPosition: 1,
@@ -53,7 +47,7 @@ it('returns taskPosition 3 if fourth test fails', function() {
   var files = [
     ['pass-01.js'], ['pass-02.js'], ['pass-03.js'], ['fail-01.js']
   ];
-  var run = runner(files, config, handleResult, handleLog);
+  var run = getRunner(files);
   var expected = {
     pass: false,
     taskPosition: 3,
@@ -68,7 +62,7 @@ it('returns taskPosition 0 if any of the first tests fail', function () {
     var files = [
       ['pass-01.js', 'pass-02.js', 'fail-01.js']
     ];
-    var run = runner(files, config, handleResult, handleLog);
+    var run = getRunner(files);
     var expected = {
       pass: false,
       taskPosition: 0,
@@ -83,7 +77,7 @@ it('returns the taskPosition at the correct point with arrays of tests', functio
   var files = [
     ['pass-01.js', 'pass-02.js'], ['pass-03.js'], ['pass-04.js', 'fail-01.js']
   ];
-  var run = runner(files, config, handleResult, handleLog);
+  var run = getRunner(files);
   var expected = {
     pass: false,
     taskPosition: 2,

test/result-pass.spec.js

@@ -3,26 +3,15 @@ var chaiAsPromised = require("chai-as-promised");
 chai.use(chaiAsPromised);
 var expect = chai.expect;
 
-var runner = require('../src/runner').runner;
-var rootDir = __dirname.split('/');
-var config = {
-  dir: rootDir.slice(0, rootDir.length - 1).join('/'),
-  tutorialDir: __dirname + '/tests'
-};
-var handleLog = function(log) {
-  return log;
-};
-var handleResult = function(result) {
-  return result;
-};
+var getRunner = require('./utils').getRunner;
 
 describe('result-pass', function() {
 
   it('should take one passing test and return taskPosition 1', function() {
     var files = [
       ['./pass-01.js']
     ];
-    var run = runner(files, config, handleResult, handleLog);
+    var run = getRunner(files);
     var expected = {
       pass: true,
       taskPosition: 1,
@@ -37,7 +26,7 @@ describe('result-pass', function() {
     var files = [
       ['./pass-01.js'], ['./pass-02.js'], ['./pass-03.js']
     ];
-    var run = runner(files, config, handleResult, handleLog);
+    var run = getRunner(files);
     var expected = {
       pass: true,
       taskPosition: 3,
@@ -52,7 +41,7 @@ describe('result-pass', function() {
     var files = [
       ['./pass-01.js', './pass-02.js'], ['./pass-03.js', './pass-04.js']
     ];
-    var run = runner(files, config, handleResult, handleLog);
+    var run = getRunner(files);
     var expected = {
       pass: true,
       taskPosition: 2,

test/runner.spec.js

@@ -1,39 +1,33 @@
 var chai = require('chai');
 var chaiAsPromised = require("chai-as-promised");
+var spies = require('chai-spies');
 
+chai.use(spies);
 chai.use(chaiAsPromised);
 var expect = chai.expect;
 
-var runner = require('../src/runner').runner;
-var rootDir = __dirname.split('/');
-var config = {
-  dir: rootDir.slice(0, rootDir.length - 1).join('/'),
-  tutorialDir: __dirname + '/tests'
-};
-var handleLog = function(log) {
-  return log;
-};
-var handleResult = function(result) {
-  return result;
-};
-
-xdescribe('runner', function() {
+
+var getRunner = require('./utils').getRunner;
+
+
+describe('runner', function() {
 
   it('should run to completion', function() {
     var files = [
       ['pass-01.js']
     ];
-    var run = runner(files, config, handleResult, handleLog);
-    expect(run).to.eventually.be.fulfilled;
+    var run = getRunner(files);
+    return expect(run).to.eventually.be.fulfilled;
   });
 
 
-  it('should load environmental variables', function () {
+  xit('should load environmental variables', function () {
+    var spy = chai.spy.on(handleLog);
     var files = [
       ['env-vars.js']
     ];
-    var run = runner(files, config, handleResult, handleLog);
-    expect(run).to.eventually.equal(Promise.resolve('hi'));
+    var run = getRunner(files);
+    return expect(spy).to.have.been.called();
   });
 
 });

test/utils.js

@@ -0,0 +1,27 @@
+var path = require('path');
+
+function addPaths(files) {
+  return files.map(function(subArray) {
+    return subArray.map(function(test) {
+      return path.join(config.tutorialDir, test);
+    });
+  });
+}
+
+var runner = require('../src/runner').runner;
+var rootDir = __dirname.split('/');
+var config = {
+  dir: rootDir.slice(0, rootDir.length - 1).join('/'),
+  tutorialDir: __dirname + '/tests'
+};
+function handleLog(log) {
+  return log;
+}
+function handleResult(result) {
+  return result;
+}
+
+exports.getRunner = function getRunner(files) {
+  files = addPaths(files);
+  return runner(files, config, handleResult, handleLog);
+}