improved unit tests

Author: ShMcK

test/load-context.spec.js

@@ -9,7 +9,7 @@ var config = {
   dir: rootDir.slice(0, rootDir.length - 1).join('/'),
   tutorialDir: path.join(__dirname, 'tests')
 };
-var getRunner = require('./utils').getRunner;
+var getRunner = require('./utils/runner').getRunner;
 
 describe('result-failure', function() {
 

test/result-fail.spec.js

@@ -3,7 +3,7 @@ var chaiAsPromised = require("chai-as-promised");
 chai.use(chaiAsPromised);
 var expect = chai.expect;
 
-var getRunner = require('./utils').getRunner;
+var getRunner = require('./utils/runner').getRunner;
 
 describe('result-pass', function() {
 

test/result-pass.spec.js

@@ -6,9 +6,7 @@ chai.use(spies);
 chai.use(chaiAsPromised);
 var expect = chai.expect;
 
-
-var getRunner = require('./utils').getRunner;
-
+var getRunner = require('./utils/runner').getRunner;
 
 describe('runner', function() {
 
@@ -21,13 +19,19 @@ describe('runner', function() {
   });
 
 
-  xit('should load environmental variables', function () {
-    var spy = chai.spy.on(handleLog);
+  it('should load environmental variables', function () {
     var files = [
       ['env-vars.js']
     ];
     var run = getRunner(files);
-    return expect(spy).to.have.been.called();
+    var expected = {
+      pass: true,
+      taskPosition: 1,
+      failedAtFile: null,
+      msg: 'env-vars should pass'
+    };
+
+    return expect(run).to.eventually.deep.equal(expected);
   });
 
 });

test/runner.spec.js

@@ -1,12 +1,10 @@
 var expect = require('chai').expect;
 
-describe('pass-01', function () {
-
-  console.log(process.env.DIR);
-  console.log(process.env.TUTORIAL_DIR);
-
+describe('env-vars', function () {
+  
   it('should pass', function () {
-    expect(true).to.be.true;
+    expect(process.env.DIR).to.be.a('string');
+    expect(process.env.TUTORIAL_DIR).to.be.a('string');
   });
 
 });

test/tests/env-vars.js

@@ -0,0 +1,6 @@
+var vm = require('vm');
+var fs = require('fs');
+module.exports = function loadContext(pathToContext) {
+  var context = fs.readFileSync(pathToContext, 'utf8');
+  vm.runInThisContext(context);
+};

test/utils/loadContext.js

@@ -8,11 +8,11 @@ function addPaths(files) {
   });
 }
 
-var runner = require('../src/runner').runner;
+var runner = require('../../src/runner').default;
 var rootDir = __dirname.split('/');
 var config = {
   dir: rootDir.slice(0, rootDir.length - 1).join('/'),
-  tutorialDir: __dirname + '/tests'
+  tutorialDir: path.join(__dirname, '..', '/tests')
 };
 function handleLog(log) {
   return log;