tutorial updates

ShMcK · ShMcK · commit 30f56a1822f6 · 2016-05-01T16:32:43.000-07:00
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,2 @@
 node_modules
-tutorial/_temp**
+tutorial/_temp.spec.js
diff --git a/README.md b/README.md
@@ -19,9 +19,9 @@ CodeRoad is an open-sourced interactive tutorial platform for the Atom Editor. L
 
 ## Outline
 
-### Declaring Variables
+### Features
 
-Using `let` & `const`.
+New features in ES2015.
 
 ##### Let
 
diff --git a/coderoad.json b/coderoad.json
@@ -5,8 +5,8 @@
   },
   "chapters": [
     {
-      "title": "Declaring Variables",
-      "description": "Using `let` & `const`.",
+      "title": "Features",
+      "description": "New features in ES2015.",
       "pages": [
         {
           "title": "Let",
diff --git a/tutorial/.tmp.spec.js b/tutorial/.tmp.spec.js
@@ -0,0 +1,57 @@
+'use strict';
+var chai = require('chai');
+var spies = require('chai-spies');
+var expect = chai.expect;
+chai.use(spies);
+var spy = chai.spy.on(console, 'log');
+
+// use =>
+const greet = function (name) {
+	return 'hello ' + name;
+}
+
+
+describe('01 greet', () => {
+
+	it('doesn\'t exist', () => {
+		expect(greet).to.be.defined;
+	});
+
+	it('doesn\'t use an arrow function', () => {
+		expect(greet.toString()).to.match(/=>/g);
+	});
+
+	it('doesn\'t return "hello " + name', () => {
+		expect(greet('there')).to.equal('hello there');
+	});
+
+});
+
+describe('02 getName', () => {
+
+	it('doesn\'t exist', () => {
+		expect(getName).to.be.defined;
+	});
+
+	it('doesn\'t use an arrow function', () => {
+		expect(getName.toString()).to.match(/=>/g);
+	});
+
+	it('should not use the `return` keyword', () => {
+		expect(getName.toString()).not.to.match(/return/g);
+	});
+
+	it('doesn\'t return the name "Joe"', () => {
+		expect(getName()).to.equal('Joe');
+	});
+
+});
+
+describe('03 clock', () => {
+
+	it('try the example on CodePen', () => {
+		expect(true).to.equal(true);
+	});
+
+});
+
diff --git a/tutorial/1/04/03.spec.js b/tutorial/1/04/03.spec.js
@@ -8,6 +8,10 @@ describe('03 expression', () => {
 		expect(expression.toString()).to.match(/`/g);
 	});
 
+	it('should use expressions `{exp}`', () => {
+		expect(expression.toString()).to.match(/${name}/g);
+	});
+
 	it('shouldn\'t have regular quotes, only backticks (`)', () => {
 		expect(expression.toString()).not.to.match(/['"]/g);
 	});
diff --git a/tutorial/2/01/01.spec.js b/tutorial/2/01/01.spec.js
@@ -0,0 +1,24 @@
+'use strict';
+var expect = require('chai').expect;
+
+/// load('object-literal.js')
+
+describe('01 getPersonObj', () => {
+
+	it('doesn\'t exist', () => {
+		expect(getPersonObj).to.be.defined;
+	});
+
+	it('should use the object shorthand', () => {
+		expect(getPersonObj.toString()).not.to.match(/name:\s?name/g);
+		expect(getPersonObj.toString()).not.to.match(/city:\s?city/g);
+	});
+
+	it('should return an object with name & city', function() {
+		expect(getPersonObj('J', 'V')).to.deep.equal({
+			name: 'J',
+			city: 'V'
+		});
+	});
+
+});
diff --git a/tutorial/2/01/object-literal.md b/tutorial/2/01/object-literal.md
@@ -0,0 +1,29 @@
+### Object Literal
+
+A shorthand for writing objects.
+
+```js
+const foo = 'something';
+const bar = 'else';
+
+// using object literal shorthand
+const fooObj = {
+  foo, bar
+};
+// { foo: 'something', bar: 'else'}
+```
+
++ Rewrite the object in an easier way using object literals
+@action(open('object-literal.js'))
+@test('2/01/01')
+@action(set(
+```
+// rewrite in a simpler way
+function getPersonObj(name, city) {
+  return {
+    name: name,
+    city: city
+  };
+}
+```
+))
diff --git a/tutorial/_tmp.spec.js b/tutorial/_tmp.spec.js
diff --git a/tutorial/tutorial.md b/tutorial/tutorial.md
@@ -1,10 +1,10 @@
 # ES2015
 Practice refactoring with ES2015 features.
 
-## Declaring Variables
-Using `let` & `const`.
+## Features
+New features in ES2015.
 
-@import('tutorial/1/01/let')
-@import('tutorial/1/02/const')
-@import('tutorial/1/03/arrow-function')
-@import('tutorial/1/04/template-literal')
+@import('1/01/let')
+@import('1/02/const')
+@import('1/03/arrow-function')
+@import('1/04/template-literal')

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`node_modules`
`2`		`-tutorial/_temp**`
	`2`	`+tutorial/_temp.spec.js`
Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,8 @@`
`5`	`5`	`},`
`6`	`6`	`"chapters": [`
`7`	`7`	`{`
`8`		`- "title": "Declaring Variables",`
`9`		- "description": "Using `let` & `const`.",
	`8`	`+ "title": "Features",`
	`9`	`+ "description": "New features in ES2015.",`
`10`	`10`	`"pages": [`
`11`	`11`	`{`
`12`	`12`	`"title": "Let",`