diff options
| author | Simon Brandhof <simon.brandhof@sonarsource.com> | 2014-12-02 09:58:47 +0100 |
|---|---|---|
| committer | Simon Brandhof <simon.brandhof@sonarsource.com> | 2014-12-02 09:59:04 +0100 |
| commit | db4c7282d6f6e6b20f7113dd2d584a9300470cc3 (patch) | |
| tree | bb86168cfda1a6604486e3281f2fadf7dc0d41d5 | |
| parent | f867b3cd5822ca76ed8fa2e265d97c46b19a30b0 (diff) | |
| download | sonarqube-db4c7282d6f6e6b20f7113dd2d584a9300470cc3.tar.gz sonarqube-db4c7282d6f6e6b20f7113dd2d584a9300470cc3.zip | |
Fix disabling of JS tests by Maven
| -rw-r--r-- | server/sonar-web/Gruntfile.coffee | 28 | ||||
| -rw-r--r-- | server/sonar-web/pom.xml | 15 |
2 files changed, 22 insertions, 21 deletions
diff --git a/server/sonar-web/Gruntfile.coffee b/server/sonar-web/Gruntfile.coffee index 404017b9b06..18182116218 100644 --- a/server/sonar-web/Gruntfile.coffee +++ b/server/sonar-web/Gruntfile.coffee @@ -393,15 +393,29 @@ module.exports = (grunt) -> 'requirejs', 'clean:js', 'copy:build', 'copy:requirejs', 'uglify:build', 'clean:build'] - grunt.registerTask 'build', ['clean:css', 'clean:js', - 'less:build', 'cssUrlRewrite:build' - 'coffee:build', 'handlebars:build', 'copy:js', - 'concat:build', - 'requirejs', 'clean:js', 'copy:build', 'copy:requirejs', 'uglify:build', - 'clean:build'] - grunt.registerTask 'test', ['clean:js', 'coffee:build', 'handlebars:build', 'copy:js', 'concat:dev', 'express:test', 'casper:test'] grunt.registerTask 'single', ['clean:js', 'coffee:build', 'handlebars:build', 'copy:js', 'concat:dev', 'express:test', 'casper:single'] + + + # task used by Maven build (see pom.xml). + grunt.registerTask 'maven-build-skip-tests-true', [ + 'clean:css', 'clean:js', + 'less:build', 'cssUrlRewrite:build' + 'coffee:build', 'handlebars:build', 'copy:js', + 'concat:build', + 'requirejs', 'clean:js', 'copy:build', 'copy:requirejs', 'uglify:build', + 'clean:build'] + + grunt.registerTask 'maven-build-skip-tests-false', [ + 'clean:js', 'coffee:build', 'handlebars:build', 'copy:js', 'concat:dev', + 'express:test', 'casper:test', + + 'clean:css', 'clean:js', + 'less:build', 'cssUrlRewrite:build' + 'coffee:build', 'handlebars:build', 'copy:js', + 'concat:build', + 'requirejs', 'clean:js', 'copy:build', 'copy:requirejs', 'uglify:build', + 'clean:build'] diff --git a/server/sonar-web/pom.xml b/server/sonar-web/pom.xml index 4cc8a62f8ad..5aa019599ec 100644 --- a/server/sonar-web/pom.xml +++ b/server/sonar-web/pom.xml @@ -12,8 +12,6 @@ <name>SonarQube :: Web</name> <properties> - <gruntTask>test build</gruntTask> - <!-- self-analysis --> <sonar.sources>src/main/js</sonar.sources> <sonar.exclusions>src/main/js/third-party/**/*,src/main/js/require.js,src/main/js/tests/**/*</sonar.exclusions> @@ -157,7 +155,7 @@ <goal>grunt</goal> </goals> <configuration> - <arguments>${gruntTask} --port=${jsTestPort}</arguments> + <arguments>maven-build-skip-tests-${skipWebTests} --port=${jsTestPort}</arguments> </configuration> </execution> </executions> @@ -188,17 +186,6 @@ <profiles> <profile> - <id>skipJsTests</id> - <activation> - <property> - <name>skipTests</name> - </property> - </activation> - <properties> - <gruntTask>build</gruntTask> - </properties> - </profile> - <profile> <id>release</id> <build> <plugins> |