From 0e65a15e4bd8dec4fcf5c345f2ba69ebd5ca118e Mon Sep 17 00:00:00 2001
From: Garren Smith <garren.smith@gmail.com>
Date: Wed, 24 Feb 2016 07:08:09 +0200
Subject: [PATCH 1/6] travis docker

---
 .travis.yml | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e971b59b5..4bcd7623d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,25 +4,21 @@ otp_release:
 git:
   depth: 10
 
+sudo:
+  false
+
+services:
+  - docker
+
 addons:
   firefox: "38.0.1"
 before_install:
   - sudo apt-get update -qq
   - sudo apt-get install -qq flashplugin-installer
-  - sudo apt-get -y install libicu-dev libmozjs-dev pkg-config help2man libcurl4-openssl-dev
-  - sudo apt-get -y install libtool automake autoconf autoconf-archive
-  - sudo apt-get -y install haproxy
 
   - nvm install 4 && nvm use 4
 
-  - cd ..
-  - git clone --depth=1 https://github.com/apache/couchdb
-  - cd couchdb
-  - ./configure --disable-docs
-  - make
-  - ./dev/run --admin=tester:testerpass &
-  - haproxy -f rel/haproxy.cfg &
-  - cd .. && cd couchdb-fauxton
+  - docker run -d -p 5984:5984 klaemo/couchdb:2.0-dev --with-haproxy --admin=tester:testerpass
   - npm install
 
   - export DISPLAY=:99.0
@@ -34,9 +30,14 @@ before_script:
   - ./bin/fauxton &
   - sleep 30
 script:
-  - ./node_modules/grunt-cli/bin/grunt nightwatch
+  - ./node_modules/grunt-cli/bin/grunt $COMMAND
 
 cache: apt
 
+env:
+  matrix:
+    - COMMAND=test
+    - COMMAND=nightwatch
+
 git:
   depth: 1

From 1f5d39edb61ee7789f0dc61febcbd79386dc75b2 Mon Sep 17 00:00:00 2001
From: Garren Smith <garren.smith@gmail.com>
Date: Wed, 24 Feb 2016 08:07:58 +0200
Subject: [PATCH 2/6] remove sudo:false

---
 .travis.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 4bcd7623d..f0c2cd1ff 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,9 +4,6 @@ otp_release:
 git:
   depth: 10
 
-sudo:
-  false
-
 services:
   - docker
 

From 4f568c071541146ef5d285d8386d4c3a2fa4e4e6 Mon Sep 17 00:00:00 2001
From: Garren Smith <garren.smith@gmail.com>
Date: Wed, 24 Feb 2016 08:12:10 +0200
Subject: [PATCH 3/6] apt

---
 .travis.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f0c2cd1ff..24a287322 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,10 +9,11 @@ services:
 
 addons:
   firefox: "38.0.1"
+  apt:
+    sources:
+      - flashplugin-installer
+      
 before_install:
-  - sudo apt-get update -qq
-  - sudo apt-get install -qq flashplugin-installer
-
   - nvm install 4 && nvm use 4
 
   - docker run -d -p 5984:5984 klaemo/couchdb:2.0-dev --with-haproxy --admin=tester:testerpass

From 9fc1fac2aea9ddb6d497f4ad9a55ee10ba2693bd Mon Sep 17 00:00:00 2001
From: Garren Smith <garren.smith@gmail.com>
Date: Wed, 24 Feb 2016 08:21:14 +0200
Subject: [PATCH 4/6] sudo true

---
 .travis.yml  | 11 ++++++-----
 package.json |  3 ++-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 24a287322..ef3e9a04c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,13 +7,14 @@ git:
 services:
   - docker
 
+sudo: true
+
 addons:
   firefox: "38.0.1"
-  apt:
-    sources:
-      - flashplugin-installer
-      
 before_install:
+  - sudo apt-get update -qq
+  - sudo apt-get install -qq flashplugin-installer
+
   - nvm install 4 && nvm use 4
 
   - docker run -d -p 5984:5984 klaemo/couchdb:2.0-dev --with-haproxy --admin=tester:testerpass
@@ -35,7 +36,7 @@ cache: apt
 env:
   matrix:
     - COMMAND=test
-    - COMMAND=nightwatch
+    - COMMAND=nightwatchtravis
 
 git:
   depth: 1
diff --git a/package.json b/package.json
index 4b4d35623..01a5c8ebd 100644
--- a/package.json
+++ b/package.json
@@ -100,7 +100,8 @@
     "dev": "node ./devserver.js",
     "nightwatch": "grunt nightwatch",
     "start": "node ./bin/fauxton",
-    "postinstall": "node version-check.js && grunt release"
+    "postinstall": "node version-check.js && grunt release",
+    "nightwatchtravis": "./node_modules/grunt-cli/bin/grunt dev & && sleep 25 && ./node_modules/grunt-cli/bin/grunt nightwatch"
   },
   "repository": {
     "type": "git",

From 7b8c072013f65b14a1f87a2107dfacdc34560eed Mon Sep 17 00:00:00 2001
From: Garren Smith <garren.smith@gmail.com>
Date: Wed, 30 Mar 2016 16:52:16 +0200
Subject: [PATCH 5/6] adjust to webpack

---
 .travis.yml | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ef3e9a04c..cadbcbc91 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,9 +12,6 @@ sudo: true
 addons:
   firefox: "38.0.1"
 before_install:
-  - sudo apt-get update -qq
-  - sudo apt-get install -qq flashplugin-installer
-
   - nvm install 4 && nvm use 4
 
   - docker run -d -p 5984:5984 klaemo/couchdb:2.0-dev --with-haproxy --admin=tester:testerpass
@@ -29,14 +26,9 @@ before_script:
   - ./bin/fauxton &
   - sleep 30
 script:
-  - ./node_modules/grunt-cli/bin/grunt $COMMAND
+  - ./node_modules/grunt-cli/bin/grunt nightwatch
 
 cache: apt
 
-env:
-  matrix:
-    - COMMAND=test
-    - COMMAND=nightwatchtravis
-
 git:
   depth: 1

From f5651f28fb00810157e8527581adf948dbb45185 Mon Sep 17 00:00:00 2001
From: Garren Smith <garren.smith@gmail.com>
Date: Wed, 30 Mar 2016 17:23:24 +0200
Subject: [PATCH 6/6] nodejs travis

---
 .travis.yml | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index cadbcbc91..0e57438df 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,6 @@
-language: erlang
-otp_release:
-   - 17.4
+language: node_js
+node_js:
+  "4.0"
 git:
   depth: 10
 
@@ -12,8 +12,6 @@ sudo: true
 addons:
   firefox: "38.0.1"
 before_install:
-  - nvm install 4 && nvm use 4
-
   - docker run -d -p 5984:5984 klaemo/couchdb:2.0-dev --with-haproxy --admin=tester:testerpass
   - npm install