concat updated

Author: ShMcK

README.md

@@ -2,6 +2,10 @@
 
 A trip through functional programming in Javascript.
 
+Level: Intermediate
+Keywords: javascript, functional
+Length: 1-2 hours
+
 
 ## CodeRoad
 

coderoad.json

@@ -1,7 +1,7 @@
 {
   "project": {
     "title": "Functional School",
-    "description": "A trip through functional programming in Javascript."
+    "description": "A trip through functional programming in Javascript.\n\nLevel: Intermediate\nKeywords: javascript, functional\nLength: 1-2 hours"
   },
   "chapters": [
     {
@@ -267,12 +267,12 @@
               ]
             },
             {
-              "description": "Now `map` over the courses array, and `map` over the students array inside of it.\n\nReturn the fields:\n\n  * title\n  * instructor\n  * name\n  * grade\n  * score",
+              "description": "Now `map` over the courses array, and `map` over the students array inside of it.\nReturn the fields:\n\n  * title\n  * instructor\n  * name\n  * grade\n  * score",
               "tests": [
                 "1/06/02-concat"
               ],
               "actions": [
-                "insert('// map over courses then\n// map over students inside of courses\n// return \"title\", \"instructor\",\n// \"name\", \"grade\", \"score\" fields\nvar doubleArray = courses;\n\n')"
+                "insert('\n// map over courses then\n// map over students inside of courses\nvar doubleArray = courses;\n\n')"
               ]
             },
             {
@@ -294,12 +294,9 @@
               ]
             },
             {
-              "description": "You just thought of two more suspects!  `concat` the new suspects array onto the `suspects` list.",
+              "description": "You just thought of two more suspects! Make a new variable called `newSuspects` and add it above `suspects`. Set `newSuspects` to `['Albert Gonzalez', 'Kevin Mitnick']`\n\n`concat` the `newSuspects` onto the `suspects` list.",
               "tests": [
                 "1/06/05-concat"
-              ],
-              "actions": [
-                "insert('\nvar newSuspects = [\"Kevin Mitnick\", \"Albert Gonzalez\"];\n')"
               ]
             }
           ]
@@ -316,7 +313,7 @@
               ],
               "actions": [
                 "open('07-reduce.js')",
-                "set('var practice = [1, 1, 2, 3, 5, 8, 13, 21];\n\n// total the numbers using a reduce function\n// hint: start at 0\nvar total = practice.reduce();\n')"
+                "set('var practice = [1, 1, 2, 3, 5, 8, 13, 21];\n\nfunction add(a, b) {\n  return a + b;\n}\n\n// total the numbers using a reduce function\n// hint: start at 0\nvar total = practice.reduce();\n')"
               ]
             },
             {
@@ -338,13 +335,13 @@
               ]
             },
             {
-              "description": "`map` over suspect data to find the `\"difference\"` from subtracting the students score from the average score. Add this to `suspectScores` using the key `difference`. The resulting array should look like this:\n```js\n[{\n  name: 'suspectName',\n  scores: [50, 65, 75, 85...],\n  difference: 15\n}]\n```",
+              "description": "`map` over suspect data to find the `\"difference\"` from subtracting the students score from the average score. Add this to `suspectScores` using the key `difference`. The resulting array should look like this:\n```js\n[{\n  name: 'suspectName',\n  scores: [50, 65, 75 ...],\n  difference: 15\n}]\n```",
               "tests": [
                 "1/07/04-reduce"
               ]
             },
             {
-              "description": "`reduce` down to any likely suspect names by filtering with the `isCheater` function",
+              "description": "`reduce` down to likely suspect names by filtering with the `isCheater` function",
               "tests": [
                 "1/07/05-reduce"
               ],

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

@@ -18,5 +18,4 @@ describe('01 var flattenedArray', function() {
     expect(flattenedArray).to.deep.equal([1, 2, 3, 4]);
   });
 
-
 });

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

@@ -1,7 +1,7 @@
 describe('04 var suspectData', function() {
 
   it('should have 10 items', function() {
-    expect(suspectData).to.have.length.above(9);
+    expect(suspectData).to.have.length.below(31);
   });
 
   it('should filter if the `indexOf` the suspects name is greater than -1', function() {
@@ -17,5 +17,5 @@ describe('04 var suspectData', function() {
       grade: 'F'
     });
   });
-  
+
 });

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

