init demo updates

Author: ShMcK

README.md

@@ -25,8 +25,8 @@ Some basic methods in Javascript
 
 ##### Filter
 
-Last semester's grades just came in, but there's just too much data.
+We'll start by looking at the `filter` method.
 
 ##### Map
 
-Now that we've filtered down our data, let's make some changes.
+Map is used to run a function over data in an array.

coderoad.json

@@ -9,8 +9,8 @@
       "pages": [
         {
           "title": "Filter",
-          "description": "Last semester's grades just came in, but there's just too much data.",
-          "explanation": "Use the `filter` method to shorten the data to only what you need.\n\n```\n['a', 'b', 'c'].filter(function(item) {\n  return item === 'a';\n});\n// ['a']\n```",
+          "description": "We'll start by looking at the `filter` method.",
+          "explanation": "Last semester's grades just came in, but there's just too much data.\n\nUse the `filter` method to shorten the data to only what you need.\n\n```\n['a', 'b', 'c'].filter(function(item) {\n  return item === 'a';\n});\n// ['a']\n```",
           "tasks": [
             {
               "description": "Set `var myData` equal to `filter`ed down data with your name: \"Jane\".",
@@ -19,24 +19,28 @@
               ],
               "actions": [
                 "open('filter.js')",
-                "('')",
-                "insert('var data = [  { name: \"Joe\", class: \"Computer Science\", grade: \"C\" },  { name: \"Jane\", class: \"Computer Science\", grade: \"D\" },  { name: \"Mo\", class: \"Computer Science\", grade: \"B\" },  { name: \"Bob\", class: \"Computer Science\", grade: \"F\" },  { name: \"Joe\", class: \"Math\", grade: \"C\" },  { name: \"Jane\", class: \"Math\", grade: \"B\" },  { name: \"Mo\", class: \"Math\", grade: \"D\" },  { name: \"Bob\", class: \"Math\", grade: \"A\" },  { name: \"Joe\", class: \"Art\", grade: \"C\" },  { name: \"Jane\", class: \"Art\", grade: \"F\" },  { name: \"Mo\", class: \"Art\", grade: \"B\" },   { name: \"Bob\", class: \"Math\", grade: \"F\" },  ]')"
+                "set('var data = [\n  { name: \"Joe\", class: \"Computer Science\", grade: \"C\" },\n  { name: \"Jane\", class: \"Computer Science\", grade: \"D\" },\n  { name: \"Mo\", class: \"Computer Science\", grade: \"B\" },\n  { name: \"Bob\", class: \"Computer Science\", grade: \"F\" },\n  { name: \"Joe\", class: \"Math\", grade: \"C\" },\n  { name: \"Jane\", class: \"Math\", grade: \"B\" },\n  { name: \"Mo\", class: \"Math\", grade: \"D\" },\n  { name: \"Bob\", class: \"Math\", grade: \"A\" },\n  { name: \"Joe\", class: \"Art\", grade: \"C\" },\n  { name: \"Jane\", class: \"Art\", grade: \"F\" },\n  { name: \"Mo\", class: \"Art\", grade: \"B\" },\n  { name: \"Bob\", class: \"Math\", grade: \"F\" }\n];\n')",
+                "insert('var myData = data.filter(function(item) {\n    return // filter condition\n});')"
               ]
             },
             {
-              "description": "Set `var myFails` to `filter`ed down data with failing grades (\"D\" or \"F\").",
+              "description": "Set `var myFails` to `filter`ed down your data to find only your failing grades (\"D\" or \"F\").",
               "tests": [
                 "1/filter/filter-02"
+              ],
+              "actions": [
+                "insert('var myFails = myData.filter(\n// add filter here\n)')"
               ]
             }
           ]
         },
         {
           "title": "Map",
-          "description": "Now that we've filtered down our data, let's make some changes."
+          "description": "Map is used to run a function over data in an array.",
+          "explanation": "Now that we've filtered down our data, let's make some changes."
         }
       ],
       "description": "Some basic methods in Javascript"
     }
   ]
-}
+}

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

