From 9969d6095d46488c0c56663da68b6d9e0ccaac68 Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Wed, 5 Jul 2017 09:43:40 +0100
Subject: [PATCH] Remove phantomjs; add chrome

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

diff --git a/.travis.yml b/.travis.yml
index 0656064ec2..55744222b1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,7 +16,9 @@ node_js:
     - 6.3
     - 6
     - 7
+addons:
+    chrome: stable
 install:
     # clone the deps with depth 1: we know we will only ever need that one
     # commit.
-    - scripts/fetch-develop.deps.sh --depth 1 && npm i phantomjs-prebuilt && npm install
+    - scripts/fetch-develop.deps.sh --depth 1 && npm install
diff --git a/package.json b/package.json
index dc1058c9e4..83d9bd16a8 100644
--- a/package.json
+++ b/package.json
@@ -119,14 +119,12 @@
     "karma-cli": "^0.1.2",
     "karma-junit-reporter": "^0.4.1",
     "karma-mocha": "^0.2.2",
-    "karma-phantomjs-launcher": "^1.0.0",
     "karma-webpack": "^1.7.0",
     "matrix-mock-request": "^1.0.0",
     "minimist": "^1.2.0",
     "mkdirp": "^0.5.1",
     "mocha": "^2.4.5",
     "parallelshell": "^1.2.0",
-    "phantomjs-prebuilt": "^2.1.7",
     "postcss-extend": "^1.0.5",
     "postcss-import": "^9.0.0",
     "postcss-loader": "^1.2.2",