From 09964cfe9575dbd3cb5cfef366842c61e0d93007 Mon Sep 17 00:00:00 2001 From: Hayden Faulds Date: Mon, 20 Nov 2017 10:36:48 +0000 Subject: [PATCH] compile acceptance tests --- services/web/Gruntfile.coffee | 2 +- services/web/Jenkinsfile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/services/web/Gruntfile.coffee b/services/web/Gruntfile.coffee index d4a4929964..04c164c013 100644 --- a/services/web/Gruntfile.coffee +++ b/services/web/Gruntfile.coffee @@ -407,7 +407,7 @@ module.exports = (grunt) -> grunt.registerTask 'compile:unit_tests', 'Compile the unit tests', ['clean:unit_tests', 'coffee:unit_tests'] grunt.registerTask 'compile:acceptance_tests', 'Compile the acceptance tests', ['clean:acceptance_tests', 'coffee:acceptance_tests'] grunt.registerTask 'compile:smoke_tests', 'Compile the smoke tests', ['coffee:smoke_tests'] - grunt.registerTask 'compile:tests', 'Compile all the tests', ['compile:smoke_tests', 'compile:unit_tests'] + grunt.registerTask 'compile:tests', 'Compile all the tests', ['compile:smoke_tests', 'compile:unit_tests', 'compile:acceptance_tests'] grunt.registerTask 'compile', 'Compiles everything need to run web-sharelatex', ['compile:server', 'compile:client', 'compile:css'] grunt.registerTask 'quickcompile:coffee', 'Compiles only changed coffee files',['newer:coffee'] diff --git a/services/web/Jenkinsfile b/services/web/Jenkinsfile index 788731efb0..9b3ddad5c8 100644 --- a/services/web/Jenkinsfile +++ b/services/web/Jenkinsfile @@ -79,7 +79,7 @@ pipeline { } } steps { - sh 'node_modules/.bin/grunt compile --verbose' + sh 'node_modules/.bin/grunt compile compile:tests --verbose' // replace the build number placeholder for sentry sh 'node_modules/.bin/grunt version' } @@ -117,7 +117,7 @@ pipeline { } } steps { - sh 'env NODE_ENV=development ./node_modules/.bin/grunt test:unit --reporter=tap' + sh 'env NODE_ENV=development ./node_modules/.bin/grunt mochaTest:unit --reporter=tap' } }