add e2e tests

dabeng · Jan 1, 2018 · 2f03106 · 2f03106
1 parent 18fc299
commit 2f03106
Show file tree

Hide file tree

Showing 53 changed files with 1,560 additions and 605 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,3 +1,22 @@
 language: node_js
-node_js:
-  - "6"
+node_js: "stable"
+
+ before_install:
+    - stty cols 80
+
+dist: trusty
+sudo: required
+
+addons:
+  firefox: latest
+  apt:
+    sources:
+     - google-chrome
+    packages:
+     - google-chrome-stable fluxbox
+
+before_script:
+  - "export DISPLAY=:99.0"
+  - "sh -e /etc/init.d/xvfb start"
+  - sleep 3
+  - fluxbox >/dev/null 2>&1 &
diff --git a/README.md b/README.md
@@ -125,7 +125,7 @@ No problem. With the help of ES6 Template literals, we can customize the any com
 - you have to install node.js v6+ because our unit tests are based on jsdom v11
 - you have to install modern browsers because many behaviors of orgchart plugin are based on HTML5 and CSS3
 - run ```npm install``` to install necessary dependencies
-- run ```npm test``` to start up unit testing
+- run ```npm test``` to run all tests including unit tests, integration tests and e2e tests
 - run ```npm run build``` to generate production js&css files of plugin
 - run ```npm start``` to start up local web server to host all the demos
 

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "orgchart",
-  "version": "2.0.14",
+  "version": "2.0.15",
   "homepage": "https://github.com/dabeng/OrgChart",
   "authors": [
     "dabeng <[email protected]>"

diff --git a/demo/ajax-datasource.html b/demo/ajax-datasource.html
@@ -5,15 +5,15 @@
   <title>Organization Chart Plugin</title>
   <link rel="icon" href="img/logo.png">
   <link rel="stylesheet" href="css/font-awesome.min.css">
-  <link rel="stylesheet" href="css/jquery.orgchart.min.css">
+  <link rel="stylesheet" href="css/jquery.orgchart.css">
   <link rel="stylesheet" href="css/style.css">
 </head>
 <body>
   <div id="chart-container"></div>
 
   <script type="text/javascript" src="js/jquery.min.js"></script>
   <script type="text/javascript" src="js/jquery.mockjax.min.js"></script>
-  <script type="text/javascript" src="js/jquery.orgchart.min.js"></script>
+  <script type="text/javascript" src="js/jquery.orgchart.js"></script>
   <script type="text/javascript">
     $(function() {
 

diff --git a/demo/bottom2top.html b/demo/bottom2top.html
@@ -5,14 +5,14 @@
   <title>Organization Chart Plugin</title>
   <link rel="icon" href="img/logo.png">
   <link rel="stylesheet" href="css/font-awesome.min.css">
-  <link rel="stylesheet" href="css/jquery.orgchart.min.css">
+  <link rel="stylesheet" href="css/jquery.orgchart.css">
   <link rel="stylesheet" href="css/style.css">
 </head>
 <body>
   <div id="chart-container"></div>
 
   <script type="text/javascript" src="js/jquery.min.js"></script>
-  <script type="text/javascript" src="js/jquery.orgchart.min.js"></script>
+  <script type="text/javascript" src="js/jquery.orgchart.js"></script>
   <script type="text/javascript">
     $(function() {
 

diff --git a/demo/center-on-selected-node.html b/demo/center-on-selected-node.html
@@ -7,7 +7,7 @@
   <title>Organization Chart Plugin</title>
   <link rel="icon" href="img/logo.png">
   <link rel="stylesheet" href="css/font-awesome.min.css">
-  <link rel="stylesheet" href="css/jquery.orgchart.min.css">
+  <link rel="stylesheet" href="css/jquery.orgchart.css">
   <link rel="stylesheet" href="css/style.css">
   <style type="text/css">
     .orgchart { background: white; }
@@ -17,7 +17,7 @@
   <div id="chart-container"></div>
 
   <script type="text/javascript" src="js/jquery.min.js"></script>
-  <script type="text/javascript" src="js/jquery.orgchart.min.js"></script>
+  <script type="text/javascript" src="js/jquery.orgchart.js"></script>
   <script type="text/javascript">
     $(function() {
 

diff --git a/demo/color-coded.html b/demo/color-coded.html
@@ -5,7 +5,7 @@
   <title>Organization Chart Plugin</title>
   <link rel="icon" href="img/logo.png">
   <link rel="stylesheet" href="css/font-awesome.min.css">
-  <link rel="stylesheet" href="css/jquery.orgchart.min.css">
+  <link rel="stylesheet" href="css/jquery.orgchart.css">
   <link rel="stylesheet" href="css/style.css">
   <style type="text/css">
     .orgchart { background: #fff; }
@@ -27,7 +27,7 @@
   <div id="chart-container"></div>
 
   <script type="text/javascript" src="js/jquery.min.js"></script>
-  <script type="text/javascript" src="js/jquery.orgchart.min.js"></script>
+  <script type="text/javascript" src="js/jquery.orgchart.js"></script>
   <script type="text/javascript">
     $(function() {