From e0ebfd5e586c8abc4c4827a09ccbc26ef11a88c3 Mon Sep 17 00:00:00 2001
From: Rafael Almeida <pentateu@gmail.com>
Date: Sat, 22 Nov 2014 20:31:39 +1300
Subject: [PATCH 1/3] add build control to the grunt template

---
 app/templates/Gruntfile.js | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/app/templates/Gruntfile.js b/app/templates/Gruntfile.js
index 6755db958..3e2730130 100644
--- a/app/templates/Gruntfile.js
+++ b/app/templates/Gruntfile.js
@@ -17,7 +17,21 @@ module.exports = function (grunt) {
     cdnify: 'grunt-google-cdn',
     protractor: 'grunt-protractor-runner',
     buildcontrol: 'grunt-build-control',
+    istanbul_check_coverage: 'grunt-mocha-istanbul',
+    buildcontrol: 'grunt-build-control'
+  });
+
+  // Load grunt tasks automatically, when needed
+  require('jit-grunt')(grunt, {
+    express: 'grunt-express-server',
+    useminPrepare: 'grunt-usemin',
+    ngtemplates: 'grunt-angular-templates',
+    cdnify: 'grunt-google-cdn',
+    protractor: 'grunt-protractor-runner',
+    injector: 'grunt-asset-injector',
+    buildcontrol: 'grunt-build-control',
     istanbul_check_coverage: 'grunt-mocha-istanbul'
+    buildcontrol: 'grunt-build-control'
   });
 
   // Time how long tasks take. Can help when optimizing build times

From 2c1baa275e3d3f8d3ce64e96aa8cfecf598c4851 Mon Sep 17 00:00:00 2001
From: Rafael Almeida <pentateu@gmail.com>
Date: Thu, 18 Dec 2014 12:41:04 +1300
Subject: [PATCH 2/3] chore (Gruntfile.js) remove the duplicate entry for
 require('jit-grunt')(...) and duplicate buildcontrol entry

---
 app/templates/Gruntfile.js | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/app/templates/Gruntfile.js b/app/templates/Gruntfile.js
index 3e2730130..6755db958 100644
--- a/app/templates/Gruntfile.js
+++ b/app/templates/Gruntfile.js
@@ -17,21 +17,7 @@ module.exports = function (grunt) {
     cdnify: 'grunt-google-cdn',
     protractor: 'grunt-protractor-runner',
     buildcontrol: 'grunt-build-control',
-    istanbul_check_coverage: 'grunt-mocha-istanbul',
-    buildcontrol: 'grunt-build-control'
-  });
-
-  // Load grunt tasks automatically, when needed
-  require('jit-grunt')(grunt, {
-    express: 'grunt-express-server',
-    useminPrepare: 'grunt-usemin',
-    ngtemplates: 'grunt-angular-templates',
-    cdnify: 'grunt-google-cdn',
-    protractor: 'grunt-protractor-runner',
-    injector: 'grunt-asset-injector',
-    buildcontrol: 'grunt-build-control',
     istanbul_check_coverage: 'grunt-mocha-istanbul'
-    buildcontrol: 'grunt-build-control'
   });
 
   // Time how long tasks take. Can help when optimizing build times

From 1b7937a5ae2ee20f7af1c679d059185df16085e9 Mon Sep 17 00:00:00 2001
From: Rafael Almeida <pentateu@gmail.com>
Date: Thu, 18 Dec 2014 12:46:25 +1300
Subject: [PATCH 3/3] chore (Gruntfile.js) add *.integration.js to the watch
 for mochaTest

---
 app/templates/Gruntfile.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/templates/Gruntfile.js b/app/templates/Gruntfile.js
index 6755db958..66d982cdb 100644
--- a/app/templates/Gruntfile.js
+++ b/app/templates/Gruntfile.js
@@ -70,7 +70,10 @@ module.exports = function (grunt) {
         tasks: ['injector:css']
       },
       mochaTest: {
-        files: ['server/**/*.spec.js'],
+        files: [
+          'server/**/*.spec.js',
+          'server/**/*.integration.js'
+        ],
         tasks: ['env:test', 'mochaTest']
       },
       jsTest: {