Merge pull request #1700 from djuretic/develop

Tests working (for continuous intregration)

.travis.yml

@@ -1,7 +1,8 @@
 language: node_js
 node_js:
-  - '0.8'
   - '0.10'
 before_script:
   - 'npm install -g bower grunt-cli'
   - 'bower install'
+  - export DISPLAY=:99.0
+  - sh -e /etc/init.d/xvfb start

Gruntfile.js

@@ -7,6 +7,11 @@ module.exports = function(grunt) {
     karma: {
       unit: {
         configFile: 'karma.conf.js'
+      },
+      continuous: {
+        configFile: 'karma.conf.js',
+        singleRun: true,
+        autoWatch: false
       }
     },
 

karma.conf.js

@@ -35,7 +35,7 @@ module.exports = function(config) {
 
 
     // enable / disable watching file and executing tests whenever any file changes
-    autoWatch: false,
+    autoWatch: true,
 
 
     // Start these browsers, currently available:
@@ -46,7 +46,7 @@ module.exports = function(config) {
     // - Safari (only Mac)
     // - PhantomJS
     // - IE (only Windows)
-    browsers: ['Chrome'],
+    browsers: ['Firefox'],
 
 
     // Continuous Integration mode

package.json

@@ -55,7 +55,7 @@
     "npm": "1.2.x"
   },
   "scripts": {
-    "test": "mocha test/api.mocha.coffee",
+    "test": "grunt karma:continuous",
     "start": "grunt run:dev",
     "postinstall": "./node_modules/bower/bin/bower install -f"
   },

test/spec/userServicesSpec.js

@@ -7,7 +7,8 @@ describe('userServices', function() {
 
   beforeEach(function(){
     module(function($provide){
-      $window = {href: '', alert: sinon.spy(), location: {search: '', pathname: ''}};
+      var habitrpgShared = {helpers: {newUser: sinon.spy()}};
+      $window = {href: '', alert: sinon.spy(), location: {search: '', pathname: ''}, habitrpgShared: habitrpgShared};
       $provide.value('$window', $window);
     });