@@ -1,6 +1,22 @@
+describe('05 var newSuspects', function() {
+
+  it('should have "Albert Gonzalez" in the list', function() {
+    expect(newSuspects).to.contain('Albert Gonzalez');
+  });
+
+  it('should have "Kevin Mitnick" in the list', function() {
+    expect(newSuspects).to.contain('Kevin Mitnick');
+  });
+
+  it('should have only 2 names', function() {
+    expect(newSuspects).to.have.length(2);
+  });
+
+});
+
 describe('05 var suspectData', function() {
 
-  it('should have 30 items', function() {
+  it('should concat `newSuspects` onto `suspects`', function() {
     expect(suspectData).to.have.length(30);
   });
 
@@ -17,5 +33,5 @@ describe('05 var suspectData', function() {
       title: 'Relational Databases'
     });
   });
-  
+
 });

tutorial/1/06/concat.md

@@ -108,7 +108,6 @@ Array.prototype.flatten = function() {
 };
 ```
 ))
-
 @action(insert(
 ```
 
@@ -121,22 +120,19 @@ var flattenedArray = numberedList;
 
 
 + Now `map` over the courses array, and `map` over the students array inside of it.
-
 Return the fields:
 
   * title
   * instructor
   * name
   * grade
   * score
-
 @test('1/06/02-concat')
 @action(insert(
 ```
+
 // map over courses then
 // map over students inside of courses
-// return "title", "instructor",
-// "name", "grade", "score" fields
 var doubleArray = courses;
 
 ```
@@ -162,11 +158,7 @@ var suspectData = students;
 ```
 ))
 
-+ You just thought of two more suspects!  `concat` the new suspects array onto the `suspects` list.
-@test('1/06/05-concat')
-@action(insert(
-```
++ You just thought of two more suspects! Make a new variable called `newSuspects` and add it above `suspects`. Set `newSuspects` to `['Albert Gonzalez', 'Kevin Mitnick']`
 
-var newSuspects = ["Kevin Mitnick", "Albert Gonzalez"];
-```  
-))
+`concat` the `newSuspects` onto the `suspects` list.
+@test('1/06/05-concat')

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

@@ -1,23 +1,15 @@
 "use strict";
-var chai = require('chai');
-var expect = chai.expect;
-var spies = require('chai-spies');
-chai.use(spies);
+var expect = require('chai').expect;
 var loadJS = require('./common/loadJS').default;
 
 if (!global.courses) {
   global.courses = JSON.parse(JSON.stringify(require('./data/courses2.json')));
 }
 
-var spy = chai.spy.on(Array, 'reduce');
 loadJS('07-reduce.js');
 
 describe('01 var total', function() {
 
-  it('should call reduce', function() {
-    expect(spy).to.have.been.called();
-  });
-
   it('should add the numbers up', function () {
     expect(total).to.equal(54);
   });

tutorial/1/07/reduce.md

@@ -16,14 +16,17 @@ function add(prev, curr) {
 ```
 
 
-
 + Use `reduce` to sum the numbers in the `practice` array
 @test('1/07/01-reduce')
 @action(open('07-reduce.js'))
 @action(set(
 ```
 var practice = [1, 1, 2, 3, 5, 8, 13, 21];
 
+function add(a, b) {
+  return a + b;
+}
+
 // total the numbers using a reduce function
 // hint: start at 0
 var total = practice.reduce();
@@ -54,14 +57,14 @@ var suspectScores = courses.reduce();
 ```js
 [{
   name: 'suspectName',
-  scores: [50, 65, 75, 85...],
+  scores: [50, 65, 75 ...],
   difference: 15
 }]
 ```
 @test('1/07/04-reduce')
 
 
-+ `reduce` down to any likely suspect names by filtering with the `isCheater` function
++ `reduce` down to likely suspect names by filtering with the `isCheater` function
 @test('1/07/05-reduce')
 @action(insert(
 ```

tutorial/tutorial.md

@@ -1,6 +1,10 @@
 # Functional School
 A trip through functional programming in Javascript.
 
+Level: Intermediate
+Keywords: javascript, functional
+Length: 1-2 hours
+
 ## Array Methods
 Using common built-in Javascript array methods such as `map` & `reduce`.