Skip to content

Commit b5a17a4

Browse files
committed
chore: Bind browser e2e test into CI process
1 parent 76f4f58 commit b5a17a4

File tree

5 files changed

+41
-6
lines changed

5 files changed

+41
-6
lines changed

.travis.yml

+1
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ cache:
2828
- zeppelin-web/bower_components
2929

3030
addons:
31+
chrome: stable
3132
apt:
3233
sources:
3334
- r-packages-precise

pom.xml

+6
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,12 @@
8989
<scalatest.version>2.2.4</scalatest.version>
9090
<scalacheck.version>1.12.5</scalacheck.version>
9191

92+
<!-- frontend maven plugin related versions-->
93+
<node.version>v6.9.1</node.version>
94+
<yarn.version>v0.18.1</yarn.version>
95+
<npm.version>4.2.0</npm.version>
96+
<plugin.frontned.version>1.3</plugin.frontned.version>
97+
9298
<!-- common library versions -->
9399
<slf4j.version>1.7.10</slf4j.version>
94100
<log4j.version>1.2.17</log4j.version>

zeppelin-server/pom.xml

+33
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,11 @@
3232
<version>0.8.0-SNAPSHOT</version>
3333
<name>Zeppelin: Server</name>
3434

35+
<!-- See https://github.com/eirslett/frontend-maven-plugin/issues/229 -->
36+
<prerequisites>
37+
<maven>3.1.0</maven>
38+
</prerequisites>
39+
3540
<properties>
3641
<!--library versions-->
3742
<commons.httpclient.version>4.3.6</commons.httpclient.version>
@@ -427,6 +432,34 @@
427432
</executions>
428433
</plugin>
429434

435+
<!-- IMPORTANT: frontend-maven-plugin should be placed before maven-antrun-plugin
436+
so that browser-side integration test can run before stopping zeppelin daemon -->
437+
<plugin>
438+
<groupId>com.github.eirslett</groupId>
439+
<artifactId>frontend-maven-plugin</artifactId>
440+
<version>${plugin.frontned.version}</version>
441+
442+
<executions>
443+
<execution>
444+
<id>yarn e2e</id>
445+
<goals>
446+
<goal>yarn</goal>
447+
</goals>
448+
<phase>post-integration-test</phase>
449+
<configuration>
450+
<arguments>run e2e</arguments>
451+
</configuration>
452+
</execution>
453+
</executions>
454+
455+
<configuration>
456+
<!-- use existing yarn -->
457+
<workingDirectory>${project.parent.basedir}/zeppelin-web</workingDirectory>
458+
</configuration>
459+
</plugin>
460+
461+
<!-- IMPORTANT: maven-antrun-plugin should be placed after frontend-maven-plugin
462+
so that stopping zeppelin daemon after executing browser-side integration test -->
430463
<plugin>
431464
<groupId>org.apache.maven.plugins</groupId>
432465
<artifactId>maven-antrun-plugin</artifactId>

zeppelin-web/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
"dev:watch": "grunt watch-webpack-dev",
2020
"dev": "npm-run-all --parallel dev:server lint:watch dev:watch",
2121
"test:watch": "karma start karma.conf.js --single-run=false",
22+
"pree2e": "webdriver-manager update",
2223
"e2e": "protractor protractor.conf.js",
2324
"test": "karma start karma.conf.js"
2425
},

zeppelin-web/pom.xml

-6
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,7 @@
3838
</prerequisites>
3939

4040
<properties>
41-
<node.version>v6.9.1</node.version>
42-
<yarn.version>v0.18.1</yarn.version>
43-
<npm.version>4.2.0</npm.version>
4441
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
45-
46-
<!--plugin versions-->
47-
<plugin.frontned.version>1.3</plugin.frontned.version>
4842
</properties>
4943

5044
<build>

0 commit comments

Comments
 (0)