fix conflicts

Author: fredkingham

.coveragerc

@@ -0,0 +1,22 @@
+[run]
+source =
+       elcid
+       microhaem
+       infectiousdiseases
+       opat
+       research
+       walkin
+
+omit =
+    */migrations/*
+    elcid/test/*
+    elcid/wsgi*
+    microhaem/tests/*
+    opat/tests/*
+    research/tests/*
+    walkin/tests/*
+
+[report]
+
+exclude_lines =
+    def __unicode__

.travis.yml

@@ -3,12 +3,19 @@ python:
   - "2.7"
 install:
   - pip install -r requirements.txt --use-mirrors
-  - npm install karma karma-coverage [email protected] karma-firefox-launcher
-  - gem install rake
+  - pip install coveralls
+  - gem install coveralls-lcov
+  - npm install karma karma-coverage karma-jasmine karma-firefox-launcher karma-coveralls
 before_script:
   - export DISPLAY=:99.0
   - sh -e /etc/init.d/xvfb start
 script:
-  - rake test
+  - opal test --coverage
+after_success:
+  - find coverage
+  - coveralls-lcov -v -n coverage/Firefox\ 38.0.0\ \(Linux\ 0.0.0\)/lcov.info > coverage/coverage.json
+  - cat coverage/coverage.json
+  - coveralls debug --merge=coverage/coverage.json
+  - coveralls --merge=coverage/coverage.json
 notifications:
   slack: ohcuk:6spaME3CB7f2PGrMAcklYWqp

README.md

@@ -8,6 +8,7 @@ It is highly customisable open source software for managing inpatients & outpati
 
 [![Build
 Status](https://travis-ci.org/openhealthcare/elcid.png)](https://travis-ci.org/openhealthcare/elcid)
+[![Coverage Status](https://coveralls.io/repos/github/openhealthcare/elcid/badge.svg?branch=master)](https://coveralls.io/github/openhealthcare/elcid?branch=master)
 
 http://elcid.openhealthcare.org.uk
 
@@ -61,3 +62,5 @@ http://www.openhealthcare.org.uk
 https://twitter.com/ohcuk
 
 https://groups.google.com/forum/?ohc-dev#!forum/ohc-opal
+
+channel #ohc_dev on freenode

Rakefile

@@ -0,0 +1,115 @@
+module.exports =  function(config){
+    var browsers, basePath, coverageReporter;
+
+    if(process.env.TRAVIS){
+        browsers = ["Firefox"];
+        basePath = '/home/travis/virtualenv/python2.7/src/opal/opal/static/js';
+        coverageReporter = {
+            type: 'lcovonly', // lcov or lcovonly are required for generating lcov.info files
+            dir: __dirname + '/../coverage/',
+        };
+    }
+    else{
+        browsers = ['PhantomJS'];
+        basePath = '../../opal/opal/static/js';
+        coverageReporter = {
+            type : 'html',
+            dir : __dirname + '/../htmlcov/js/'
+        };
+    }
+
+    var preprocessors = {};
+    preprocessors[__dirname + '/../elcid/assets/js/elcid/*'] = 'coverage';
+    preprocessors[__dirname + '/../elcid/assets/js/elcid/controllers/*'] = 'coverage';
+    preprocessors[__dirname + '/../elcid/assets/js/elcid/services/*'] = 'coverage';
+    preprocessors[__dirname + '/../elcid/assets/js/elcid/services/records/*'] = 'coverage';
+    preprocessors[__dirname + '/../opat/static/js/opat/controllers/*'] = 'coverage';
+    preprocessors[__dirname + '/../research/static/js/research/controllers/*'] = 'coverage';
+    preprocessors[__dirname + '/../walkin/static/js/walkin/controllers/*'] = 'coverage';
+
+    config.set({
+        frameworks: ['jasmine'],
+        browsers: browsers,
+        basePath:  basePath,
+
+        files: [
+            //JASMINE,
+            //JASMINE_ADAPTER,
+            "lib/bower_components/angular/angular.js",
+            "lib/bower_components/angular-route/angular-route.js",
+            "lib/bower_components/angular-resource/angular-resource.js",
+            "lib/bower_components/angular-cookies/angular-cookies.js",
+            "lib/bower_components/angular-mocks/angular-mocks.js",
+
+            'lib/angular-ui-utils-0.1.0/ui-utils.js',
+            'lib/angular-ui-bootstrap-0.10.0/ui-bootstrap-tpls.js',
+            'lib/angular-strap-2.3.1/angular-strap.js',
+            'lib/angular-strap-2.3.1/modules/compiler.js',
+            'lib/angular-strap-2.3.1/modules/tooltip.js',
+            'lib/angular-strap-2.3.1/modules/tooltip.tpl.js',
+            'lib/angular-strap-2.3.1/modules/dimensions.js',
+            'lib/angular-strap-2.3.1/modules/parse-options.js',
+            'lib/angular-strap-2.3.1/modules/date-parser.js',
+            'lib/angular-strap-2.3.1/modules/datepicker.js',
+            'lib/angular-strap-2.3.1/modules/datepicker.tpl.js',
+            'lib/angular-strap-2.3.1/modules/timepicker.js',
+            'lib/angular-strap-2.3.1/modules/timepicker.tpl.js',
+            'lib/angular-strap-2.3.1/modules/typeahead.js',
+            'lib/angular-strap-2.3.1/modules/typeahead.tpl.js',
+            "lib/angulartics-0.17.2/angulartics.min.js",
+            "lib/angulartics-0.17.2/angulartics-ga.min.js",
+            'lib/ngprogress-lite/ngprogress-lite.js',
+            'lib/jquery-1.11.3/jquery-1.11.3.js',
+            'lib/utils/underscore.js',
+            'lib/utils/showdown.js',
+            'lib/utils/moment.js',
+            'lib/bower_components/angular-growl-v2/build/angular-growl.js',
+            'lib/bower_components/ment.io/dist/mentio.js',
+            'lib/bower_components/ment.io/dist/templates.js',
+            'lib/bower_components/angular-ui-select/dist/select.js',
+            "lib/bower_components/angular-local-storage/dist/angular-local-storage.js",
+
+            'opal/utils.js',
+            'opal/directives.js',
+            'opal/filters.js',
+            'opal/services_module.js',
+            'opal/services/*.js',
+            'opal/controllers_module.js',
+            'opal/controllers/*.js',
+            'opal/app.js',
+            '../../core/search/static/js/search/controllers/*',
+            '../../core/search/static/js/search/services/*',
+
+
+            // Our application
+
+            __dirname + '/../elcid/assets/js/elcid/*.js',
+            __dirname + '/../elcid/assets/js/elcid/controllers/*.js',
+            __dirname + '/../elcid/assets/js/elcid/services/*.js',
+            __dirname + '/../elcid/assets/js/elcid/services/records/*.js',
+            __dirname + '/../opat/static/js/opat/controllers/*.js',
+            __dirname + '/../research/static/js/research/controllers/*.js',
+            __dirname + '/../walkin/static/js/walkin/controllers/*.js',
+
+
+            // The tests
+            __dirname + '/../elcid/assets/js/elcidtest/*.js',
+            __dirname + '/../opat/static/js/test/*.js',
+            __dirname + '/../research/static/js/test/*.js',
+            __dirname + '/../walkin/static/js/walkintest/*.js',
+        ],
+
+        preprocessors: preprocessors,
+
+        reporters: ['progress', 'coverage'],
+        autoWatch: true,
+
+        coverageReporter: coverageReporter,
+
+        // Stolen from http://oligofren.wordpress.com/2014/05/27/running-karma-tests-on-browserstack/
+        browserDisconnectTimeout : 10000, // default 2000
+        browserDisconnectTolerance : 1, // default 0
+        browserNoActivityTimeout : 4*60*1000, //default 10000
+        captureTimeout : 4*60*1000, //default 60000
+    });
+}