From ae48e75ad70cfc45d01647a4172a6c7f7659a6c0 Mon Sep 17 00:00:00 2001
From: Kegan Dougal <kegan@matrix.org>
Date: Tue, 4 Nov 2014 14:38:45 +0000
Subject: Use phantomjs as the default browser and not chrome.

---
 webclient/test/README        | 30 ++++++++++++++++++++++++------
 webclient/test/karma.conf.js |  2 +-
 2 files changed, 25 insertions(+), 7 deletions(-)

(limited to 'webclient')

diff --git a/webclient/test/README b/webclient/test/README
index 1a7bc832c7..e7ed4eaa87 100644
--- a/webclient/test/README
+++ b/webclient/test/README
@@ -1,13 +1,31 @@
-Requires:
- - nodejs/npm
- - npm install karma
+Testing is done using Karma.
+
+
+UNIT TESTING
+============
+
+Requires the following:
+ - npm/nodejs
+ - phantomjs
+
+Requires the following node packages:
  - npm install jasmine
- - npm install protractor (e2e testing)
+ - npm install karma
+ - npm install karma-jasmine
+ - npm install karma-phantomjs-launcher
+ - npm install karma-junit-reporter
 
-Setting up continuous integration / run the unit tests (make sure you're in
-this directory so it can find the config file):
+Make sure you're in this directory so it can find the config file and run:
   karma start
 
+You should see all the tests pass.
+
+
+E2E TESTING
+===========
+
+npm install protractor
+
 
 Setting up e2e tests (only if you don't have a selenium server to run the tests
 on. If you do, edit the config to point to that url):
diff --git a/webclient/test/karma.conf.js b/webclient/test/karma.conf.js
index df63ae8267..83c9dca579 100644
--- a/webclient/test/karma.conf.js
+++ b/webclient/test/karma.conf.js
@@ -82,7 +82,7 @@ module.exports = function(config) {
 
     // start these browsers
     // available browser launchers: https://npmjs.org/browse/keyword/karma-launcher
-    browsers: ['Chrome'],
+    browsers: ['PhantomJS'],
 
 
     // Continuous Integration mode
-- 
cgit 1.4.1