outline step 9 tasks and tests

ShMcK · ShMcK · commit 386c707da03c · 2016-08-14T17:01:07.000-07:00
diff --git a/README.md b/README.md
@@ -123,12 +123,9 @@ Creating a "SORT_BY_POPULARITY" action.
 ```js
 function sortByVotes(a, b) {
   switch(true) {
-   case a.votes < b.votes:
-    return 1;
-  case a.votes > b.votes:
-    return -1;
-  default:
-    return 0;
+   case a.votes < b.votes: return 1;
+   case a.votes > b.votes: return -1;
+   default: return 0;
   }
  }
 ```
diff --git a/coderoad.json b/coderoad.json
@@ -486,51 +486,88 @@
     },
     {
       "title": "Second Action",
-      "description": "Creating a \"SORT_BY_POPULARITY\" action.\n\n```js\nfunction sortByVotes(a, b) {\n  switch(true) {\n   case a.votes < b.votes:\n    return 1;\n  case a.votes > b.votes:\n    return -1;\n  default:\n    return 0;\n  }\n }\n```\n\nSort pokemon by votes",
+      "description": "Creating a \"SORT_BY_POPULARITY\" action.\n\n```js\nfunction sortByVotes(a, b) {\n  switch(true) {\n   case a.votes < b.votes: return 1;\n   case a.votes > b.votes: return -1;\n   default: return 0;\n  }\n }\n```\n\nSort pokemon by votes",
       "tasks": [
         {
-          "description": "create an action type for 'SORT_BY_POPULARITY'",
+          "description": "in \"src/pokemon/index.js\", create an action type for 'SORT_BY_POPULARITY'",
           "tests": [
             "09/01"
           ],
           "actions": [
             "open('src/pokemon/index.js')"
+          ],
+          "hints": [
+            "Try this: `const SORT_BY_POPULARITY = 'SORT_BY_POPULARITY';`"
           ]
         },
         {
-          "description": "create an action creator called 'sortByPopularity'",
+          "description": "create the action creator called 'sortByPopularity' and export it",
           "tests": [
             "09/02"
+          ],
+          "hints": [
+            "It should be a function that returns `{ type: SORT_BY_POPULARITY }`",
+            "Try this: `const sortByPopularity = () => ({ ... })`",
+            "It should be exported using `export`"
           ]
         },
         {
-          "description": "dispatch a `sortByPopularity` action after the two voteUp dispatches",
+          "description": "import `sortByPopularity` in \"src/index.js\".",
           "tests": [
             "09/03"
+          ],
+          "hints": [
+            "Try this: `import { sortByPopularity } from './pokemon';`"
           ]
         },
         {
-          "description": "add a `SORT_BY_POPULARITY` case that returns `pokemon.sort();`",
+          "description": "in \"src/index.js\", dispatch a `sortByPopularity` action at the bottom of the page",
           "tests": [
             "09/04"
+          ],
+          "hints": [
+            "use `store.dispatch(actionCreator)`",
+            "Try this: `store.dispatch(sortByPopularity())`"
           ]
         },
         {
-          "description": "create a sortByVotes function and pass it into the pokemon.sort function",
+          "description": "add a `SORT_BY_POPULARITY` case that returns `pokemon.sort();`",
           "tests": [
             "09/05"
+          ],
+          "hints": [
+            "Try this: `case SORT_BY_POPULARITY: return pokemon.sort()`"
           ]
         },
         {
-          "description": "Make a `sortByKey` function, which is more reusable, by wrapping it in a function that takes a key",
+          "description": "use the `sortByVotes` function and pass it into the `pokemon.sort` function. Sorting function return 1, -1, or 0 depending on where the index of b should be arranged around a.",
           "tests": [
             "09/06"
+          ],
+          "hints": [
+            "Try this: `case SORT_BY_POPULARITY: return pokemon.sort(sortByVotes)`"
+          ],
+          "actions": [
+            "insert('\nfunction sortByVotes(a, b) {\n  switch(true) {\n    case a.votes > b.votes:\n      return 1;\n    case a.votes < b.votes:\n      return -1;\n    default: return 0;\n  }\n}\n\n')"
           ]
         },
         {
-          "description": "You've just created a **thunk** - a function that returns a function. Pass your function into the pokemon.sort() method and give it the key of 'votes'",
+          "description": "Use the `sortByKey` function, which is more reusable. It should take a param of \"key\" and return a function similar to `sortByVotes`, but sorting on the \"key\" param.",
           "tests": [
             "09/07"
+          ],
+          "actions": [
+            "insert('\nfunction sortByKey(key) {\n  return function(a, b) {\n\n    // sorting cases here\n\n  }\n}\n')"
+          ]
+        },
+        {
+          "description": "You've just created a **thunk** - a function that returns a function. Pass your function into the `pokemon.sort()` method and give it the key of 'votes'",
+          "tests": [
+            "09/08"
+          ],
+          "hints": [
+            "Try this: `sortByKey('votes')`",
+            "Try this: pokemon.sort(sortByKey('votes'))"
           ]
         }
       ],
diff --git a/tutorial/02/02.js b/tutorial/02/02.js
@@ -1,8 +1,7 @@
 describe('02 createStore', () => {
 
-  const createStore = indexJs.__get__('createStore');
-
   it('isn\'t imported. `import { createStore } from "redux";`', () => {
+    const createStore = indexJs.__get__('createStore');
     expect(createStore).to.not.be.undefined;
   });
 
diff --git a/tutorial/06/03.js b/tutorial/06/03.js
@@ -12,8 +12,4 @@ describe('03 defaultPokemon', () => {
     expect(defaultPokemon[0].name).to.equal('Luvdisc');
   });
 
-  // it('should be the default param for state in the pokemon reducer', () => {
-  //   expect(pokemon(undefined, { type: 'ANY' })).to.deep.equal(defaultPokemon);
-  // });
-
 });
diff --git a/tutorial/06/04.js b/tutorial/06/04.js
@@ -1,7 +1,8 @@
 describe('04 pokemon reducer first param "state"', () => {
 
   it('should have a default value of `defaultPokemon`', () => {
-    
+    const regex = /=\s?defaultPokemon\s?,/;
+    expect(pokemon.toString()).to.match(regex);
   });
 
 });
diff --git a/tutorial/06/07.js b/tutorial/06/07.js
@@ -1,8 +1,7 @@
 describe('07 combineReducers', () => {
 
-  const combineReducers = indexJs.__get__('combineReducers');
-
   it('should be loaded', () => {
+    const combineReducers = indexJs.__get__('combineReducers');
     expect(combineReducers).to.not.be.undefined;
   });
 
diff --git a/tutorial/08/02.js b/tutorial/08/02.js
@@ -2,7 +2,7 @@ describe('02 createStore', () => {
 
   it('should call applyMiddleware', () => {
     const regex = /^[a-z]+\sstore\s?=.*applyMiddleware\(.+\)/m;
-    expect(indexJs.__text__.to.match(regex);
+    expect(indexJs.__text__).to.match(regex);
   });
 
 });
diff --git a/tutorial/08/05.js b/tutorial/08/05.js
@@ -7,7 +7,8 @@ describe('05 logger', () => {
   });
 
   it('should be set to `createLogger()`', () => {
-
+    expect(typeof logger).to.equal('function');
+    expect(logger.toString()).to.match(/logEntry/);
   });
 
 });
diff --git a/tutorial/09/01.js b/tutorial/09/01.js
@@ -1,11 +1,7 @@
-const chai = require('chai');
-const spies = require('chai-spies');
-const expect = chai.expect;
-chai.use(spies);
+const { expect } = require('chai');
 
-let spy = chai.spy.on(console, 'log');
-
-const pokemonIndexJs = require('BASE/pokemon/index.js');
+const indexJs = require('BASE/src/index.js');
+const pokemonIndexJs = require('BASE/src/pokemon/index.js');
 
 describe('01 SORT_BY_POPULARITY action type', () => {
 
diff --git a/tutorial/09/02.js b/tutorial/09/02.js
@@ -1,13 +1,19 @@
 describe('02 sortByPopularity action creator', () => {
 
   const sortByPopularity = pokemonIndexJs.__get__('sortByPopularity');
+  const action = { type: 'SORT_BY_POPULARITY' };
 
   it('doesn\'t exist', () => {
     expect(sortByPopularity).to.not.be.undefined;
   });
 
-  it('should equal the string "SORT_BY_POPULARITY"', () => {
-    expect(sortByPopularity()).to.equal({ type: 'SORT_BY_POPULARITY' });
+  it('should output an object with a type of "SORT_BY_POPULARITY"', () => {
+    expect(sortByPopularity()).to.deep.equal(action);
+  });
+
+  it('should be exported', () => {
+    expect(require('BASE/src/pokemon/index.js').sortByPopularity())
+      .to.deep.equal(action);
   });
 
 });
diff --git a/tutorial/09/03.js b/tutorial/09/03.js
@@ -1,5 +1,9 @@
-describe('03 dispatch sortByPopularity action', () => {
+describe('03 sortByPopularity', () => {
 
-  
+  it('should be imported in "src/index.js"', () => {
+    const sortByPopularity = indexJs.__get__('sortByPopularity');
+    expect(sortByPopularity).to.not.be.undefined;
+    expect(typeof sortByPopularity).to.equal('function');
+  });
 
 });
diff --git a/tutorial/09/04.js b/tutorial/09/04.js
@@ -1,5 +1,8 @@
-describe('04 SORT_BY_POPULARITY reducer case', () => {
-
+describe('04 sortByPopularity action', () => {
 
+  it('should be dispatched', () => {
+    const regex = /store.dispatch\s?\(\s?sortByPopularity\(\s?\)\s?)/;
+    expect(indexJs.__text__).to.match(regex);
+  });
 
 });
diff --git a/tutorial/09/05.js b/tutorial/09/05.js
@@ -1,5 +1,15 @@
-describe('05 sortByVotes function', () => {
+describe('05 pokemon reducer', () => {
 
+  const pokemon = pokemonIndexJs.__get__('pokemon');
 
+  it('has a SORT_BY_POPULARITY case', () => {
+    const regex = /case\s?+SORT_BY_POPULARITY/;
+    expect(pokemon.toString()).to.match(regex);
+  });
+
+  it('case SORT_BY_POPULARITY should sort pokemon', () => {
+    const regex = /pokemon.sort(.*)/;
+    expect(pokemon.toString()).to.match(regex);
+  });
 
 });
diff --git a/tutorial/09/06.js b/tutorial/09/06.js
@@ -1,5 +1,36 @@
-describe('06 sortByKey function', () => {
+describe('06 sortByVotes function', () => {
 
+  if (Number(process.env.TASK_POSITION) <= 5) {
 
+    const sortByVotes = pokemonIndexJs.__get__('sortByVotes');
+
+    it('doesn\'t exist', () => {
+      expect(sortByVotes).to.not.be.undefined;
+    });
+
+    it('should be a function', () => {
+      expect(typeof sortByVotes).to.equal('function');
+    });
+
+    it('case SORT_BY_POPULARITY should sort pokemon', () => {
+      const pokemon = pokemonIndexJs.__get__('pokemon');
+      const regex = /pokemon.sort(.*sortBy.*)/;
+      expect(pokemon.toString()).to.match(regex);
+    });
+
+    it('should sort a list of objects with vote', () => {
+      const list = [{votes: 3}, {votes: 1}, {votes: 2}];
+      expect(list.sort(sortByVotes)).to.not.deep.equal(list);
+    });
+
+    it('should sort a list in descending order', () => {
+      const list = [{votes: 3}, {votes: 1}, {votes: 2}];
+      const expected = [{votes: 3}, {votes: 2}, {votes: 1}];
+      expect(list.sort(sortByVotes)).to.deep.equal(expected);
+    });
+
+  } else {
+    it('passes', () => expect(true).to.be(true));
+  }
 
 });
diff --git a/tutorial/09/07.js b/tutorial/09/07.js
@@ -1,5 +1,29 @@
-describe('07 sorted pokemon', () => {
+describe('07 sortByKey function', () => {
 
+  const sortByKey = pokemonIndexJs.__get__('sortByKey');
+
+  it('doesn\'t exist', () => {
+    expect(sortByKey).to.not.be.undefined;
+  });
+
+  it('should be a function', () => {
+    expect(typeof sortByKey).to.equal('function');
+  });
+
+  it('should take a key as a param', () => {
+    expect(sortByKey).to.have.length(1);
+  });
+
+  it('should sort a list of objects by a key', () => {
+    const list = [{a: 3}, {a: 1}, {a: 2}];
+    expect(list.sort(sortByKey('a'))).to.not.deep.equal(list);
+  });
+
+  it('should sort a list in descending order', () => {
+    const list = [{a: 3}, {a: 1}, {a: 2}];
+    const expected = [{a: 3}, {a: 2}, {a: 1}];
+    expect(list.sort(sortByKey('a'))).to.deep.equal(expected);
+  });
 
 
 });
diff --git a/tutorial/09/08.js b/tutorial/09/08.js
@@ -0,0 +1,9 @@
+describe('08 pokemon case SORT_BY_POPULARITY', () => {
+
+  it('should call sortByKey with "votes" passed in', () => {
+    const pokemon = pokemonIndexJs.__get__('pokemon');
+    const regex = /pokemon.sort(.*sortByKey\s?\(["'`]votes["'`]\).*)/;
+    expect(pokemon.toString()).to.match(regex);
+  });
+
+});
diff --git a/tutorial/09/index.md b/tutorial/09/index.md
