1 files changed, 46 insertions, 55 deletions
diff --git a/test/test-functional.js b/test/test-functional.js
index d716e07..a852597 100644
--- a/test/test-functional.js
+++ b/test/test-functional.js
@@ -1,75 +1,66 @@
-var _ = require('lodash');
-var assert = require("assert");
+var assert = require('assert');
 var exec = require('child_process').exec;
 
 var totalHoursCount;
 
 describe('git-hours', function() {
+    it('should output json', function(done) {
+        exec('node ./src/index.js', function(err, stdout, stderr) {
+            if (err !== null) {
+                throw new Error(stderr);
+            }
 
-    describe('cli', function() {
-
-        it('should output json', function(done) {
-            exec('node index.js', function(err, stdout, stderr) {
-                if (err !== null) {
-                    throw new Error(stderr);
-                }
-
-                console.log('stdout:', stdout);
-                var work = JSON.parse(stdout);
-                assert.notEqual(work.total.hours.length, 0);
-                assert.notEqual(work.total.commits.length, 0);
-                totalHoursCount = work.total.hours;
-                done();
-            });
+            console.log('stdout:', stdout);
+            var work = JSON.parse(stdout);
+            assert.notEqual(work.total.hours.length, 0);
+            assert.notEqual(work.total.commits.length, 0);
+            totalHoursCount = work.total.hours;
+            done();
         });
     });
 
-    describe('Since option', function(){
-        it('Should analyse since today', function(done) {
-            exec('node index.js --since today', function(err, stdout, stderr) {
-                assert.ifError(err);
-                var work = JSON.parse(stdout);
-                assert.strictEqual(typeof work.total.hours, 'number');
-                done();
-            });
+    it('Should analyse since today', function(done) {
+        exec('node ./src/index.js --since today', function(err, stdout, stderr) {
+            assert.ifError(err);
+            var work = JSON.parse(stdout);
+            assert.strictEqual(typeof work.total.hours, 'number');
+            done();
         });
+    });
 
-        it('Should analyse since yesterday', function(done) {
-            exec('node index.js --since yesterday', function(err, stdout, stderr) {
-                assert.ifError(err);
-                var work = JSON.parse(stdout);
-                assert.strictEqual(typeof work.total.hours, 'number');
-                done();
-            });
+    it('Should analyse since yesterday', function(done) {
+        exec('node ./src/index.js --since yesterday', function(err, stdout, stderr) {
+            assert.ifError(err);
+            var work = JSON.parse(stdout);
+            assert.strictEqual(typeof work.total.hours, 'number');
+            done();
         });
+    });
 
-        it('Should analyse since last week', function(done){
-            exec('node index.js --since lastweek', function(err, stdout, stderr) {
-                assert.ifError(err);
-                var work = JSON.parse(stdout);
-                assert.strictEqual(typeof work.total.hours, 'number');
-                done();
-            });
+    it('Should analyse since last week', function(done) {
+        exec('node ./src/index.js --since lastweek', function(err, stdout, stderr) {
+            assert.ifError(err);
+            var work = JSON.parse(stdout);
+            assert.strictEqual(typeof work.total.hours, 'number');
+            done();
         });
+    });
 
-        it('Should analyse since a specific date', function(done){
-            exec('node index.js --since 2015-01-01', function(err, stdout, stderr) {
-                assert.ifError(err);
-                var work = JSON.parse(stdout);
-                assert.notEqual(work.total.hours, 0);
-                done();
-            });
+    it('Should analyse since a specific date', function(done) {
+        exec('node ./src/index.js --since 2015-01-01', function(err, stdout, stderr) {
+            assert.ifError(err);
+            var work = JSON.parse(stdout);
+            assert.notEqual(work.total.hours, 0);
+            done();
         });
+    });
 
-        it('Should analyse as without param', function(done){
-            exec('node index.js --since always', function(err, stdout, stderr) {
-                assert.ifError(err);
-                var work = JSON.parse(stdout);
-                assert.equal(work.total.hours, totalHoursCount);
-                done();
-            });
+    it('Should analyse as without param', function(done) {
+        exec('node ./src/index.js --since always', function(err, stdout, stderr) {
+            assert.ifError(err);
+            var work = JSON.parse(stdout);
+            assert.equal(work.total.hours, totalHoursCount);
+            done();
         });
     });
-
-
 });