From 9b9147f377f609e109fc681ce75cb4d9d4f32475 Mon Sep 17 00:00:00 2001
From: Vinit Kumar <vinit1414.08@bitmesra.ac.in>
Date: Tue, 21 Feb 2017 15:00:14 +0530
Subject: [PATCH 1/3] sign the commit

---
 readme.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/readme.md b/readme.md
index 99b7d92a..83425c46 100644
--- a/readme.md
+++ b/readme.md
@@ -14,7 +14,6 @@ You would require Node, NPM and MongoDB installed:
 The configuration is in `config/config.js`. Please create your own
 github application [Github Developer Settings](https://github.com/settings/applications) and replace the token and keys.
 
-
 ```js
 var path = require('path'),
     rootPath = path.normalize(__dirname + '/..');

From c2b7c49f329fe259c6e98a78867ae3cf42bc3c37 Mon Sep 17 00:00:00 2001
From: Vinit Kumar <vinit1414.08@bitmesra.ac.in>
Date: Mon, 27 Mar 2017 20:56:08 +0530
Subject: [PATCH 2/3] add tests

---
 package.json |  5 +++--
 test/test.js | 35 +++++++++++++++++++++++++++++------
 2 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/package.json b/package.json
index b1a78693..fbfbdc9c 100644
--- a/package.json
+++ b/package.json
@@ -33,10 +33,11 @@
   },
   "devDependencies": {
     "ava": "latest",
-    "mocha": "^2.4.5",
+    "jest": "^19.0.2",
+    "mocha": "^2.5.3",
     "nodemon": "latest",
     "should": "latest",
-    "supertest": "latest"
+    "supertest": "^3.0.0"
   },
   "subdomain": "ntwitter"
 }
diff --git a/test/test.js b/test/test.js
index 3ba836b6..8bc9a034 100644
--- a/test/test.js
+++ b/test/test.js
@@ -1,11 +1,34 @@
-var assert = require('assert');
+/* global describe it */
 
+var request = require('supertest');
+var app = require('../server');
 
-describe('Array', function () {
-  describe('#indexOf()', function() {
-    it('should return -1 when the value is not present', function () {
-      assert.equal(-1, [1, 2, 3].indexOf(5));
-      assert.equal(-1, [1, 2, 3].indexOf(4));
+describe('Test Homepage', function (done) {
+  it('should return 302', function (done) {
+    request(app)
+    .get('/')
+    .expect(302, done);
+  });
+});
+
+describe('Test Login', function (done) {
+  it('should return 200', function (done) {
+    request(app)
+    .get('/login')
+    .expect(200, done);
+  });
+});
+
+
+describe('Test Login', function (done) {
+  it('should return 200', function (done) {
+    request(app)
+    .get('/apiv1/users')
+    .expect(200)
+    .expect('Content-Type', /json/)
+    .end(function(err, res) {
+      if (err) return done(err);
+      done();
     });
   });
 });

From 9119bbb7631506a1f4dc3daae4d65c523fe39eb2 Mon Sep 17 00:00:00 2001
From: Vinit Kumar <vinit1414.08@bitmesra.ac.in>
Date: Mon, 27 Mar 2017 21:02:37 +0530
Subject: [PATCH 3/3] run test

---
 .travis.yml  | 1 +
 Makefile     | 3 +++
 package.json | 3 ++-
 3 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 Makefile

diff --git a/.travis.yml b/.travis.yml
index 5277c48f..b91c69b5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,3 +3,4 @@ services:
 language: node_js
 node_js:
   - "4.2.4"
+script: npm test
diff --git a/Makefile b/Makefile
new file mode 100644
index 00000000..549e2787
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,3 @@
+test:
+	@./node_modules/.bin/mocha -u tdd --reporter spec
+.PHONY: test
diff --git a/package.json b/package.json
index fbfbdc9c..b4767e3d 100644
--- a/package.json
+++ b/package.json
@@ -6,7 +6,8 @@
   "private": false,
   "author": "Vinit Kumar <vinit.kumar@changer.nl> (http://vinitkumar.me)",
   "scripts": {
-    "start": "node server.js"
+    "start": "node server.js",
+    "test": "make test"
   },
   "engines": {
     "node": "6.3.1"