fixed travis test command

This commit is contained in:
David Baldwynn 2017-10-30 09:54:03 -07:00
parent fc4d9a12f0
commit 5805c9b529
3 changed files with 5 additions and 7 deletions

View File

@ -12,6 +12,4 @@ addons:
code_climate: code_climate:
repo_token: 6c3a1b81a09b2338d6f30913c1bcad115026689752cbb499a0a25061cda6fbcf repo_token: 6c3a1b81a09b2338d6f30913c1bcad115026689752cbb499a0a25061cda6fbcf
script: script:
- npm travis - npm run travis
after_script:
- grunt coveralls

View File

@ -219,7 +219,7 @@ module.exports = function(grunt) {
options: { options: {
emitters: ['event'], 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: { html2js: {
options: { options: {
@ -247,7 +247,7 @@ module.exports = function(grunt) {
options: { options: {
module: 'TellForm.templates' 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' 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', ['test:server', 'test:client']);
grunt.registerTask('test:server', ['lint:tests', 'env:test', 'mochaTest']); 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: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']); grunt.registerTask('testdebug', ['env:test', 'karma:debug']);

View File

@ -21,7 +21,7 @@
"generate": "all-contributors generate", "generate": "all-contributors generate",
"start": "grunt", "start": "grunt",
"test": "grunt test", "test": "grunt test",
"travis": "grunt travis", "travis": "grunt test:travis",
"postinstall": "bower install --config.interactive=false; grunt build;", "postinstall": "bower install --config.interactive=false; grunt build;",
"init": "node scripts/setup.js" "init": "node scripts/setup.js"
}, },