step 8 with tests

ShMcK · ShMcK · commit 07b5971db586 · 2016-08-14T15:48:19.000-07:00
diff --git a/coderoad.json b/coderoad.json
@@ -427,7 +427,7 @@
       "description": "The power of middleware with \"redux-logger\".\n\nExplanation here.",
       "tasks": [
         {
-          "description": "import `applyMiddleware` in \"index.js\"",
+          "description": "import `applyMiddleware` in \"index.js\" from the \"redux\" package. It is a named import.",
           "tests": [
             "08/01"
           ],
@@ -439,24 +439,46 @@
           "description": "set the second param in createStore to `applyMiddleware()`",
           "tests": [
             "08/02"
+          ],
+          "hints": [
+            "Try this: `createStore(reducers, applyMiddleware());`"
           ]
         },
         {
           "description": "install \"redux-logger\" using npm",
           "tests": [
             "08/03"
+          ],
+          "hints": [
+            "Try this: `npm install --save-dev redux-logger`"
           ]
         },
         {
-          "description": "create a \"logger\" as the result of `createLogger()`",
+          "description": "import `createLogger` from the \"redux-logger\" package. It is a default import.",
           "tests": [
             "08/04"
+          ],
+          "hints": [
+            "Try this: `import createLogger from 'redux-logger';`"
           ]
         },
         {
-          "description": "pass \"logger\" into `applyMiddleware()`",
+          "description": "create a \"logger\" as the result of `createLogger()`",
           "tests": [
             "08/05"
+          ],
+          "hints": [
+            "Note that `logger` should be above `store`.",
+            "Try this: `const logger = createLogger()`"
+          ]
+        },
+        {
+          "description": "pass \"logger\" into `applyMiddleware()`",
+          "tests": [
+            "08/06"
+          ],
+          "hints": [
+            "Try this: `applyMiddleware(logger)`"
           ]
         }
       ],
diff --git a/tutorial/08/01.js b/tutorial/08/01.js
@@ -5,7 +5,7 @@ chai.use(spies);
 
 let spy = chai.spy.on(console, 'log');
 
-const indexJs = require('BASE/index.js');
+const indexJs = require('BASE/src/index.js');
 
 describe('01 applyMiddleware', () => {
 
diff --git a/tutorial/08/02.js b/tutorial/08/02.js
@@ -1,7 +1,8 @@
 describe('02 createStore', () => {
 
-  // it('should call applyMiddleware', () => {
-  //   console.log("createStore", createStore);
-  // });
+  it('should call applyMiddleware', () => {
+    const regex = /^[a-z]+\sstore\s?=.*applyMiddleware\(.+\)/m;
+    expect(indexJs.__text__.to.match(regex);
+  });
 
 });
diff --git a/tutorial/08/03.js b/tutorial/08/03.js
@@ -1,4 +1,4 @@
-describe('03 redux-logger')
+describe('03 redux-logger', () => {
 
   it('should be installed. `npm i -D redux-logger`', () => {
     expect(exists('node_modules/redux-logger')).to.be.true;
diff --git a/tutorial/08/04.js b/tutorial/08/04.js
@@ -1,13 +1,9 @@
-describe('04 logger', () => {
-
-  const logger = indexJs.__get__('logger');
-
-  it('doesn\'t exist', () => {
-    expect(logger).to.not.be.undefined;
-  });
-
-  it('should be set to `createLogger()`', () => {
+describe('04 import', () => {
 
+  it('createLogger', () => {
+    const createLogger = indexJs.__get__('createLogger');
+    expect(createLogger).to.not.be.undefined;
+    expect(typeof createLogger).to.equal('function');
   });
 
 });
diff --git a/tutorial/08/05.js b/tutorial/08/05.js
@@ -1,6 +1,12 @@
-describe('05 applyMiddleware logger', () => {
+describe('05 logger', () => {
 
-  it('', () => {
+  const logger = indexJs.__get__('logger');
+
+  it('doesn\'t exist', () => {
+    expect(logger).to.not.be.undefined;
+  });
+
+  it('should be set to `createLogger()`', () => {
 
   });
 
diff --git a/tutorial/08/06.js b/tutorial/08/06.js
@@ -0,0 +1,8 @@
+describe('06 logger', () => {
+
+  it('should be called by applyMiddleware', () => {
+    const regex = /^[a-z]+\sstore\s?=.+applyMiddleware\(.*logger.*\)/m;
+    expect(indexJs.__text__).to.match(regex);
+  });
+
+});
diff --git a/tutorial/08/index.md b/tutorial/08/index.md
@@ -3,20 +3,29 @@ The power of middleware with "redux-logger".
 
 Explanation here.
 
-+ import `applyMiddleware` in "index.js"
++ import `applyMiddleware` in "index.js" from the "redux" package. It is a named import.
 @test('08/01')
 @action(open('src/index.js'))
 
 + set the second param in createStore to `applyMiddleware()`
 @test('08/02')
+@hint('Try this: `createStore(reducers, applyMiddleware());`')
 
 + install "redux-logger" using npm
 @test('08/03')
+@hint('Try this: `npm install --save-dev redux-logger`')
 
-+ create a "logger" as the result of `createLogger()`
++ import `createLogger` from the "redux-logger" package. It is a default import.
 @test('08/04')
+@hint('Try this: `import createLogger from 'redux-logger';`')
 
-+ pass "logger" into `applyMiddleware()`
++ create a "logger" as the result of `createLogger()`
 @test('08/05')
+@hint('Note that `logger` should be above `store`.')
+@hint('Try this: `const logger = createLogger()`')
+
++ pass "logger" into `applyMiddleware()`
+@test('08/06')
+@hint('Try this: `applyMiddleware(logger)`')
 
 @onPageComplete('Look in the console')

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-describe('03 redux-logger')`
	`1`	`+describe('03 redux-logger', () => {`
`2`	`2`
`3`	`3`	it('should be installed. `npm i -D redux-logger`', () => {
`4`	`4`	`expect(exists('node_modules/redux-logger')).to.be.true;`