polish step 7 steps

Author: ShMcK

coderoad.json

@@ -366,11 +366,11 @@
             "07/01"
           ],
           "hints": [
-            "create \"src/pokemon/index.js\""
+            "create a file in \"src/pokemon/index.js\""
           ]
         },
         {
-          "description": "take your `VOTE_UP` action type from \"index.js\" and put it in \"src/pokemon/index.js\"",
+          "description": "copy the `VOTE_UP` action type from \"index.js\" and put it in \"src/pokemon/index.js\". Keep the original version for now, so our app won't break yet.",
           "tests": [
             "07/02"
           ],
@@ -379,25 +379,41 @@
           ]
         },
         {
-          "description": "take your `voteUp` action creator from \"src/index.js\" and put it in \"src/pokemon/index.js\". Export it as a [\"named\" export](https://developer.mozilla.org/en/docs/web/javascript/reference/statements/export).",
+          "description": "also copy the `voteUp` action creator from \"src/index.js\" and put it in \"src/pokemon/index.js\". Export it as a [\"named\" export](https://developer.mozilla.org/en/docs/web/javascript/reference/statements/export).",
           "tests": [
             "07/03"
           ],
           "hints": [
             "move `voteUp` into \"src/pokemon/index.js\"",
-            "\"src/pokemon/index.js\" should have `const voteUp = id => ({ type: VOTE_UP, payload: { id } });`"
+            "\"src/pokemon/index.js\" should have `const voteUp = id => ({ type: VOTE_UP, payload: { id } });`",
+            "make it a named export: `export const voteUp` = ..."
           ]
         },
         {
-          "description": "take your `pokemon` reducer from \"src/index.js\" and put it in \"src/pokemon/index.js\". Export the reducer as a \"default\" export",
+          "description": "import `voteUp` inside of \"src/index.js\". Also delete the unnecessary 'voteUp' in the same file from before.",
           "tests": [
             "07/04"
+          ],
+          "hints": [
+            "Try this: `import { voteUp } from './pokemon';`"
           ]
         },
         {
-          "description": "in your \"src/index.js\" file, import the action creators and reducer in one line of code.",
+          "description": "take the `defaultPokemon` from \"src/index.js\" and copy it into \"src/pokemon/index.js\"",
           "tests": [
             "07/05"
+          ]
+        },
+        {
+          "description": "take your `pokemon` reducer from \"src/index.js\" and put it in \"src/pokemon/index.js\". Export the reducer as a \"default\" export",
+          "tests": [
+            "07/06"
+          ]
+        },
+        {
+          "description": "in your \"src/index.js\" file, also import your pokemon reducer. This can be on the same line of code. Delete the unnecessary original \"pokemon\", \"defaultPokemon\" and \"VOTE_UP\" as well.",
+          "tests": [
+            "07/07"
           ],
           "hints": [
             "Try this: `import { default as pokemon, voteUp } from './pokemon';`"

tutorial/07/01.js

@@ -1,14 +1,12 @@
 const expect = require('chai').expect;
-const { resolve } = require('path');
-const { readFileSync } = require('fs');
 
-const indexJs = require('BASE/index.js');
-const pokemonIndexJs = require('BASE/pokemon/index.js');
+const indexJs = require('BASE/src/index.js');
+const pokemonIndexJs = require('BASE/src/pokemon/index.js');
 
 describe('01 "pokemon" folder', () => {
 
   it('doesn\'t exist', () => {
-    expect(exists('pokemon/index.js')).to.be.true;
+    expect(exists('src/pokemon/index.js')).to.be.true;
   });
 
 });

tutorial/07/02.js

@@ -8,11 +8,4 @@ describe('02 VOTE_UP', () => {
     expect(VOTE_UP).to.equal('VOTE_UP');
   });
 
-  // index.js - VOTE_UP
-  const VOTE_UP_in_index = indexJs.__get__('VOTE_UP');
-
-  it('should no longer be in the root "index.js" file', () => {
-    expect(VOTE_UP_in_index).to.not.be.defined;
-  });
-
 });

tutorial/07/03.js