@@ -1,12 +1,11 @@
-var expect = require('chai').expect;
 
+var expect = require('chai').expect;
 // use to ensure a specific method has been called
-var spies = require('chai-spies');
-chai.use(spies);
+// var spies = require('chai-spies');
 
 // loads file context to allow globals
 var context = require('test-context');
-var filePath = path.join('..', '..', '..', 'filter.js');
+var filePath = '../../../../../filter.js';
 context(filePath);
 
 describe('var myData', function() {
@@ -23,16 +22,16 @@ describe('var myData', function() {
     expect(myData.length).to.equal(3);
   });
 
-  it('should use the array filter method', function() {
-    var spy = chai.spy.on(data, 'filter');
-    expect(spy).to.be(true);
-  });
+  // it('should use the array filter method', function() {
+  //   var spy = chai.spy.on(data, 'filter');
+  //   expect(spy).to.be(true);
+  // });
 
   it('isn\'t the right data for Jane', function() {
-    expect(myData).to.equal([
+    expect(myData).to.deep.equal([
       { name: "Jane", class: "Computer Science", grade: "D" },
       { name: "Jane", class: "Math", grade: "B" },
-      { name: "Jane", class: "Art", grade: "A" }
+      { name: "Jane", class: "Art", grade: "F" }
     ]);
   });
 

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

@@ -1,7 +1,7 @@
+
 var expect = require('chai').expect;
 var context = require('test-context');
-var filePath = path.join('..', '..', '..', 'filter.js');
-context(filePath);
+context('../../../../../filter.js');
 
 describe('var myData', function() {
 
@@ -13,12 +13,12 @@ describe('var myData', function() {
     expect(myFails).to.be.an('array');
   });
 
-  it('doesn\'t have three items', function() {
+  it('doesn\'t have exactly two items', function() {
     expect(myFails.length).to.equal(2);
   });
 
   it('isn\'t the right data for Jane', function() {
-    expect(myData).to.equal([
+    expect(myFails).to.deep.equal([
       { name: "Jane", class: "Computer Science", grade: "D" },
       { name: "Jane", class: "Art", grade: "F" }
     ]);

tutorial/1/filter/filter.md

@@ -1,4 +1,6 @@
 ### Filter
+We'll start by looking at the `filter` method.
+
 Last semester's grades just came in, but there's just too much data.
 
 Use the `filter` method to shorten the data to only what you need.
@@ -13,10 +15,9 @@ Use the `filter` method to shorten the data to only what you need.
 + Set `var myData` equal to `filter`ed down data with your name: "Jane".
 @test('1/filter/filter-01')
 @action(open('filter.js'))
-@action(insert('// Welcome'));
-@action(insert(
-  ```
-  var data = [
+@action(set(
+```
+var data = [
   { name: "Joe", class: "Computer Science", grade: "C" },
   { name: "Jane", class: "Computer Science", grade: "D" },
   { name: "Mo", class: "Computer Science", grade: "B" },
@@ -27,10 +28,22 @@ Use the `filter` method to shorten the data to only what you need.
   { name: "Bob", class: "Math", grade: "A" },
   { name: "Joe", class: "Art", grade: "C" },
   { name: "Jane", class: "Art", grade: "F" },
-  { name: "Mo", class: "Art", grade: "B" },   { name: "Bob", class: "Math", grade: "F" },
-  ]
+  { name: "Mo", class: "Art", grade: "B" },
+  { name: "Bob", class: "Math", grade: "F" }
+];
+
 ```
 ))
+@action(insert(
+```
+var myData = data.filter(function(item) {
+    return // filter condition
+});
+```))
 
-+ Set `var myFails` to `filter`ed down data with failing grades ("D" or "F").
++ Set `var myFails` to `filter`ed down your data to find only your failing grades ("D" or "F").
 @test('1/filter/filter-02')
+@action(insert(
+```
+var myFails = myData.filter() // add filter here
+```))

tutorial/1/map/map.md

@@ -1,2 +1,4 @@
 ### Map
+Map is used to run a function over data in an array.
+
 Now that we've filtered down our data, let's make some changes.