tutorial update for mocha 0.10 complete

Author: ShMcK

README.md

@@ -460,9 +460,7 @@ You may have noticed we've already used `reduce` to `flatten` our arrays.
 
 ```js
 Array.prototype.flatten = function() {
-  return this.reduce(function(a, b) {
-    return a.concat(b);
-  }, []);
+  return this.reduce((a, b) => a.concat(b), []);
 };
 ```
 

coderoad.json

@@ -16,7 +16,7 @@ describe('06 const newSuspects', () => {
 
 });
 
-describe('05 const suspectData', () => {
+describe('06 const suspectData', () => {
 
   const suspectData = concat.__get__('suspectData');
 

tutorial/06/06.js

@@ -795,9 +795,7 @@ import courses from './data/courses2';
 
 // Array.prototype can be used to create new Array methods
 Array.prototype.flatten = function() {
-  return this.reduce(function(a, b) {
-    return a.concat(b);
-  }, []);
+  return this.reduce((a, b) => a.concat(b), []);
 };
 ```
 ))
@@ -827,8 +825,8 @@ Return the fields:
 
 // map over courses then
 // map over students inside of courses
-const doubleArray = courses.map(function(course) {
-    return course.students.map(function(student) {
+const doubleArray = courses.map((course) => {
+    return course.students.map((student) => {
       return {
         // fill in the fields
         title: ::>'',
@@ -855,7 +853,7 @@ const students = doubleArray::>;
 ))
 @hint('call `.flatten()` on `doubleArray`')
 
-+ Use the `suspects` array to `filter` to only "Hack Kerr"'s data
++ Use the `suspects` array to `filter` to only data matching the names in the `suspects` array
 @test('06/05')
 @action(insert(
 ```

tutorial/06/concat.md

@@ -1,13 +1,9 @@
-const expect = require('chai').expect;
+describe('01 suspectData', () => {
 
-const reduce = require('BASE/07-reduce.js');
+  const suspectData = require('BASE/data/suspectData.js');
 
-describe('01 const total', () => {
-
-  const total = reduce.__get__('total');
-
-	it('should add the numbers up', () => {
-		expect(total).to.equal(54);
-	});
+  it('should be loaded in "data/suspectData.js"', () => {
+    expect(suspectData).to.be.defined;
+  });
 
 });

tutorial/07/01.js

@@ -1,9 +1,13 @@
-describe('02 const averages', () => {
+const expect = require('chai').expect;
 
-  const averages = reduce.__get__('averages');
+const reduce = require('BASE/07-reduce.js');
 
-  it('should calculate the average of each class', () => {
-    expect(averages).to.deep.equal([57, 67, 70, 70, 71, 62, 67, 73, 62, 57]);
-  });
+describe('02 const total', () => {
+
+  const total = reduce.__get__('total');
+
+	it('should add the numbers up', () => {
+		expect(total).to.equal(54);
+	});
 
 });

tutorial/07/02.js

@@ -1,9 +1,9 @@
-describe('03 suspectData', () => {
+describe('03 const averages', () => {
 
-  const suspectData = require('BASE/data/suspectData.js');
+  const averages = reduce.__get__('averages');
 
-  it('should be loaded in "data/courses2.js"', () => {
-    expect(suspectData).to.be.defined;
+  it('should calculate the average of each class', () => {
+    expect(averages).to.deep.equal([57, 67, 70, 70, 71, 62, 67, 73, 62, 57]);
   });
 
 });

tutorial/07/03.js

@@ -37,60 +37,16 @@ You may have noticed we've already used `reduce` to `flatten` our arrays.
 
 ```js
 Array.prototype.flatten = function() {
-  return this.reduce(function(a, b) {
-    return a.concat(b);
-  }, []);
+  return this.reduce((a, b) => a.concat(b), []);
 };
 ```
 
 With `flatten`, the initialValue was set to an empty array which each value was `concat` onto.
 
 Do some practice with `reduce`, before you use it to narrow down a cheating suspect.
 
-
-+ Use `reduce` to sum the numbers in the `practice` array
++ load suspectData. We will come back to this after some practice;
 @test('07/01')
-@action(open('07-reduce.js'))
-@action(set(
-```
-import courses from './data/courses2';
-// Array.reduce(fn(a, b), initialValue)
-
-const practice = [1, 1, 2, 3, 5, 8, 13, 21];
-
-function add(a, b) {
-  return a + b;
-}
-
-// total the numbers using a reduce function
-const total = practice.reduce(::>);
-```
-))
-@hint('with only numbers, the initialValue defaults to 0')
-@hint('just call `reduce` with `add`')
-
-+ Not all reduce functions are so easy. `reduce` is a little more difficult to master.
-
-`map` over each course and use `reduce` to calculate the class averages for each class. Set `averages` to the resulting array of all class averages.
-@test('07/02')
-@action(insert(
-```
-
-const averages = courses.map(function(course) {
-  const sum = course.students.reduce(function(total, student) {
-    ::>
-
-  });
-  return Math.round(sum / course.students.length, 0);
-});
-```
-))
-@hint('set the initialValue to 0')
-@hint('like this: `reduce(function () {}, 0)`')
-@hint('return the sum of `student.score` and `total`')
-
-+ load suspectData
-@test('07/03')
 @action(open('data/suspectData.js'))
 @action(set(
 ```
@@ -279,6 +235,46 @@ export default suspectData;
 ```  
 ))
 
++ Use `reduce` to sum the numbers in the `practice` array
+@test('07/02')
+@action(open('07-reduce.js'))
+@action(set(
+```
+import courses from './data/courses2';
+// Array.reduce(fn(a, b), initialValue)
+
+const practice = [1, 1, 2, 3, 5, 8, 13, 21];
+
+function add(a, b) {
+  return a + b;
+}
+
+// total the numbers using a reduce function
+const total = practice.reduce(::>);
+```
+))
+@hint('with only numbers, the initialValue defaults to 0')
+@hint('just call `reduce` with `add`')
+
++ Not all reduce functions are so easy. `reduce` is a little more difficult to master.
+
+`map` over each course and use `reduce` to calculate the class averages for each class. Set `averages` to the resulting array of all class averages.
+@test('07/03')
+@action(insert(
+```
+
+const averages = courses.map((course) => {
+  const sum = course.students.reduce((total, student) => {
+    ::>
+
+  });
+  return Math.round(sum / course.students.length, 0);
+});
+```
+))
+@hint('set the initialValue to 0')
+@hint('like this: `reduce(function () {}, 0)`')
+@hint('return the sum of `student.score` and `total`')
 
 + `reduce` to an array of suspect scores from the `suspectData` we collected previously.
 @test('07/04')
@@ -287,11 +283,9 @@ export default suspectData;
 ```
 
 // [{ name: 'suspectName', scores: [ 50, 65, 75, 85...] } ...]
-const suspectScores = suspectData.reduce(function(total, next) {
+const suspectScores = suspectData.reduce((total, next) => {
   // see if suspect name has a list yet
-  const index = total.findIndex(function(suspect) {
-    return suspect.name === next.name;
-  });
+  const index = total.findIndex((suspect) => suspect.name === next.name);
   if (index < 0) {
     total.push({
       ::>
@@ -323,7 +317,7 @@ const suspectScores = suspectData.reduce(function(total, next) {
 @action(insert(
 ```
 
-const suspectStats = suspectScores.map(function(suspect) {
+const suspectStats = suspectScores.map((suspect) => {
     // calculate the total difference in scores from the averages
     const difference = suspect.scores.reduce(::>);
 
@@ -352,7 +346,7 @@ function isCheater(suspect) {
 }
 
 // reduce down to a string of likely suspects
-const likelySuspects = suspectStats.reduce(function(::>) {}, []);
+const likelySuspects = suspectStats.reduce((::>) => {}, []);
 ```
 ))
 @hint('use `.join(', ')`')