chore: Bind browser e2e test into CI process

This commit is contained in:
1ambda 2017-07-10 18:26:50 +09:00
parent 76f4f584f4
commit b5a17a4baf
5 changed files with 41 additions and 6 deletions

View file

@ -28,6 +28,7 @@ cache:
- zeppelin-web/bower_components
addons:
chrome: stable
apt:
sources:
- r-packages-precise

View file

@ -89,6 +89,12 @@
<scalatest.version>2.2.4</scalatest.version>
<scalacheck.version>1.12.5</scalacheck.version>
<!-- frontend maven plugin related versions-->
<node.version>v6.9.1</node.version>
<yarn.version>v0.18.1</yarn.version>
<npm.version>4.2.0</npm.version>
<plugin.frontned.version>1.3</plugin.frontned.version>
<!-- common library versions -->
<slf4j.version>1.7.10</slf4j.version>
<log4j.version>1.2.17</log4j.version>

View file

@ -32,6 +32,11 @@
<version>0.8.0-SNAPSHOT</version>
<name>Zeppelin: Server</name>
<!-- See https://github.com/eirslett/frontend-maven-plugin/issues/229 -->
<prerequisites>
<maven>3.1.0</maven>
</prerequisites>
<properties>
<!--library versions-->
<commons.httpclient.version>4.3.6</commons.httpclient.version>
@ -427,6 +432,34 @@
</executions>
</plugin>
<!-- IMPORTANT: frontend-maven-plugin should be placed before maven-antrun-plugin
so that browser-side integration test can run before stopping zeppelin daemon -->
<plugin>
<groupId>com.github.eirslett</groupId>
<artifactId>frontend-maven-plugin</artifactId>
<version>${plugin.frontned.version}</version>
<executions>
<execution>
<id>yarn e2e</id>
<goals>
<goal>yarn</goal>
</goals>
<phase>post-integration-test</phase>
<configuration>
<arguments>run e2e</arguments>
</configuration>
</execution>
</executions>
<configuration>
<!-- use existing yarn -->
<workingDirectory>${project.parent.basedir}/zeppelin-web</workingDirectory>
</configuration>
</plugin>
<!-- IMPORTANT: maven-antrun-plugin should be placed after frontend-maven-plugin
so that stopping zeppelin daemon after executing browser-side integration test -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>

View file

@ -19,6 +19,7 @@
"dev:watch": "grunt watch-webpack-dev",
"dev": "npm-run-all --parallel dev:server lint:watch dev:watch",
"test:watch": "karma start karma.conf.js --single-run=false",
"pree2e": "webdriver-manager update",
"e2e": "protractor protractor.conf.js",
"test": "karma start karma.conf.js"
},

View file

@ -38,13 +38,7 @@
</prerequisites>
<properties>
<node.version>v6.9.1</node.version>
<yarn.version>v0.18.1</yarn.version>
<npm.version>4.2.0</npm.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<!--plugin versions-->
<plugin.frontned.version>1.3</plugin.frontned.version>
</properties>
<build>