Disable execution of JS tests if -DskipTests

diff --git a/server/sonar-web/Gruntfile.coffee b/server/sonar-web/Gruntfile.coffee
index de40b2108fc3293e6e6242bd5f26660509e63534..404017b9b0674a63ae842503e13882a7e089cd64 100644 (file)
--- 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 8f72108bf80a533b8cbee90dc497c525c25412ed..4cc8a62f8ad32716cf1aaa0c5f3c763bd85a61b2 100644 (file)
--- 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>