From e7f65f219ad0e8921b93ab3f89aa1216f061814c Mon Sep 17 00:00:00 2001
From: Nick Tomlin <nick.tomlin@gmail.com>
Date: Thu, 5 Mar 2015 12:12:23 -0600
Subject: [PATCH] WIP - Fix karma config file order to successfully boostrap
 app

There were a few issues here:

1. Relying on globs meant that modules were loaded out of order. So
'habitrpgc' was undefined when we were trying to add services etc to it.
The short term solution is to list them in the same way we list them in manifest
json. The long term would be switching everything to browserify so as to
avoid ordering/listing nightmare by having a single bundle.
2. We were missing exeternal deps (like 'hello') so the tests were
breaking before they even started. Some of them still are
3. We were including services that don't seem to exist anymore  (e.g. `habitrpgstatic`). We still are in certain places
---
 karma.conf.js             | 41 ++++++++++++++++++++++++++++++++++-----
 test/spec/authCtrlSpec.js |  2 --
 test/spec/specHelper.js   |  4 +++-
 3 files changed, 39 insertions(+), 8 deletions(-)

diff --git a/karma.conf.js b/karma.conf.js
index bbd51ef8a2..83eb3ce379 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -15,11 +15,13 @@ module.exports = function(config) {
       'website/public/bower_components/angular/angular.js',
       'website/public/bower_components/angular-loading-bar/build/loading-bar.min.js',
       'website/public/bower_components/angular-resource/angular-resource.min.js',
+      'website/public/bower_components/hello/dist/hello.all.min.js',
       'website/public/bower_components/angular-sanitize/angular-sanitize.js',
       'website/public/bower_components/bootstrap/dist/js/bootstrap.js',
       'website/public/bower_components/angular-bootstrap/ui-bootstrap.js',
       'website/public/bower_components/angular-bootstrap/ui-bootstrap-tpls.js',
       'website/public/bower_components/angular-ui-router/release/angular-ui-router.js',
+      'website/public/bower_components/angular-filter/dist/angular-filter.js',
       'website/public/bower_components/angular-ui/build/angular-ui.js',
       'website/public/bower_components/angular-ui-utils/ui-utils.min.js',
       'website/public/bower_components/Angular-At-Directive/src/at.js',
@@ -31,13 +33,42 @@ module.exports = function(config) {
       'website/public/bower_components/marked/lib/marked.js',
       'website/public/bower_components/js-emoji/emoji.js',
       'common/dist/scripts/habitrpg-shared.js',
-      'website/public/js/*.js',
-      'website/public/js/**/*.js',
-      'common/script/public/userServices.js',
+
+      "website/public/js/env.js",
+
+      "website/public/js/app.js",
+      "common/script/public/config.js",
+      "website/public/js/services/sharedServices.js",
+      "website/public/js/services/notificationServices.js",
+      "common/script/public/userServices.js",
+      "common/script/public/directives.js",
+      "website/public/js/services/groupServices.js",
+      "website/public/js/services/memberServices.js",
+      "website/public/js/services/guideServices.js",
+      "website/public/js/services/challengeServices.js",
+      "website/public/js/services/paymentServices.js",
+
+      "website/public/js/filters/filters.js",
+
+      "website/public/js/directives/directives.js",
+
+      "website/public/js/controllers/authCtrl.js",
+      "website/public/js/controllers/notificationCtrl.js",
+      "website/public/js/controllers/rootCtrl.js",
+      "website/public/js/controllers/settingsCtrl.js",
+      "website/public/js/controllers/headerCtrl.js",
+      "website/public/js/controllers/tasksCtrl.js",
+      "website/public/js/controllers/filtersCtrl.js",
+      "website/public/js/controllers/userCtrl.js",
+      "website/public/js/controllers/groupsCtrl.js",
+      "website/public/js/controllers/inventoryCtrl.js",
+      "website/public/js/controllers/footerCtrl.js",
+      "website/public/js/controllers/challengesCtrl.js",
+      "website/js/controllers/hallCtrl.js",
       // @TODO where did this directory go?
       //'test/mock/**/*.js',
-      'test/spec/*.js',
-      'test/spec/**/*.js'
+      'test/spec/specHelper.js',
+      'test/spec/*.js'
     ],
 
     // list of files / patterns to exclude
diff --git a/test/spec/authCtrlSpec.js b/test/spec/authCtrlSpec.js
index 9c630e186c..123bb31602 100644
--- a/test/spec/authCtrlSpec.js
+++ b/test/spec/authCtrlSpec.js
@@ -2,8 +2,6 @@
 
 describe('Auth Controller', function() {
 
-  beforeEach(module('habitrpgStatic'));
-
   describe('AuthCtrl', function(){
     var scope, ctrl, user, $httpBackend, $window;
 
diff --git a/test/spec/specHelper.js b/test/spec/specHelper.js
index eb3d9bbe59..a18a8e495a 100644
--- a/test/spec/specHelper.js
+++ b/test/spec/specHelper.js
@@ -1,3 +1,5 @@
+beforeEach(module('habitrpg'));
+
 specHelper = {
   newUser: function(){
     var buffs = {per:0, int:0, con:0, str:0, stealth: 0, streaks: false};
@@ -27,4 +29,4 @@ specHelper = {
     };
     return user;
   }
-};
\ No newline at end of file
+};