@@ -1,20 +1,15 @@
 describe('03 "voteUp"', () => {
 
-  it('should be in "pokemon/index.js"', () => {
+  it('should be in "src/pokemon/index.js"', () => {
     const voteUp = pokemonIndexJs.__get__('voteUp');
     expect(voteUp).to.not.be.undefined;
     expect(typeof voteUp).to.equal('function');
   });
 
-  it('should be a named export', () => {
-    const voteUp = require('BASE/pokemon/index.js').voteUp;
+  it('should be exported', () => {
+    const voteUp = require('BASE/src/pokemon/index.js').voteUp;
     expect(voteUp).to.not.be.undefined;
     expect(typeof voteUp).to.equal('function');
   });
 
-  it('should no longer be in the root "index.js"', () => {
-    const voteUp = indexJs.__get__('voteUp');
-    expect(voteUp).not.to.not.be.undefined;
-  });
-
 });

tutorial/07/04.js

@@ -1,22 +1,9 @@
-describe('04 "pokemon" reducer', () => {
+describe('04 voteUp', () => {
 
-  it('should be in "pokemon/index.js"', () => {
-    const pokemon = pokemonIndexJs.__get__('pokemon');
-    expect(pokemon).to.not.be.undefined;
-    expect(typeof pokemon).to.equal('function');
-    expect(pokemon({}, { type: 'ANY' })).to.deep.equal({});
-  });
-
-  it('should no longer be in the root "index.js"', () => {
-    const pokemon = indexJs.__get__('pokemon');
-    expect(pokemon).to.be.undefined;
-  });
-
-  it('should be a default export', () => {
-    const pokemon = require('BASE/pokemon/index.js');
-    expect(pokemon).to.not.be.undefined;
-    expect(typeof pokemon).to.equal('function');
-    expect(pokemon({}, { type: 'ANY' })).to.deep.equal({});
+  it('should get imported in "pokemon/index.js"', () => {
+    const voteUp = indexJs.__get__('voteUp');
+    expect(voteUp).to.not.be.undefined;
+    expect(typeof voteUp).to.equal('function');
   });
 
 });

tutorial/07/05.js

@@ -1,15 +1,9 @@
-describe('05 import', () => {
+describe('05 `defaultPokemon`', () => {
 
-  it('`voteUp` from "./pokemon" in "index.js"', () => {
-    const voteUp = indexJs.__get__('voteUp');
-    expect(voteUp).to.not.be.undefined;
-    expect(typeof voteUp).to.equal('function');
-  });
-
-  it('`default as pokemon` from "./pokemon" in "index.js"', () => {
-    const pokemon = indexJs.__get__('pokemon');
-    expect(pokemon).to.not.be.undefined;
-    expect(typeof pokemon).to.equal('function');
+  it('should be in "src/pokemon/index.js"', () => {
+    const defaultPokemon = pokemonIndexJs.__get__('defaultPokemon');
+    expect(defaultPokemon).to.not.be.undefined;
+    expect(defaultPokemon).to.have.length(3);
   });
 
 });

tutorial/07/06.js

@@ -0,0 +1,17 @@
+describe('06 "pokemon" reducer', () => {
+
+  it('should be in "pokemon/index.js"', () => {
+    const pokemon = pokemonIndexJs.__get__('pokemon');
+    expect(pokemon).to.not.be.undefined;
+    expect(typeof pokemon).to.equal('function');
+    expect(pokemon({}, { type: 'ANY' })).to.deep.equal({});
+  });
+
+  it('should be a default export', () => {
+    const pokemon = require('BASE/src/pokemon/index.js').default;
+    expect(pokemon).to.not.be.undefined;
+    expect(typeof pokemon).to.equal('function');
+    expect(pokemon({}, { type: 'ANY' })).to.deep.equal({});
+  });
+
+});

tutorial/07/07.js

@@ -0,0 +1,23 @@
+describe('07 import', () => {
+
+  it('`default as pokemon` from "./pokemon" in "index.js"', () => {
+    const pokemon = indexJs.__get__('pokemon');
+    expect(pokemon).to.not.be.undefined;
+    expect(typeof pokemon).to.equal('function');
+  });
+
+});
+
+describe('07 cleanup index.js by deleting', () => {
+
+  it('`VOTE_UP`', () => {
+    const VOTE_UP_in_index = indexJs.__get__('VOTE_UP');
+    expect(VOTE_UP_in_index).to.not.be.defined;
+  });
+
+  it('`defaultPokemon`', () => {
+    const defaultPokemon_in_index = indexJs.__get__('defaultPokemon');
+    expect(defaultPokemon_in_index).to.not.be.defined;
+  });
+
+});

tutorial/07/index.md

@@ -5,22 +5,30 @@ Explanation here
 
 + create a folder in your base directory called "pokemon" and add a file inside called "index.js"
 @test('07/01')
-@hint('create "src/pokemon/index.js"')
+@hint('create a file in "src/pokemon/index.js"')
 
-+ take your `VOTE_UP` action type from "index.js" and put it in "src/pokemon/index.js"
++ copy the `VOTE_UP` action type from "index.js" and put it in "src/pokemon/index.js". Keep the original version for now, so our app won't break yet.
 @test('07/02')
 @hint('"src/pokemon/index.js" should have `const VOTE_UP = 'VOTE_UP';`')
 
-+ take your `voteUp` action creator from "src/index.js" and put it in "src/pokemon/index.js". Export it as a ["named" export](https://developer.mozilla.org/en/docs/web/javascript/reference/statements/export).
++ also copy the `voteUp` action creator from "src/index.js" and put it in "src/pokemon/index.js". Export it as a ["named" export](https://developer.mozilla.org/en/docs/web/javascript/reference/statements/export).
 @test('07/03')
 @hint('move `voteUp` into "src/pokemon/index.js"')
 @hint('"src/pokemon/index.js" should have `const voteUp = id => ({ type: VOTE_UP, payload: { id } });`')
+@hint('make it a named export: `export const voteUp` = ...')
 
-+ take your `pokemon` reducer from "src/index.js" and put it in "src/pokemon/index.js". Export the reducer as a "default" export
++ import `voteUp` inside of "src/index.js". Also delete the unnecessary 'voteUp' in the same file from before.
 @test('07/04')
+@hint('Try this: `import { voteUp } from './pokemon';`')
 
-+ in your "src/index.js" file, import the action creators and reducer in one line of code.
++ take the `defaultPokemon` from "src/index.js" and copy it into "src/pokemon/index.js"
 @test('07/05')
+
++ take your `pokemon` reducer from "src/index.js" and put it in "src/pokemon/index.js". Export the reducer as a "default" export
+@test('07/06')
+
++ in your "src/index.js" file, also import your pokemon reducer. This can be on the same line of code. Delete the unnecessary original "pokemon", "defaultPokemon" and "VOTE_UP" as well.
+@test('07/07')
 @hint('Try this: `import { default as pokemon, voteUp } from './pokemon';`')
 
 @onPageComplete('Page 7 complete...')