change to use loadEditor, loadGlobal

Author: ShMcK

package.json

@@ -1,6 +1,6 @@
 {
   "name": "coderoad-functional-school",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "Coderoad tutorial",
   "author": "Shawn McKay <shawn.j.mckay@gmail.com> (http://shmck.com)",
   "contributers": [
@@ -27,9 +27,9 @@
   "dependencies": {
     "chai": "3.5.0",
     "chai-spies": "0.7.1",
-    "lodash": "4.5.1",
+    "lodash": "4.6.1",
     "mocha": "2.4.5",
-    "mocha-coderoad": "^0.4.2"
+    "mocha-coderoad": "^0.5.3"
   },
   "license": "MIT",
   "config": {

tutorial/1/00/01-setup.spec.js

@@ -2,18 +2,11 @@
 var chai = require('chai');
 var spies = require('chai-spies');
 var expect = chai.expect;
-var path = require('path');
 chai.use(spies);
 
-var loadJS = require(path.join(process.env.TUTORIAL_DIR, 'loadJS')).default;
-
-if (!global.data) {
-  let data = require(path.join(process.env.TUTORIAL_DIR, 'data', 'students.json'));
-  global.data = JSON.parse(JSON.stringify(data));
-}
-
+loadGlobal('data', 'data/students.json');
 var spy = chai.spy.on(console, 'log');
-loadJS('00-setup.js');
+loadEditor('00-setup.js');
 
 describe('01 first', function () {
 

tutorial/1/01/01-filter.spec.js

@@ -1,13 +1,8 @@
 "use strict";
 var expect = require('chai').expect;
-var path = require('path');
-var loadJS = require(path.join(process.env.TUTORIAL_DIR, 'loadJS')).default;
 
-if (!global.data) {
-  global.data = JSON.parse(JSON.stringify(require(path.join(process.env.TUTORIAL_DIR, 'data', 'students.json'))));
-}
-
-loadJS('01-filter.js');
+loadGlobal('data', 'data/students.json');
+loadEditor('01-filter.js');
 
 describe('01 function isAda', function() {
 

tutorial/1/02/01-sort.spec.js

@@ -1,10 +1,7 @@
 var expect = require('chai').expect;
-var path = require('path');
-var loadJS = require(path.join(process.env.TUTORIAL_DIR, 'loadJS')).default;
-if (!global.myBest) {
-  global.myBest = JSON.parse(JSON.stringify(require(path.join(process.env.TUTORIAL_DIR, '1', '02', 'myBest.json'))));
-}
-loadJS('02-sort.js');
+
+loadGlobal('myBest', '1/02/myBest.json');
+loadEditor('02-sort.js');
 
 describe('01 function compareScore', function () {
   it('doesn\'t exist', function() {

tutorial/1/03/01-map.spec.js

@@ -1,10 +1,7 @@
 var expect = require('chai').expect;
-var path = require('path');
-var loadJS = require(path.join(process.env.TUTORIAL_DIR, 'loadJS')).default;
-if (!global.myData) {
-  global.myData = JSON.parse(JSON.stringify(require(path.join(process.env.TUTORIAL_DIR, '1', '03', 'myData.json'))));
-}
-loadJS('03-map.js')
+
+loadGlobal('myData', '1/03/myData.json');
+loadEditor('03-map.js');
 
 describe('01 function changeGrade', function() {
 

tutorial/1/04/01-forEach.spec.js

@@ -3,17 +3,13 @@ var chai = require('chai');
 var spies = require('chai-spies');
 var expect = chai.expect;
 chai.use(spies);
-var path = require('path');
-var loadJS = require(path.join(process.env.TUTORIAL_DIR, 'loadJS')).default;
-
-global.myFixed = JSON.parse(JSON.stringify(require(path.join(process.env.TUTORIAL_DIR, '1', '04', 'myFixed.json'))));
 
+loadGlobal('myFixed', '1/04/myFixed.json');
 if (process.env.TASK_POSITION === '4') {
   global.myFixed = [];
 }
-
 var spy = chai.spy.on(console, 'log');
-loadJS('04-forEach.js');
+loadEditor('04-forEach.js');
 
 describe('01 console.log', function() {
 

tutorial/1/05/01-find.spec.js

@@ -1,13 +1,9 @@
 'use strict';
 var expect = require('chai').expect;
 var spies = require('chai-spies');
-var path = require('path');
-var loadJS = require(path.join(process.env.TUTORIAL_DIR, 'loadJS')).default;
 
-if (!global.students) {
-  global.students = JSON.parse(JSON.stringify(require(path.join(process.env.TUTORIAL_DIR, 'data', 'students2.json'))));
-}
-loadJS('05-find.js');
+loadGlobal('students', 'data/students2.json');
+loadEditor('05-find.js');
 
 describe('01 var myClass', function() {
 

tutorial/1/06/01-concat.spec.js

@@ -1,13 +1,8 @@
 'use strict';
 var expect = require('chai').expect;
-var path = require('path');
-var loadJS = require(path.join(process.env.TUTORIAL_DIR, 'loadJS')).default;
 
-if (!global.courses) {
-  global.courses = JSON.parse(JSON.stringify(require(path.join(process.env.TUTORIAL_DIR, 'data', 'courses2.json'))));
-}
-
-loadJS('06-concat.js');
+loadGlobal('data/courses2.json');
+loadEditor('06-concat.js');
 
 describe('01 var flattenedArray', function() {
 

tutorial/1/07/01-reduce.spec.js

@@ -1,14 +1,9 @@
 "use strict";
 var expect = require('chai').expect;
-var path = require('path');
-var loadJS = require(path.join(process.env.TUTORIAL_DIR, 'loadJS')).default;
 
-if (!global.courses) {
-  global.courses = JSON.parse(JSON.stringify(require(path.join(process.env.TUTORIAL_DIR, 'data', 'courses2.json'))));
-  global.suspectData = JSON.parse(JSON.stringify(require(path.join(process.env.TUTORIAL_DIR, '1', '07', 'suspectData.json'))));
-}
-
-loadJS('07-reduce.js');
+loadGlobal('courses', 'data/courses2.json');
+loadGlobal('suspectData', '1/07/suspectData.json');
+loadEditor('07-reduce.js');
 
 describe('01 var total', function() {