concat progress

Author: ShMcK

coderoad.json

@@ -267,12 +267,12 @@
               ]
             },
             {
-              "description": "`flatten` works as promised. Now `map` over the course data array, and `map` over the student array inside of the course data. Set `doubleArray` to return an array of array of objects that looks like this:\n```js\n {\n  \"title\": \"Relational Databases\",\n  \"instructor\": \"SQ Lewis\",\n  \"name\": \"Rebecca Heineman\",\n  \"score\": 71,\n  \"grade\": \"C\"\n  }\n```",
+              "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",
               "tests": [
                 "1/06/02-concat"
               ],
               "actions": [
-                "insert('\n// map over doubleArray twice\n// return an object with:\n//    course.title, course.instructor\n//    student.name, student.score, student.grade\nvar doubleArray = courses;\n')"
+                "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')"
               ]
             },
             {
@@ -281,7 +281,7 @@
                 "1/06/03-concat"
               ],
               "actions": [
-                "insert('\n// `flatten` doubleArray\nvar students = doubleArray;\n')"
+                "insert('// `flatten` doubleArray\nvar students = doubleArray;\n')"
               ]
             },
             {
@@ -290,7 +290,7 @@
                 "1/06/04-concat"
               ],
               "actions": [
-                "insert('\n\nvar suspects = [\"Hack Kerr\"];\n// filter to data matching `suspects`\nvar suspectData = students;\n')"
+                "insert('\nvar suspects = [\"Hack Kerr\"];\n// filter to data matching `suspects`\nvar suspectData = students;\n')"
               ]
             },
             {

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

@@ -1,6 +1,5 @@
 'use strict';
-var chai = require('chai');
-var expect = chai.expect;
+var expect = require('chai').expect;
 var loadJS = require('./common/loadJS').default;
 
 if (!global.courses) {
@@ -11,13 +10,13 @@ loadJS('06-concat.js');
 
 describe('01 var flattenedArray', function() {
 
-  it('should flatten the array', function() {
+  it('should flatten the array', function () {
     expect(flattenedArray).to.have.length(4);
+  });
+
+  it('should flatten the array', function() {
     expect(flattenedArray).to.deep.equal([1, 2, 3, 4]);
   });
 
-  // it('should use the `flatten` Array method', function() {
-  //   expect(spy).to.have.been.called.with([[1, 2], [3, 4]]);
-  // });
 
 });

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

@@ -1,22 +1,18 @@
 describe('02 var doubleArray', function() {
 
-  // it('should call map twice', function() {
-  //   expect(spy).to.have.been.called.at.least(2);
-  // });
+  it('should create an array of arrays', function() {
+    expect(doubleArray).to.have.length(10);
+    expect(doubleArray[0]).to.have.length(16);
+  });
 
   it('should create an array of arrays', function() {
-    var result = courses.map(function(course) {
-      return course.students.map(function(student) {
-        return {
-          title: course.title,
-          instructor: course.instructor,
-          name: student.name,
-          score: student.score,
-          grade: student.grade
-        };
-      });
+    expect(doubleArray[0][0]).to.deep.equal({
+      instructor: "Sean Quentin Lewis",
+      title: "Relational Databases",
+      name: "!f",
+      grade: "D",
+      score: 61
     });
-    expect(doubleArray).to.deep.equal(result);
   });
 
 });

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

@@ -1,21 +1,17 @@
 describe('03 var students', function() {
 
-  // it('should flatten the array with `.flatten()`', function() {
-  //   expect(spy).to.have.been.called.at.least(4)
-  // });
+  it('should have 160 items', function() {
+    expect(students).to.have.length(160);
+  });
 
   it('should result in a single array of student data', function() {
-    var result = courses.map(function(course) {
-      return course.students.map(function(student) {
-        return {
-          title: course.title,
-          instructor: course.instructor,
-          name: student.name,
-          score: student.score,
-          grade: student.grade
-        };
-      });
-    }).flatten();
-    expect(students).to.deep.equal(result);
+    expect(students[0]).to.deep.equal({
+      instructor: "Sean Quentin Lewis",
+      title: "Relational Databases",
+      name: "!f",
+      grade: "D",
+      score: 61
+    });
   });
+
 });

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

@@ -5,11 +5,17 @@ describe('04 var suspectData', function() {
   });
 
   it('should filter if the `indexOf` the suspects name is greater than -1', function() {
-    if (suspectData.length === 10) {
-      suspectData.forEach(function(suspect) {
-        expect(suspect.name).to.equal('Hack Kerr');
-      });
-    }
+    var hackKerrData = suspectData.filter(function(suspect) {
+      return suspect.name === 'Hack Kerr';
+    });
+    expect(hackKerrData).to.have.length(10);
+    expect(hackKerrData[0]).to.deep.equal({
+      title: 'Relational Databases',
+      instructor: 'Sean Quentin Lewis',
+      name: 'Hack Kerr',
+      score: 85,
+      grade: 'F'
+    });
   });
-
+  
 });

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

@@ -1,22 +1,21 @@
 describe('05 var suspectData', function() {
 
+  it('should have 30 items', function() {
+    expect(suspectData).to.have.length(30);
+  });
+
   it('should filter if the `indexOf` the suspects name is greater than -1', function() {
-    var result = courses.map(function(course) {
-      return course.students.map(function(student) {
-        return {
-          title: course.title,
-          instructor: course.instructor,
-          name: student.name,
-          score: student.score,
-          grade: student.grade
-        };
-      });
-    }).flatten();
-    var suspects = ['Hack Kerr', 'Kevin Mitnick', 'Albert Gonzalez'];
-    var suspectResult = result.filter(function(student) {
-      return suspects.indexOf(student.name) > -1;
+    var kevin = suspectData.filter(function(x) {
+      return x.name === 'Kevin Mitnick';
+    });
+    expect(kevin).to.have.length(10);
+    expect(kevin[0]).to.deep.equal({
+      grade: 'C',
+      instructor: 'Sean Quentin Lewis',
+      name: 'Kevin Mitnick',
+      score: 72,
+      title: 'Relational Databases'
     });
-    expect(suspectData).to.deep.equal(suspectResult);
   });
-
+  
 });

tutorial/1/06/concat.md

@@ -108,6 +108,7 @@ Array.prototype.flatten = function() {
 };
 ```
 ))
+
 @action(insert(
 ```
 
@@ -118,33 +119,33 @@ var flattenedArray = numberedList;
 ```  
 ))
 
-+ `flatten` works as promised. Now `map` over the course data array, and `map` over the student array inside of the course data. Set `doubleArray` to return an array of array of objects that looks like this:
-```js
- {
-  "title": "Relational Databases",
-  "instructor": "SQ Lewis",
-  "name": "Rebecca Heineman",
-  "score": 71,
-  "grade": "C"
-  }
-```
+
++ 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 doubleArray twice
-// return an object with:
-//    course.title, course.instructor
-//    student.name, student.score, student.grade
+// map over courses then
+// map over students inside of courses
+// return "title", "instructor",
+// "name", "grade", "score" fields
 var doubleArray = courses;
+
 ```
 ))
 
 + Use `flatten` to put all data into a single array. Set `students` to the result.
 @test('1/06/03-concat')
 @action(insert(
 ```
-
 // `flatten` doubleArray
 var students = doubleArray;
 ```
@@ -155,7 +156,6 @@ var students = doubleArray;
 @action(insert(
 ```
 
-
 var suspects = ["Hack Kerr"];
 // filter to data matching `suspects`
 var suspectData = students;