From 1dfe497d5f00deb458f20d2be28d139fa1ce89a9 Mon Sep 17 00:00:00 2001
From: jdar22169 <mmow313@gmail.com>
Date: Mon, 9 May 2016 20:31:11 -0700
Subject: [PATCH 1/3] day 1 mocha and chai

---
 .gitignore   |  2 ++
 greet.js     |  4 ++++
 test/test.js | 10 ++++++++++
 3 files changed, 16 insertions(+)
 create mode 100644 .gitignore
 create mode 100644 greet.js
 create mode 100644 test/test.js

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..9daa824
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+.DS_Store
+node_modules
diff --git a/greet.js b/greet.js
new file mode 100644
index 0000000..fed89af
--- /dev/null
+++ b/greet.js
@@ -0,0 +1,4 @@
+exports = module.exports = {};
+exports.greet = function(name) {
+  console.log('Hello' + name);
+};
diff --git a/test/test.js b/test/test.js
new file mode 100644
index 0000000..332ae02
--- /dev/null
+++ b/test/test.js
@@ -0,0 +1,10 @@
+const chai = require('chai');
+const expect = chai.expect;
+const hello = require('../greet.js');
+
+describe('Greet Tests', () => {
+  it ('should say my name', () => {
+    var name = 'Maddie'
+    expect(hello.greet(name)).to.eql(console.log('Hello Maddie'));
+  });
+});

From 2dbf9543462df65842562a06b3bd368fb44ab121 Mon Sep 17 00:00:00 2001
From: jdar22169 <mmow313@gmail.com>
Date: Tue, 10 May 2016 09:44:34 -0700
Subject: [PATCH 2/3] change console.log to return

---
 greet.js     | 2 +-
 test/test.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/greet.js b/greet.js
index fed89af..bac0908 100644
--- a/greet.js
+++ b/greet.js
@@ -1,4 +1,4 @@
 exports = module.exports = {};
 exports.greet = function(name) {
-  console.log('Hello' + name);
+  return ('Hello ' + name);
 };
diff --git a/test/test.js b/test/test.js
index 332ae02..28520d9 100644
--- a/test/test.js
+++ b/test/test.js
@@ -5,6 +5,6 @@ const hello = require('../greet.js');
 describe('Greet Tests', () => {
   it ('should say my name', () => {
     var name = 'Maddie'
-    expect(hello.greet(name)).to.eql(console.log('Hello Maddie'));
+    expect(hello.greet(name)).to.eql('Hello Maddie');
   });
 });

From cefd0c79061c3f84fc22f8250e98f4a90cf978d2 Mon Sep 17 00:00:00 2001
From: jdar22169 <mmow313@gmail.com>
Date: Tue, 10 May 2016 22:50:19 -0700
Subject: [PATCH 3/3] gulp and package

---
 gulpfile.js  | 45 +++++++++++++++++++++++++++++++++++++++++++++
 package.json | 32 ++++++++++++++++++++++++++++++++
 2 files changed, 77 insertions(+)
 create mode 100644 gulpfile.js
 create mode 100644 package.json

diff --git a/gulpfile.js b/gulpfile.js
new file mode 100644
index 0000000..17db6c4
--- /dev/null
+++ b/gulpfile.js
@@ -0,0 +1,45 @@
+const gulp = require('gulp');
+const eslint = require('gulp-eslint');
+const mocha = require('gulp-mocha');
+
+gulp.task('test_task', () => {
+  return gulp.src('./test/test.js')
+    .pipe(mocha())
+});
+
+gulp.task('default', ['test_task', 'lint', 'watch'])
+
+gulp.task('lint', () => {
+  gulp.src(['./greet.js', './test/test.js', './gulpfile.js'])
+    .pipe(eslint({
+
+   "settings": {
+    "ecmascript": 5
+    },
+  "ecmaFeatures": {
+    },
+  "env": {
+    "browser": true,
+    "jquery": true
+    },
+  "rules": {
+    "semi": 1,
+    "strict": 0,
+    "indent": [2, 2],
+    "quotes": [1, "single"],
+    "no-multi-spaces": [1, {
+      "exceptions": {
+        "VariableDeclarator": true,
+        "FunctionExpression": true
+        }
+      }],
+    "key-spacing": [0, {"align": "value"}],
+    "no-underscore-dangle": 0
+  }
+}))
+    .pipe(eslint.format())
+});
+
+gulp.task('watch', () => {
+  gulp.watch(['./greet.js', './test/test.js'], ['test_task'])
+})
diff --git a/package.json b/package.json
new file mode 100644
index 0000000..603af91
--- /dev/null
+++ b/package.json
@@ -0,0 +1,32 @@
+{
+  "name": "maddie_day_2_hw",
+  "version": "1.0.0",
+  "description": "Homework assignment 2",
+  "main": "greet.js",
+  "directories": {
+    "test": "test"
+  },
+  "dependencies": {
+    "chai": "^3.5.0"
+  },
+  "devDependencies": {
+    "chai": "^3.5.0",
+    "gulp": "^3.9.1",
+    "gulp-eslint": "^2.0.0",
+    "gulp-mocha": "^2.2.0",
+    "mocha": "^2.4.5"
+  },
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/jdar22169/simple_modular_patterns_and_tests.git"
+  },
+  "author": "",
+  "license": "ISC",
+  "bugs": {
+    "url": "https://github.com/jdar22169/simple_modular_patterns_and_tests/issues"
+  },
+  "homepage": "https://github.com/jdar22169/simple_modular_patterns_and_tests#readme"
+}