From 067f32a4ae6c4455ea005bb3bf977f9c6e093fe4 Mon Sep 17 00:00:00 2001
From: Blade Barringer <blade@crookedneighbor.com>
Date: Mon, 23 Feb 2015 11:11:19 -0600
Subject: [PATCH] Corrected paths in karma conf

---
 karma.conf.js | 50 +++++++++++++++++++++++++-------------------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/karma.conf.js b/karma.conf.js
index 43a0660dc3..3adcf8a6ee 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -11,31 +11,31 @@ module.exports = function(config) {
 
     // list of files / patterns to load in the browser
     files: [
-      'common/public/bower_components/jquery/jquery.js',
-      'common/public/bower_components/angular/angular.js',
-      'common/public/bower_components/angular-loading-bar/build/loading-bar.min.js',
-      'common/public/bower_components/angular-resource/angular-resource.min.js',
-      'common/public/bower_components/angular-sanitize/angular-sanitize.js',
-      'common/public/bower_components/bootstrap/docs/assets/js/bootstrap.js',
-      'common/public/bower_components/angular-bootstrap/ui-bootstrap.js',
-      'common/public/bower_components/angular-bootstrap/ui-bootstrap-tpls.js',
-      'common/public/bower_components/angular-ui-router/release/angular-ui-router.js',
-      'common/public/bower_components/angular-ui/build/angular-ui.js',
-      'common/public/bower_components/angular-ui-utils/ui-utils.min.js',
-      'common/public/bower_components/Angular-At-Directive/src/at.js',
-      'common/public/bower_components/Angular-At-Directive/src/caret.js',
-      'common/public/bower_components/angular-mocks/angular-mocks.js',
-      'common/public/bower_components/angular-bindonce/bindonce.js',
-      'common/public/bower_components/ngInfiniteScroll/ng-infinite-scroll.js',
-      "common/public/bower_components/select2/select2.js",
-      "common/public/bower_components/angular-ui-select2/src/select2.js",
-      'common/public/bower_components/marked/lib/marked.js',
-      'common/public/bower_components/js-emoji/emoji.js',
-      'common/public/bower_components/habitrpg-shared/dist/habitrpg-shared.js',
-      'common/public/bower_components/habitrpg-shared/script/userServices.js',
-      'common/public/js/*.js',
-      'common/public/js/**/*.js',
-      'test/mock/**/*.js',
+      'website/public/bower_components/jquery/dist/jquery.js',
+      '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/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-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',
+      'website/public/bower_components/Angular-At-Directive/src/caret.js',
+      'website/public/bower_components/angular-mocks/angular-mocks.js',
+      'website/public/bower_components/ngInfiniteScroll/build/ng-infinite-scroll.js',
+      "website/public/bower_components/select2/select2.js",
+      "website/public/bower_components/angular-ui-select2/src/select2.js",
+      'website/public/bower_components/marked/lib/marked.js',
+      'website/public/bower_components/js-emoji/emoji.js',
+      'common/dist/scripts/habitrpg-shared.js',
+      'common/script/public/userServices.js',
+      'website/public/js/*.js',
+      'website/public/js/**/*.js',
+      // @TODO where did this directory go?
+      //'test/mock/**/*.js',
       'test/spec/*.js',
       'test/spec/**/*.js'
     ],