Skip to content

Codecrew / Moya

Go to a project
Commit 2dd354b0 by Tuukka Kivilahti
Options

Merge branch 'feature/ng-mvn' into 'master' 

Add angular tests to maven build-lifecycle

See merge request !401
2 parents 806c9c54 b5ffbd0a
Inline Side-by-side
Showing with 28 additions and 30 deletions
code/moya-angular/package.json
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
"aot": "ng build --aot", "aot": "ng build --aot",
"test": "ng test", "test": "ng test",
"lint": "ng lint", "lint": "ng lint",
"test-n-build": "ng lint && ng test && ng build",
"e2e": "ng e2e", "e2e": "ng e2e",
"version": "ng version" "version": "ng version"
}, },
......
code/moya-angular/pom.xml
...@@ -27,36 +27,33 @@ ...@@ -27,36 +27,33 @@
<executions> <executions>
<execution> <execution>
<!-- optional: you don't really need execution ids, <!-- optional: you don't really need execution ids,
but it looks nice in your build log. --> but it looks nice in your build log. -->
<id>install node and npm</id> <id>install node and npm</id>
<goals> <goals>
<goal>install-node-and-npm</goal> <goal>install-node-and-npm</goal>
</goals> </goals>
<configuration> <configuration>
<nodeVersion>${js.node.version}</nodeVersion> <nodeVersion>${js.node.version}</nodeVersion>
<npmVersion>${js.npm.version}</npmVersion> <npmVersion>${js.npm.version}</npmVersion>
</configuration> </configuration>
</execution> </execution>
<execution>
<execution> <id>npm install</id>
<id>npm install</id> <goals>
<goals> <goal>npm</goal>
<goal>npm</goal> </goals>
</goals> </execution>
</execution> <execution>
<id>npm run build</id>
<execution> <goals>
<id>npm run build</id> <goal>npm</goal>
<goals> </goals>
<goal>npm</goal> <phase>generate-resources</phase>
</goals> <configuration>
<phase>generate-resources</phase> <arguments>run test-n-build</arguments>
<configuration> </configuration>
<arguments>run build</arguments> </execution>
</configuration>
</execution>
</executions> </executions>
</plugin> </plugin>
</plugins> </plugins>
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!