From 4e52f9699b941f7845c2d88fb11428a2c30de465 Mon Sep 17 00:00:00 2001
From: Kegan Dougal <kegan@matrix.org>
Date: Tue, 4 Nov 2014 16:15:13 +0000
Subject: Update .gitignore to ignore config.js files in syweb/webclient.

---
 .gitignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '.gitignore')

diff --git a/.gitignore b/.gitignore
index b91b52b615..bd37f92dc4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,7 +24,7 @@ graph/*.svg
 graph/*.png
 graph/*.dot
 
-webclient/config.js
+**/webclient/config.js
 webclient/test/environment-protractor.js
 
 uploads
-- 
cgit 1.4.1


From 192fce51d743a99700c0686ed03ba272c9053467 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Tue, 11 Nov 2014 21:18:33 +0200
Subject: hide crap from gitignore

---
 .gitignore | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to '.gitignore')

diff --git a/.gitignore b/.gitignore
index bd37f92dc4..3d14ac8c03 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 *.pyc
 .*.swp
 
+.DS_Store
 _trial_temp/
 logs/
 dbs/
@@ -11,6 +12,14 @@ docs/build/
 
 cmdclient_config.json
 homeserver*.db
+homeserver*.log
+homeserver*.pid
+homeserver*.yaml
+
+*.signing.key
+*.tls.crt
+*.tls.dh
+*.tls.key
 
 .coverage
 htmlcov
-- 
cgit 1.4.1


From 3d3f692fd8a3fe07daf2f5b8811ebc00846b60c1 Mon Sep 17 00:00:00 2001
From: Kegan Dougal <kegan@matrix.org>
Date: Wed, 12 Nov 2014 16:22:14 +0000
Subject: Add test coverage to the webclient. Update .gitignore

---
 .gitignore                                          |  3 ++-
 syweb/webclient/components/matrix/matrix-service.js |  2 +-
 syweb/webclient/test/karma.conf.js                  | 16 +++++++++++++++-
 3 files changed, 18 insertions(+), 3 deletions(-)

(limited to '.gitignore')

diff --git a/.gitignore b/.gitignore
index 3d14ac8c03..339a99e0d6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,6 +34,7 @@ graph/*.png
 graph/*.dot
 
 **/webclient/config.js
-webclient/test/environment-protractor.js
+**/webclient/test/coverage/
+**/webclient/test/environment-protractor.js
 
 uploads
diff --git a/syweb/webclient/components/matrix/matrix-service.js b/syweb/webclient/components/matrix/matrix-service.js
index c1264887c8..cfe8691f85 100644
--- a/syweb/webclient/components/matrix/matrix-service.js
+++ b/syweb/webclient/components/matrix/matrix-service.js
@@ -23,7 +23,7 @@ This serves to isolate the caller from changes to the underlying url paths, as
 well as attach common params (e.g. access_token) to requests.
 */
 angular.module('matrixService', [])
-.factory('matrixService', ['$http', '$q', '$rootScope', function($http, $q, $rootScope) {
+.factory('matrixService', ['$http', '$q', function($http, $q) {
         
    /* 
     * Permanent storage of user information
diff --git a/syweb/webclient/test/karma.conf.js b/syweb/webclient/test/karma.conf.js
index 5f0642ca33..37a9eaf1c1 100644
--- a/syweb/webclient/test/karma.conf.js
+++ b/syweb/webclient/test/karma.conf.js
@@ -52,18 +52,32 @@ module.exports = function(config) {
     // preprocess matching files before serving them to the browser
     // available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor
     preprocessors: {
+      '../login/**/*.js': 'coverage', 
+      '../room/**/*.js': 'coverage',
+      '../components/**/*.js': 'coverage',
+      '../user/**/*.js': 'coverage',
+      '../home/**/*.js': 'coverage',
+      '../recents/**/*.js': 'coverage',
+      '../settings/**/*.js': 'coverage',
+      '../app.js': 'coverage'
     },
 
 
     // test results reporter to use
     // possible values: 'dots', 'progress'
     // available reporters: https://npmjs.org/browse/keyword/karma-reporter
-    reporters: ['progress', 'junit'],
+    reporters: ['progress', 'junit', 'coverage'],
     junitReporter: {
         outputFile: 'test-results.xml',
         suite: ''
     },
 
+    coverageReporter: {
+        type: 'cobertura',
+        dir: 'coverage/',
+        file: 'coverage.xml'
+    },
+
     // web server port
     port: 9876,
 
-- 
cgit 1.4.1