Merge pull request #191 from ddumont/master

Closes #72 Skip test with -Dmaven.test.skip=true
searls · Aug 17, 2013 · af8a78b · af8a78b
2 parents 6447ac2 + 6d2f654
commit af8a78b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/src/main/java/com/github/searls/jasmine/mojo/AbstractJasmineMojo.java b/src/main/java/com/github/searls/jasmine/mojo/AbstractJasmineMojo.java
@@ -165,14 +165,23 @@ public abstract class AbstractJasmineMojo extends AbstractMojo implements Jasmin
 	@Parameter(defaultValue="${project.build.directory}${file.separator}jasmine")
 	protected File jasmineTargetDir;
 
-
 	/**
-	 * Skip the tests.
+	 * Skip execution of tests.
 	 * 
 	 * @since 1.1.0
+	 * @see <a href="http://maven.apache.org/general.html#skip-test">http://maven.apache.org/general.html#skip-test</a>
 	 */
 	@Parameter(property="skipTests")
 	protected boolean skipTests;
+
+	/**
+   * Skip compilation and execution of tests.
+   * 
+   * @since 1.3.1.3
+   * @see <a href="http://maven.apache.org/general.html#skip-test">http://maven.apache.org/general.html#skip-test</a>
+   */
+	@Parameter(property="maven.test.skip")
+  protected boolean mvnTestSkip;
 
 	/**
 	 * Halt the build on test failure.

diff --git a/src/main/java/com/github/searls/jasmine/mojo/TestMojo.java b/src/main/java/com/github/searls/jasmine/mojo/TestMojo.java
@@ -34,7 +34,7 @@ public TestMojo() {
 
   @Override
   public void run() throws Exception {
-    if(!this.skipTests) {
+    if(!this.skipTests && !this.mvnTestSkip) {
       ServerManager serverManager = this.getServerManager();
       try {
         int port = serverManager.start();