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 22c4eaaafa..083c7c7200 100644
--- a/webclient/test/karma.conf.js
+++ b/webclient/test/karma.conf.js
@@ -23,6 +23,8 @@ module.exports = function(config) {
'../js/angular-animate.js',
'../js/angular-sanitize.js',
'../js/ng-infinite-scroll-matrix.js',
+ '../js/ui-bootstrap*',
+ '../js/elastic.js',
'../login/**/*.*',
'../room/**/*.*',
'../components/**/*.*',
@@ -35,6 +37,10 @@ module.exports = function(config) {
'./unit/**/*.js'
],
+ plugins: [
+ 'karma-*',
+ ],
+
// list of files to exclude
exclude: [
@@ -50,8 +56,11 @@ module.exports = function(config) {
// test results reporter to use
// possible values: 'dots', 'progress'
// available reporters: https://npmjs.org/browse/keyword/karma-reporter
- reporters: ['progress'],
-
+ reporters: ['progress', 'junit'],
+ junitReporter: {
+ outputFile: 'test-results.xml',
+ suite: ''
+ },
// web server port
port: 9876,
@@ -72,11 +81,11 @@ module.exports = function(config) {
// start these browsers
// available browser launchers: https://npmjs.org/browse/keyword/karma-launcher
- browsers: ['Chrome'],
+ browsers: ['PhantomJS'],
// Continuous Integration mode
// if true, Karma captures browsers, runs the tests and exits
- singleRun: false
+ singleRun: true
});
};
|
