From b7c136aba7c5eb4ff1e8032f0b8a8d2ae1ba55a0 Mon Sep 17 00:00:00 2001 From: Joe Fiorini Date: Mon, 20 Jul 2015 11:56:02 -0400 Subject: [PATCH] Separate node test build from browser build --- .gitignore | 1 + Makefile | 19 ++++++++++++------- awx/ui/{ => client}/tests/.jshintrc | 0 .../tests/directives/job-status-graph-test.js | 0 .../features/features.controller-test.js | 0 .../tests/features/features.service-test.js | 0 .../delete-job-template.service-test.js | 0 .../multi-select-list.controller-test.js | 0 .../multi-select-list.directive-test.js | 0 .../select-all.directive-test.js | 0 .../services/job-status-graph-data-test.js | 0 .../tests/shared/lodash-as-promised-test.js | 0 .../tests/support/browser/index.js | 0 .../tests/support/describe-module.js | 0 .../tests/support/node/export-global.js | 0 .../{ => client}/tests/support/node/index.js | 0 .../tests/support/node/setup/angular-mocks.js | 0 .../support/node/setup/angular-templates.js | 0 .../tests/support/node/setup/angular.js | 0 .../tests/support/node/setup/chai-plugins.js | 0 .../tests/support/node/setup/chai.js | 0 .../tests/support/node/setup/d3.js | 0 .../tests/support/node/setup/jquery.js | 0 .../tests/support/node/setup/jsdom.js | 0 .../tests/support/node/setup/local-storage.js | 0 .../tests/support/node/setup/lodash.js | 0 .../tests/support/node/setup/mocha.js | 0 .../tests/support/node/setup/moment.js | 0 .../tests/support/node/setup/nv.js | 0 .../tests/support/node/setup/sinon.js | 0 .../{ => client}/tests/support/rest-stub.js | 0 .../compare-facts/flat-test.js | 0 .../compare-facts/nested-test.js | 0 .../single-host-data.service-test.js | 0 nodemon.json | 6 +++--- 35 files changed, 16 insertions(+), 10 deletions(-) rename awx/ui/{ => client}/tests/.jshintrc (100%) rename awx/ui/{ => client}/tests/directives/job-status-graph-test.js (100%) rename awx/ui/{ => client}/tests/features/features.controller-test.js (100%) rename awx/ui/{ => client}/tests/features/features.service-test.js (100%) rename awx/ui/{ => client}/tests/job-templates/delete-job-template.service-test.js (100%) rename awx/ui/{ => client}/tests/multi-select-list/multi-select-list.controller-test.js (100%) rename awx/ui/{ => client}/tests/multi-select-list/multi-select-list.directive-test.js (100%) rename awx/ui/{ => client}/tests/multi-select-list/select-all.directive-test.js (100%) rename awx/ui/{ => client}/tests/services/job-status-graph-data-test.js (100%) rename awx/ui/{ => client}/tests/shared/lodash-as-promised-test.js (100%) rename awx/ui/{ => client}/tests/support/browser/index.js (100%) rename awx/ui/{ => client}/tests/support/describe-module.js (100%) rename awx/ui/{ => client}/tests/support/node/export-global.js (100%) rename awx/ui/{ => client}/tests/support/node/index.js (100%) rename awx/ui/{ => client}/tests/support/node/setup/angular-mocks.js (100%) rename awx/ui/{ => client}/tests/support/node/setup/angular-templates.js (100%) rename awx/ui/{ => client}/tests/support/node/setup/angular.js (100%) rename awx/ui/{ => client}/tests/support/node/setup/chai-plugins.js (100%) rename awx/ui/{ => client}/tests/support/node/setup/chai.js (100%) rename awx/ui/{ => client}/tests/support/node/setup/d3.js (100%) rename awx/ui/{ => client}/tests/support/node/setup/jquery.js (100%) rename awx/ui/{ => client}/tests/support/node/setup/jsdom.js (100%) rename awx/ui/{ => client}/tests/support/node/setup/local-storage.js (100%) rename awx/ui/{ => client}/tests/support/node/setup/lodash.js (100%) rename awx/ui/{ => client}/tests/support/node/setup/mocha.js (100%) rename awx/ui/{ => client}/tests/support/node/setup/moment.js (100%) rename awx/ui/{ => client}/tests/support/node/setup/nv.js (100%) rename awx/ui/{ => client}/tests/support/node/setup/sinon.js (100%) rename awx/ui/{ => client}/tests/support/rest-stub.js (100%) rename awx/ui/{ => client}/tests/system-tracking/compare-facts/flat-test.js (100%) rename awx/ui/{ => client}/tests/system-tracking/compare-facts/nested-test.js (100%) rename awx/ui/{ => client}/tests/system-tracking/single-host-data.service-test.js (100%) diff --git a/.gitignore b/.gitignore index aca0152fb4..186a4eeb86 100644 --- a/.gitignore +++ b/.gitignore @@ -19,6 +19,7 @@ awx/*.log tower/tower_warnings.log celerybeat-schedule awx/ui/static +awx/ui/build_test # Python & setuptools __pycache__ diff --git a/Makefile b/Makefile index 767a79b476..6cde8f83d0 100644 --- a/Makefile +++ b/Makefile @@ -5,8 +5,10 @@ PACKER ?= packer GRUNT ?= $(shell [ -t 0 ] && echo "grunt" || echo "grunt --no-color") TESTEM ?= ./node_modules/.bin/testem BROCCOLI_BIN ?= ./node_modules/.bin/broccoli +MOCHA_BIN ?= ./node_modules/.bin/mocha NODE ?= node +CLIENT_TEST_DIR ?= build_test # Get the branch information from git GIT_DATE := $(shell git log -n 1 --format="%ai") @@ -320,7 +322,7 @@ package.json: packaging/grunt/package.template sed -e 's#%NAME%#$(NAME)#;s#%VERSION%#$(VERSION)#;s#%GIT_REMOTE_URL%#$(GIT_REMOTE_URL)#;' $< > $@ sync_ui: node_modules Brocfile.js - $(NODE) tools/ui/timepiece.js awx/ui/dist -- $(UI_FLAGS) + $(NODE) tools/ui/timepiece.js awx/ui/static -- $(UI_FLAGS) # Update local npm install node_modules: package.json @@ -330,15 +332,18 @@ node_modules: package.json awx/ui/%: node_modules clean-ui Brocfile.js bower.json $(BROCCOLI_BIN) build $@ -- $(UI_FLAGS) -devjs: node_modules clean-ui Brocfile.js bower.json Gruntfile.js - make awx/ui/static +testjs: UI_FLAGS=--node-tests --no-concat --no-styles $(EXTRA_UI_FLAGS) +testjs: awx/ui/build_test + $(MOCHA_BIN) --full-trace $(shell find awx/ui/build_test -name '*-test.js') + +devjs: awx/ui/static # Build minified JS/CSS. -minjs: node_modules clean-ui Brocfile.js - make -e awx/ui/static UI_FLAGS="--silent --no-debug --no-tests --compress --no-docs --no-sourcemaps" +minjs: UI_FLAGS=--silent --compress --no-docs --no-sourcemaps $(EXTRA_UI_FLAGS) +minjs: awx/ui/static node_modules clean-ui Brocfile.js -minjs_ci: node_modules clean-ui Brocfile.js - make -e awx/ui/static UI_FLAGS="--no-debug --compress --no-docs" +minjs_ci: UI_FLAGS=--compress --no-docs --browser-tests $(EXTRA_UI_FLAGS) +minjs_ci: awx/ui/static node_modules clean-ui Brocfile.js # Check .js files for errors and lint jshint: node_modules Gruntfile.js diff --git a/awx/ui/tests/.jshintrc b/awx/ui/client/tests/.jshintrc similarity index 100% rename from awx/ui/tests/.jshintrc rename to awx/ui/client/tests/.jshintrc diff --git a/awx/ui/tests/directives/job-status-graph-test.js b/awx/ui/client/tests/directives/job-status-graph-test.js similarity index 100% rename from awx/ui/tests/directives/job-status-graph-test.js rename to awx/ui/client/tests/directives/job-status-graph-test.js diff --git a/awx/ui/tests/features/features.controller-test.js b/awx/ui/client/tests/features/features.controller-test.js similarity index 100% rename from awx/ui/tests/features/features.controller-test.js rename to awx/ui/client/tests/features/features.controller-test.js diff --git a/awx/ui/tests/features/features.service-test.js b/awx/ui/client/tests/features/features.service-test.js similarity index 100% rename from awx/ui/tests/features/features.service-test.js rename to awx/ui/client/tests/features/features.service-test.js diff --git a/awx/ui/tests/job-templates/delete-job-template.service-test.js b/awx/ui/client/tests/job-templates/delete-job-template.service-test.js similarity index 100% rename from awx/ui/tests/job-templates/delete-job-template.service-test.js rename to awx/ui/client/tests/job-templates/delete-job-template.service-test.js diff --git a/awx/ui/tests/multi-select-list/multi-select-list.controller-test.js b/awx/ui/client/tests/multi-select-list/multi-select-list.controller-test.js similarity index 100% rename from awx/ui/tests/multi-select-list/multi-select-list.controller-test.js rename to awx/ui/client/tests/multi-select-list/multi-select-list.controller-test.js diff --git a/awx/ui/tests/multi-select-list/multi-select-list.directive-test.js b/awx/ui/client/tests/multi-select-list/multi-select-list.directive-test.js similarity index 100% rename from awx/ui/tests/multi-select-list/multi-select-list.directive-test.js rename to awx/ui/client/tests/multi-select-list/multi-select-list.directive-test.js diff --git a/awx/ui/tests/multi-select-list/select-all.directive-test.js b/awx/ui/client/tests/multi-select-list/select-all.directive-test.js similarity index 100% rename from awx/ui/tests/multi-select-list/select-all.directive-test.js rename to awx/ui/client/tests/multi-select-list/select-all.directive-test.js diff --git a/awx/ui/tests/services/job-status-graph-data-test.js b/awx/ui/client/tests/services/job-status-graph-data-test.js similarity index 100% rename from awx/ui/tests/services/job-status-graph-data-test.js rename to awx/ui/client/tests/services/job-status-graph-data-test.js diff --git a/awx/ui/tests/shared/lodash-as-promised-test.js b/awx/ui/client/tests/shared/lodash-as-promised-test.js similarity index 100% rename from awx/ui/tests/shared/lodash-as-promised-test.js rename to awx/ui/client/tests/shared/lodash-as-promised-test.js diff --git a/awx/ui/tests/support/browser/index.js b/awx/ui/client/tests/support/browser/index.js similarity index 100% rename from awx/ui/tests/support/browser/index.js rename to awx/ui/client/tests/support/browser/index.js diff --git a/awx/ui/tests/support/describe-module.js b/awx/ui/client/tests/support/describe-module.js similarity index 100% rename from awx/ui/tests/support/describe-module.js rename to awx/ui/client/tests/support/describe-module.js diff --git a/awx/ui/tests/support/node/export-global.js b/awx/ui/client/tests/support/node/export-global.js similarity index 100% rename from awx/ui/tests/support/node/export-global.js rename to awx/ui/client/tests/support/node/export-global.js diff --git a/awx/ui/tests/support/node/index.js b/awx/ui/client/tests/support/node/index.js similarity index 100% rename from awx/ui/tests/support/node/index.js rename to awx/ui/client/tests/support/node/index.js diff --git a/awx/ui/tests/support/node/setup/angular-mocks.js b/awx/ui/client/tests/support/node/setup/angular-mocks.js similarity index 100% rename from awx/ui/tests/support/node/setup/angular-mocks.js rename to awx/ui/client/tests/support/node/setup/angular-mocks.js diff --git a/awx/ui/tests/support/node/setup/angular-templates.js b/awx/ui/client/tests/support/node/setup/angular-templates.js similarity index 100% rename from awx/ui/tests/support/node/setup/angular-templates.js rename to awx/ui/client/tests/support/node/setup/angular-templates.js diff --git a/awx/ui/tests/support/node/setup/angular.js b/awx/ui/client/tests/support/node/setup/angular.js similarity index 100% rename from awx/ui/tests/support/node/setup/angular.js rename to awx/ui/client/tests/support/node/setup/angular.js diff --git a/awx/ui/tests/support/node/setup/chai-plugins.js b/awx/ui/client/tests/support/node/setup/chai-plugins.js similarity index 100% rename from awx/ui/tests/support/node/setup/chai-plugins.js rename to awx/ui/client/tests/support/node/setup/chai-plugins.js diff --git a/awx/ui/tests/support/node/setup/chai.js b/awx/ui/client/tests/support/node/setup/chai.js similarity index 100% rename from awx/ui/tests/support/node/setup/chai.js rename to awx/ui/client/tests/support/node/setup/chai.js diff --git a/awx/ui/tests/support/node/setup/d3.js b/awx/ui/client/tests/support/node/setup/d3.js similarity index 100% rename from awx/ui/tests/support/node/setup/d3.js rename to awx/ui/client/tests/support/node/setup/d3.js diff --git a/awx/ui/tests/support/node/setup/jquery.js b/awx/ui/client/tests/support/node/setup/jquery.js similarity index 100% rename from awx/ui/tests/support/node/setup/jquery.js rename to awx/ui/client/tests/support/node/setup/jquery.js diff --git a/awx/ui/tests/support/node/setup/jsdom.js b/awx/ui/client/tests/support/node/setup/jsdom.js similarity index 100% rename from awx/ui/tests/support/node/setup/jsdom.js rename to awx/ui/client/tests/support/node/setup/jsdom.js diff --git a/awx/ui/tests/support/node/setup/local-storage.js b/awx/ui/client/tests/support/node/setup/local-storage.js similarity index 100% rename from awx/ui/tests/support/node/setup/local-storage.js rename to awx/ui/client/tests/support/node/setup/local-storage.js diff --git a/awx/ui/tests/support/node/setup/lodash.js b/awx/ui/client/tests/support/node/setup/lodash.js similarity index 100% rename from awx/ui/tests/support/node/setup/lodash.js rename to awx/ui/client/tests/support/node/setup/lodash.js diff --git a/awx/ui/tests/support/node/setup/mocha.js b/awx/ui/client/tests/support/node/setup/mocha.js similarity index 100% rename from awx/ui/tests/support/node/setup/mocha.js rename to awx/ui/client/tests/support/node/setup/mocha.js diff --git a/awx/ui/tests/support/node/setup/moment.js b/awx/ui/client/tests/support/node/setup/moment.js similarity index 100% rename from awx/ui/tests/support/node/setup/moment.js rename to awx/ui/client/tests/support/node/setup/moment.js diff --git a/awx/ui/tests/support/node/setup/nv.js b/awx/ui/client/tests/support/node/setup/nv.js similarity index 100% rename from awx/ui/tests/support/node/setup/nv.js rename to awx/ui/client/tests/support/node/setup/nv.js diff --git a/awx/ui/tests/support/node/setup/sinon.js b/awx/ui/client/tests/support/node/setup/sinon.js similarity index 100% rename from awx/ui/tests/support/node/setup/sinon.js rename to awx/ui/client/tests/support/node/setup/sinon.js diff --git a/awx/ui/tests/support/rest-stub.js b/awx/ui/client/tests/support/rest-stub.js similarity index 100% rename from awx/ui/tests/support/rest-stub.js rename to awx/ui/client/tests/support/rest-stub.js diff --git a/awx/ui/tests/system-tracking/compare-facts/flat-test.js b/awx/ui/client/tests/system-tracking/compare-facts/flat-test.js similarity index 100% rename from awx/ui/tests/system-tracking/compare-facts/flat-test.js rename to awx/ui/client/tests/system-tracking/compare-facts/flat-test.js diff --git a/awx/ui/tests/system-tracking/compare-facts/nested-test.js b/awx/ui/client/tests/system-tracking/compare-facts/nested-test.js similarity index 100% rename from awx/ui/tests/system-tracking/compare-facts/nested-test.js rename to awx/ui/client/tests/system-tracking/compare-facts/nested-test.js diff --git a/awx/ui/tests/system-tracking/single-host-data.service-test.js b/awx/ui/client/tests/system-tracking/single-host-data.service-test.js similarity index 100% rename from awx/ui/tests/system-tracking/single-host-data.service-test.js rename to awx/ui/client/tests/system-tracking/single-host-data.service-test.js diff --git a/nodemon.json b/nodemon.json index f7ccfdea09..a9384ab872 100644 --- a/nodemon.json +++ b/nodemon.json @@ -6,9 +6,9 @@ "awx/ui/static/docs/**/*" ], "watch": [ - "awx/ui/static", - "awx/ui/tests", - "awx/ui/templates/ui/index.html" + "tools/ui/timepiece.js", + "packaging/grunt/Brocfile.js", + "packaging/grunt/tower-app.js" ], "ext": "js json less html" }