From 272e43a345c126b3178cc693e38abce178cf7082 Mon Sep 17 00:00:00 2001
From: gconsidine <greg@greg-considine.com>
Date: Thu, 27 Apr 2017 14:32:37 -0400
Subject: [PATCH] Fix Angular dependency mismatches in package.json

---
 awx/ui/.eslintignore             | 3 ++-
 awx/ui/client/test/index.js      | 2 --
 awx/ui/client/test/karma.conf.js | 5 +++--
 awx/ui/client/test/panel.spec.js | 9 +++------
 awx/ui/package.json              | 3 ++-
 5 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/awx/ui/.eslintignore b/awx/ui/.eslintignore
index d806c9acc1..f2caf7483e 100644
--- a/awx/ui/.eslintignore
+++ b/awx/ui/.eslintignore
@@ -3,6 +3,7 @@ Gruntfile.js
 karma.*.js
 
 etc
+coverage
 grunt-tasks
 node_modules
 po
@@ -10,6 +11,6 @@ static
 templates
 tests
 client/**/*.js
+test
 
 !client/components/**/*.js
-
diff --git a/awx/ui/client/test/index.js b/awx/ui/client/test/index.js
index a1c5818eda..fc5eb8400d 100644
--- a/awx/ui/client/test/index.js
+++ b/awx/ui/client/test/index.js
@@ -3,5 +3,3 @@ import 'angular-mocks';
 
 import '../components/index.js';
 import './panel.spec.js';
-
-
diff --git a/awx/ui/client/test/karma.conf.js b/awx/ui/client/test/karma.conf.js
index 80aac96e6b..591f7984b1 100644
--- a/awx/ui/client/test/karma.conf.js
+++ b/awx/ui/client/test/karma.conf.js
@@ -20,13 +20,14 @@ module.exports = config => {
             'karma-ng-html2js-preprocessor'
         ],
         preprocessors: {
-            '../components/index.js': 'webpack',
             '../components/**/*.html': 'ng-html2js',
+            '../components/index.js': 'webpack',
             './index.js': 'webpack'
         },
         ngHtml2JsPreprocessor: {
             moduleName: 'at.test.templates',
-            prependPrefix: '/'
+            stripPrefix: path.resolve(__dirname, '..'),
+            prependPrefix: 'static/partials'
         },
         webpack: {
             module: {
diff --git a/awx/ui/client/test/panel.spec.js b/awx/ui/client/test/panel.spec.js
index 43669c75bc..eeafa0d5a5 100644
--- a/awx/ui/client/test/panel.spec.js
+++ b/awx/ui/client/test/panel.spec.js
@@ -1,4 +1,5 @@
 describe('Components | panel', () => {
+
     let $compile;
     let $rootScope;
 
@@ -9,17 +10,13 @@ describe('Components | panel', () => {
         inject((_$compile_, _$rootScope_) => {
             $compile = _$compile_;
             $rootScope = _$rootScope_;
-
             done();
         });
     });
 
     it('should load the navigation partial', function() {
-        console.log($rootScope);
         var element = $compile('<at-panel></at-panel>')($rootScope);
-
         $rootScope.$digest();
       
-        expect(element.html()).toContain('<nav class="navbar navbar-default" role="navigation">');
-    });
-});
+        expect(element.html()).toContain('at-Panel');
+    }); });
diff --git a/awx/ui/package.json b/awx/ui/package.json
index 15121da87c..862a9e7ad7 100644
--- a/awx/ui/package.json
+++ b/awx/ui/package.json
@@ -24,7 +24,8 @@
     "test": "karma start karma.conf.js",
     "jshint": "grunt clean:jshint jshint:source --no-color",
     "test:ci": "npm run test -- --single-run --reporter junit,dots --browsers=PhantomJS",
-    "lint": "./node_modules/.bin/eslint -c .eslintrc.js ."
+    "lint": "./node_modules/.bin/eslint -c .eslintrc.js .",
+    "component-test": "./node_modules/.bin/karma start client/test/karma.conf.js --silent"
   },
   "optionalDependencies": {
     "browser-sync": "^2.14.0",