Hayden Faulds 9 лет назад
Родитель
Сommit
09964cfe95
2 измененных файлов с 3 добавлено и 3 удалено
  1. 1 1
      services/web/Gruntfile.coffee
  2. 2 2
      services/web/Jenkinsfile

+ 1 - 1
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']
 

+ 2 - 2
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'
       }
     }