From 1808ce621de6b80e9b465d963694a96fb67e41c0 Mon Sep 17 00:00:00 2001
From: Eirik Sletteberg <eiriksletteberg@gmail.com>
Date: Tue, 18 Jul 2017 14:55:11 +0200
Subject: [PATCH] More revert #572

---
 README.md                                     | 12 -----
 .../src/it/example project/package.json       |  3 --
 .../src/it/example project/pom.xml            | 45 -------------------
 .../src/it/example project/verify.groovy      |  2 -
 4 files changed, 62 deletions(-)

diff --git a/README.md b/README.md
index f50ae0dfb..1759d2d7f 100644
--- a/README.md
+++ b/README.md
@@ -456,18 +456,6 @@ tag of an execution like this:
 </configuration>
 ```
 
-If you want to generally ignore tests run maven with the `-Dmaven.test.failure.ignore=true` flag, test/integration-test results will not stop the build.
-
-**Ignoring other failures:** If you need to ignore other failures you can set that using the property `failOnError` in configuration tag of an execution like this:
-
-```xml
-<configuration>
-    <failOnError>true</failOnError>
-</configuration>
-```
-
-If you want to ignore all failures run maven with the `-DfailOnError=true` flag.
-
 #### Skipping Execution
 
 Each frontend build tool and package manager allows skipping execution.
diff --git a/frontend-maven-plugin/src/it/example project/package.json b/frontend-maven-plugin/src/it/example project/package.json
index dd59b6571..eb72a1dd5 100644
--- a/frontend-maven-plugin/src/it/example project/package.json	
+++ b/frontend-maven-plugin/src/it/example project/package.json	
@@ -26,9 +26,6 @@
   },
   "scripts": {
     "prebuild": "npm install",
-    "pre-test": "echo pre-integration-test-success",
-    "test": "return 1",
-    "post-test": "echo post-integration-test-success",
     "build": "gulp"
   }
 }
diff --git a/frontend-maven-plugin/src/it/example project/pom.xml b/frontend-maven-plugin/src/it/example project/pom.xml
index efbe48237..c6794f3a5 100644
--- a/frontend-maven-plugin/src/it/example project/pom.xml	
+++ b/frontend-maven-plugin/src/it/example project/pom.xml	
@@ -104,51 +104,6 @@
             </configuration>
           </execution>
 
-          <!-- Integration Tests -->
-          <execution>
-            <id>npm-pre-integration-test</id>
-            <goals>
-              <goal>npm</goal>
-            </goals>
-            <configuration>
-              <arguments>run pre-test</arguments>
-            </configuration>
-            <phase>pre-integration-test</phase>
-          </execution>
-          <execution>
-            <id>npm-integration-test-failSafeTest</id>
-            <goals>
-              <goal>npm</goal>
-            </goals>
-            <configuration>
-              <arguments>run test</arguments>
-              <testFailureIgnore>true</testFailureIgnore>
-            </configuration>
-            <phase>integration-test</phase>
-          </execution>
-          <execution>
-            <id>npm-integration-test-failOnError</id>
-            <goals>
-              <goal>npm</goal>
-            </goals>
-            <configuration>
-              <arguments>run test</arguments>
-              <failOnError>false</failOnError>
-            </configuration>
-            <phase>integration-test</phase>
-          </execution>
-          <execution>
-            <id>npm-post-integration-test</id>
-            <goals>
-              <goal>npm</goal>
-            </goals>
-            <configuration>
-              <arguments>run post-test</arguments>
-              <testFailureIgnore>true</testFailureIgnore>
-            </configuration>
-            <phase>post-integration-test</phase>
-          </execution>
-
         </executions>
       </plugin>
     </plugins>
diff --git a/frontend-maven-plugin/src/it/example project/verify.groovy b/frontend-maven-plugin/src/it/example project/verify.groovy
index 5a4124f25..a36508ecb 100644
--- a/frontend-maven-plugin/src/it/example project/verify.groovy	
+++ b/frontend-maven-plugin/src/it/example project/verify.groovy	
@@ -6,6 +6,4 @@ assert buildLog.contains('gulp runs as expected') : 'gulp failed to run as expec
 assert buildLog.contains('Running against local jspm install.') : 'jspm failed to run as expected'
 assert buildLog.contains('5 files lint free.') : 'grunt failed to run as expected'
 assert buildLog.contains('Executed 1 of 1 SUCCESS') : 'karma failed to run as expected'
-assert buildLog.contains('post-integration-test-success') : 'failOnError does not works as expected'
-assert buildLog.contains('testFailureIgnore property is ignored in non test phases') : 'testFailureIgnore does not works as expected'
 assert buildLog.contains('BUILD SUCCESS') : 'build was not successful'
\ No newline at end of file