Added basics for mocha unit tests

sbstjn · sbstjn · commit 64f98ea00f70 · 2014-05-25T23:41:38.000+02:00
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -13,6 +13,17 @@ module.exports = function(grunt) {
         }
       }
     },
+    simplemocha: {
+      options: {
+        globals: ['should'],
+        timeout: 3000,
+        ignoreLeaks: false,
+        grep: '',
+        ui: 'tdd',
+        reporter: 'spec'
+      },
+      all: { src: ['test/**/*.js'] }
+    },
     watch: {
       scripts: {
         files: [
@@ -22,7 +33,7 @@ module.exports = function(grunt) {
           'source/**/*.js.erb',
           '.jshint'
         ],
-        tasks: ['jshint'],
+        tasks: ['simplemocha', 'jshint'],
         options: {
           interrupt: true,
         },
@@ -33,7 +44,8 @@ module.exports = function(grunt) {
   // For this to work, you need to have run `npm install grunt-simple-mocha`
   grunt.loadNpmTasks('grunt-contrib-jshint');
   grunt.loadNpmTasks('grunt-contrib-watch');
+  grunt.loadNpmTasks('grunt-simple-mocha');
 
   // Add a default task. This is optional, of course :)
-  grunt.registerTask('default', ['jshint', 'watch']);
+  grunt.registerTask('default', ['simplemocha', 'jshint', 'watch']);
 };
diff --git a/package.json b/package.json
@@ -8,6 +8,7 @@
     "grunt-cli": "~0.1.11",
     "grunt-jslint": "~1.1.1",
     "grunt-contrib-jshint": "~0.7.2",
-    "grunt-contrib-watch": "^0.6.1"
+    "grunt-contrib-watch": "^0.6.1",
+    "grunt-simple-mocha": "^0.4.0"
   }
 }
diff --git a/source/javascripts/main.js b/source/javascripts/main.js
@@ -20,6 +20,5 @@
       ['02/2010', '05/2010', 'LOST Season #5', 'lorem'],
       ['09/2008', '06/2010', 'FRINGE #1 & #2', 'ipsum']
     ]);
-
   });
 })();
diff --git a/source/javascripts/timesheet.bubble.js b/source/javascripts/timesheet.bubble.js
@@ -1,27 +1,42 @@
 (function() {
   'use strict';
 
+  /**
+   * Timesheet Bubble
+   */
   var Bubble = function(wMonth, min, start, end) {
     this.min = min;
     this.start = start;
     this.end = end;
     this.widthMonth = wMonth;
   };
 
+  /**
+   * Format month number
+   */
   Bubble.prototype.formatMonth = function(num) {
     num = parseInt(num, 10);
 
     return num >= 10 ? num : '0' + num;
   };
 
+  /**
+   * Calculate starting offset for bubble
+   */
   Bubble.prototype.getStartOffset = function() {
     return (this.widthMonth/12) * (12 * (this.start.getFullYear() - this.min) + this.start.getMonth());
   };
 
+  /**
+   * Get count of full years from start to end
+   */
   Bubble.prototype.getFullYears = function() {
     return ((this.end && this.end.getFullYear()) || this.start.getFullYear()) - this.start.getFullYear();
   };
 
+  /**
+   * Get count of all months in Timesheet Bubble
+   */
   Bubble.prototype.getMonths = function() {
     var fullYears = this.getFullYears();
     var months = 0;
@@ -35,17 +50,23 @@
       } else {
         months += this.end.getMonth() + 1;
         months += 12 - (this.start.hasMonth ? this.start.getMonth() : 0);
-        months += 12 *(fullYears-1 > 0 ? fullYears-1 : 0);
+        months += 12 * (fullYears-1);
       }
     }
 
     return months;
   };
 
+  /**
+   * Get bubble's width in pixel
+   */
   Bubble.prototype.getWidth = function() {
     return (this.widthMonth/12) * this.getMonths();
   };
 
+  /**
+   * Get the bubble's label
+   */
   Bubble.prototype.getDateLabel = function() {
     return [
       (this.start.hasMonth ? this.formatMonth(this.start.getMonth() + 1) + '/' : '' ) + this.start.getFullYear(),
diff --git a/source/javascripts/timesheet.js b/source/javascripts/timesheet.js
@@ -5,6 +5,9 @@
 (function() {
   'use strict';
 
+  /**
+   * Initialize a Timesheet
+   */
   var Timesheet = function(container, min, max, data) {
     this.container = '#' + container;
     this.data = [];
@@ -18,6 +21,9 @@
     this.insertData();
   };
 
+  /**
+   * Insert data into Timesheet
+   */
   Timesheet.prototype.insertData = function() {
     var html = [];
     var widthMonth = document.querySelector(this.container + ' .scale section').offsetWidth;
@@ -38,6 +44,9 @@
     document.querySelector(this.container).innerHTML += '<ul class="data">' + html.join('') + '</ul>';
   };
 
+  /**
+   * Draw section labels
+   */
   Timesheet.prototype.drawSections = function() {
     var html = [];
 
@@ -49,6 +58,9 @@
     document.querySelector(this.container).innerHTML = '<div class="scale">' + html.join('') + '</div>';
   };
 
+  /**
+   * Parse data string
+   */
   Timesheet.prototype.parseDate = function(date) {
     if (date.indexOf('/') === -1) {
       date = new Date(parseInt(date, 10), 0, 1);
@@ -62,6 +74,9 @@
     return date;
   };
 
+  /**
+   * Parse passed data
+   */
   Timesheet.prototype.parse = function(data) {
     for (var n = 0, m = data.length; n<m; n++) {
       var beg = this.parseDate(data[n][0]);
diff --git a/test/timesheet.js b/test/timesheet.js
@@ -0,0 +1,5 @@
+suite('Timesheet', function() {
+  test('Calculation', function(done) {
+    done();
+  });
+});

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@`
`8`	`8`	`"grunt-cli": "~0.1.11",`
`9`	`9`	`"grunt-jslint": "~1.1.1",`
`10`	`10`	`"grunt-contrib-jshint": "~0.7.2",`
`11`		`- "grunt-contrib-watch": "^0.6.1"`
	`11`	`+ "grunt-contrib-watch": "^0.6.1",`
	`12`	`+ "grunt-simple-mocha": "^0.4.0"`
`12`	`13`	`}`
`13`	`14`	`}`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +suite('Timesheet', function() {
 +  test('Calculation', function(done) {
 +    done();
 +  });
 +});