more cleanup

Author: siddii

.travis.yml

@@ -4,8 +4,6 @@ node_js:
 
 before_script:
   - npm install -g grunt-cli
-  - grunt &
 
 script:
-  - grunt karma:unit
-  - grunt karma:e2e
+  - grunt tests

Gruntfile.js

@@ -6,11 +6,7 @@ module.exports = function (grunt) {
   grunt.loadNpmTasks('grunt-contrib-concat');
   grunt.loadNpmTasks('grunt-contrib-watch');
   grunt.loadNpmTasks('grunt-contrib-uglify');
-  grunt.loadNpmTasks('grunt-conventional-changelog');
-  grunt.loadNpmTasks('grunt-bump');
   grunt.loadNpmTasks('grunt-karma');
-  grunt.loadNpmTasks('grunt-ngmin');
-  grunt.loadNpmTasks('grunt-html2js');
   grunt.loadNpmTasks('grunt-contrib-connect');
 
   var userConfig = {
@@ -88,8 +84,7 @@ module.exports = function (grunt) {
       testserver: {
         options: {
           port: 3030,
-          base: '.',
-          keepalive: true
+          base: '.'
         }
       }
     },
@@ -122,6 +117,8 @@ module.exports = function (grunt) {
 
   grunt.registerTask('default', [ 'connect:server', 'watch']);
 
+  grunt.registerTask('tests', [ 'connect:testserver', 'karma:unit', 'karma:e2e']);
+
   grunt.registerTask('build', [
     'jshint', 'concat', 'uglify'
   ]);

config/karma-e2e.conf.js

@@ -21,7 +21,6 @@ module.exports = function(config){
     },
 
     plugins : [
-      'karma-junit-reporter',
       'karma-chrome-launcher',
       'karma-firefox-launcher',
       'karma-jasmine',

config/karma.conf.js

@@ -28,7 +28,6 @@ module.exports = function(config){
     },
 
     plugins : [
-      'karma-junit-reporter',
       'karma-chrome-launcher',
       'karma-firefox-launcher',
       'karma-jasmine',