aboutsummaryrefslogtreecommitdiffstats
path: root/server/sonar-web
diff options
context:
space:
mode:
authorSimon Brandhof <simon.brandhof@sonarsource.com>2014-12-01 16:26:35 +0100
committerSimon Brandhof <simon.brandhof@sonarsource.com>2014-12-01 16:26:46 +0100
commit312e3bd4cda4abfe595fd07202dbcf5817ba1410 (patch)
tree938dbae4ecd9a9c31b67671384aa421df2c55aa8 /server/sonar-web
parent8487959c0fb4806da3a1c3474e520378b4cc302c (diff)
downloadsonarqube-312e3bd4cda4abfe595fd07202dbcf5817ba1410.tar.gz
sonarqube-312e3bd4cda4abfe595fd07202dbcf5817ba1410.zip
Disable execution of JS tests if -DskipTests
Diffstat (limited to 'server/sonar-web')
-rw-r--r--server/sonar-web/Gruntfile.coffee7
-rw-r--r--server/sonar-web/pom.xml30
2 files changed, 7 insertions, 30 deletions
diff --git a/server/sonar-web/Gruntfile.coffee b/server/sonar-web/Gruntfile.coffee
index de40b2108fc..404017b9b06 100644
--- a/server/sonar-web/Gruntfile.coffee
+++ b/server/sonar-web/Gruntfile.coffee
@@ -386,12 +386,7 @@ module.exports = (grunt) ->
grunt.registerTask 'default', [
- # testing first
- 'clean:js', 'coffee:build', 'handlebars:build', 'copy:js', 'concat:dev',
- 'express:test', 'casper:test'
-
- # then build
- 'clean:css', 'clean:js',
+ 'clean:css', 'clean:js',
'less:build', 'cssUrlRewrite:build'
'coffee:build', 'handlebars:build', 'copy:js',
'concat:build',
diff --git a/server/sonar-web/pom.xml b/server/sonar-web/pom.xml
index 8f72108bf80..4cc8a62f8ad 100644
--- a/server/sonar-web/pom.xml
+++ b/server/sonar-web/pom.xml
@@ -12,7 +12,7 @@
<name>SonarQube :: Web</name>
<properties>
- <gruntTask>default</gruntTask>
+ <gruntTask>test build</gruntTask>
<!-- self-analysis -->
<sonar.sources>src/main/js</sonar.sources>
@@ -188,33 +188,15 @@
<profiles>
<profile>
- <id>js-tests</id>
+ <id>skipJsTests</id>
<activation>
<property>
- <name>skipWebTests</name>
- <value>false</value>
+ <name>skipTests</name>
</property>
</activation>
- <build>
- <plugins>
- <plugin>
- <groupId>com.github.eirslett</groupId>
- <artifactId>frontend-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>javascript tests</id>
- <phase>test</phase>
- <goals>
- <goal>grunt</goal>
- </goals>
- <configuration>
- <arguments>test</arguments>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ <properties>
+ <gruntTask>build</gruntTask>
+ </properties>
</profile>
<profile>
<id>release</id>