From 05b4b875e262fb05a7fcfcc49d6a64ce6367c4ff Mon Sep 17 00:00:00 2001 From: Jake McDermott Date: Thu, 31 Aug 2017 14:53:29 -0400 Subject: [PATCH] move unit tests --- awx/ui/client/test/{ => unit}/index.js | 6 +++--- awx/ui/client/test/{ => unit}/karma.conf.js | 6 +++--- awx/ui/client/test/{ => unit}/panel-body.spec.js | 2 +- awx/ui/package.json | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) rename awx/ui/client/test/{ => unit}/index.js (68%) rename awx/ui/client/test/{ => unit}/karma.conf.js (91%) rename awx/ui/client/test/{ => unit}/panel-body.spec.js (99%) diff --git a/awx/ui/client/test/index.js b/awx/ui/client/test/unit/index.js similarity index 68% rename from awx/ui/client/test/index.js rename to awx/ui/client/test/unit/index.js index 40039e8c91..aa4f73ab95 100644 --- a/awx/ui/client/test/index.js +++ b/awx/ui/client/test/unit/index.js @@ -3,9 +3,9 @@ import 'angular'; import 'angular-mocks'; // Import custom Angular module dependencies -import '../src/i18n'; -import '../lib/services'; -import '../lib/components'; +import '../../src/i18n'; +import '../../lib/services'; +import '../../lib/components'; // Import tests import './panel-body.spec'; diff --git a/awx/ui/client/test/karma.conf.js b/awx/ui/client/test/unit/karma.conf.js similarity index 91% rename from awx/ui/client/test/karma.conf.js rename to awx/ui/client/test/unit/karma.conf.js index 0baa1fdad9..17f46201cb 100644 --- a/awx/ui/client/test/karma.conf.js +++ b/awx/ui/client/test/unit/karma.conf.js @@ -11,7 +11,7 @@ module.exports = config => { reporters: ['progress'], files: [ './index.js', - '../lib/components/**/*.html' + '../../lib/components/**/*.html' ], plugins: [ 'karma-webpack', @@ -20,13 +20,13 @@ module.exports = config => { 'karma-ng-html2js-preprocessor' ], preprocessors: { - '../lib/components/**/*.html': 'ng-html2js', + '../../lib/components/**/*.html': 'ng-html2js', './index.js': 'webpack' }, ngHtml2JsPreprocessor: { moduleName: 'at.test.templates', cacheIdFromPath: function (filepath) { - filepath = filepath.replace(path.join(__dirname, '../lib'), ''); + filepath = filepath.replace(path.join(__dirname, '../../lib'), ''); return '/static/partials' + filepath; } }, diff --git a/awx/ui/client/test/panel-body.spec.js b/awx/ui/client/test/unit/panel-body.spec.js similarity index 99% rename from awx/ui/client/test/panel-body.spec.js rename to awx/ui/client/test/unit/panel-body.spec.js index 29a9c0af71..3915195847 100644 --- a/awx/ui/client/test/panel-body.spec.js +++ b/awx/ui/client/test/unit/panel-body.spec.js @@ -17,7 +17,7 @@ describe('Components | panel/body', () => { it('Should produce at-Panel-body HTML content', () => { let element = $compile('yo')($rootScope); $rootScope.$digest(); - + expect(element.hasClass('at-Panel-body')).toBe(true); expect(element.html()).toContain('yo'); }); diff --git a/awx/ui/package.json b/awx/ui/package.json index 162df7cc93..75cdb334fb 100644 --- a/awx/ui/package.json +++ b/awx/ui/package.json @@ -25,7 +25,7 @@ "jshint": "grunt jshint:source --no-color", "test:ci": "npm run test -- --single-run --reporter junit,dots --browsers=PhantomJS", "lint": "./node_modules/.bin/eslint -c .eslintrc.js .", - "component-test": "./node_modules/.bin/karma start client/test/karma.conf.js", + "component-test": "./node_modules/.bin/karma start client/test/unit/karma.conf.js", "lint-dev": "./node_modules/.bin/nodemon --exec \"./node_modules/.bin/eslint -c .eslintrc.js .\" --watch \"client/components/**/*.js\"", "dev": "./node_modules/.bin/webpack --config build/webpack.development.js --progress", "watch": "./node_modules/.bin/webpack-dev-server --config build/webpack.watch.js --progress", @@ -123,4 +123,4 @@ "select2": "^4.0.2", "sprintf-js": "^1.0.3" } -} +} \ No newline at end of file