From 5805c9b5295705edb80b51bba4fd3fc030ba573e Mon Sep 17 00:00:00 2001
From: David Baldwynn <shorerydr10@live.com>
Date: Mon, 30 Oct 2017 09:54:03 -0700
Subject: [PATCH] fixed travis test command

---
 .travis.yml  | 4 +---
 gruntfile.js | 6 +++---
 package.json | 2 +-
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 86c1e08c..063b2871 100755
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,6 +12,4 @@ addons:
   code_climate:
     repo_token: 6c3a1b81a09b2338d6f30913c1bcad115026689752cbb499a0a25061cda6fbcf
 script:
-  - npm travis
-after_script:
-  - grunt coveralls
+  - npm run travis
diff --git a/gruntfile.js b/gruntfile.js
index 7bcec21b..43dbde1b 100755
--- a/gruntfile.js
+++ b/gruntfile.js
@@ -219,7 +219,7 @@ module.exports = function(grunt) {
 	      options: {
 	          emitters: ['event'],
 	      },
-	      src: ['/home/travis/build/tellform/tellform/coverageServerg/*.info', '/home/travis/build/tellform/tellform/clientCoverage/lcov-report/*.info']
+	      src: ['./coverageServer/*.info', './coverageClient/lcov-report/*.info']
 	    },
 		html2js: {
 			options: {
@@ -247,7 +247,7 @@ module.exports = function(grunt) {
 				options: {
 					module: 'TellForm.templates'
 				},
-				src: ['public/modules/**/views/**.html', 'public/modules/**/views/**/*.html', 'public/form_modules/forms/base/**/*.html', '!public/modules/forms/base/**/*.html'],
+				src: ['public/modules/**/views/**.html', 'public/modules/**/views/**/*.html', 'public/form_modules/forms/base/**/*.html'],
 				dest: 'public/dist/populate_template_cache.js'
 			}
 		},
@@ -310,7 +310,7 @@ module.exports = function(grunt) {
 	grunt.registerTask('test', ['test:server', 'test:client']);
 	grunt.registerTask('test:server', ['lint:tests', 'env:test', 'mochaTest']);
 	grunt.registerTask('test:client', ['lint:tests', 'html2js:main', 'html2js:forms', 'env:test', 'karma:unit']);
-	grunt.registerTask('test:travis', ['env:test', 'html2js:main', 'html2js:forms', 'env:test', 'karma:unit', 'mochaTest']);
+	grunt.registerTask('test:travis', ['coverage:server', 'test:client', 'lcovMerge']);
 
 
 	grunt.registerTask('testdebug', ['env:test', 'karma:debug']);
diff --git a/package.json b/package.json
index 1848192f..eb2f7048 100644
--- a/package.json
+++ b/package.json
@@ -21,7 +21,7 @@
     "generate": "all-contributors generate",
     "start": "grunt",
     "test": "grunt test",
-    "travis": "grunt travis",
+    "travis": "grunt test:travis",
     "postinstall": "bower install --config.interactive=false; grunt build;",
     "init": "node scripts/setup.js"
   },