diff --git a/Makefile b/Makefile index 28c174f832..e32abadf67 100644 --- a/Makefile +++ b/Makefile @@ -77,7 +77,7 @@ I18N_FLAG_FILE = .i18n_built receiver test test_unit test_ansible test_coverage coverage_html \ dev_build release_build release_clean sdist \ ui-docker-machine ui-docker ui-release ui-devel \ - ui-test ui-deps ui-test-ci ui-test-saucelabs VERSION + ui-test ui-deps ui-test-ci VERSION # remove ui build artifacts clean-ui: @@ -502,9 +502,6 @@ testjs_ci: jshint: $(UI_DEPS_FLAG_FILE) $(NPM_BIN) run --prefix awx/ui jshint -ui-test-saucelabs: $(UI_DEPS_FLAG_FILE) - $(NPM_BIN) --prefix awx/ui run test:saucelabs - # END UI TASKS # -------------------------------------- diff --git a/awx/ui/karma.conf-saucelabs.js b/awx/ui/karma.conf-saucelabs.js deleted file mode 100644 index 0d62365a9b..0000000000 --- a/awx/ui/karma.conf-saucelabs.js +++ /dev/null @@ -1,118 +0,0 @@ -var path = require('path'), - webpack = require('webpack'); - -var sauceLaunchers = { - sl_chrome: { - base: 'SauceLabs', - browserName: 'chrome', - platform: 'Windows 7', - version: '35' - }, - sl_firefox: { - base: 'SauceLabs', - browserName: 'firefox', - version: '30' - }, - sl_ios_safari: { - base: 'SauceLabs', - browserName: 'iphone', - platform: 'OS X 10.9', - version: '7.1' - }, - sl_ie_11: { - base: 'SauceLabs', - browserName: 'internet explorer', - platform: 'Windows 8.1', - version: '11' - } -} - -module.exports = function(config) { - config.set({ - singleRun: true, - colors: true, - logLevel: config.LOG_INFO, - customLaunchers: sauceLaunchers, - browsers: Object.keys(sauceLaunchers), - coverageReporter: { - reporters: [ - { type: 'html', subdir: 'html' } - ] - }, - frameworks: [ - 'jasmine', - ], - reporters: ['dots', 'saucelabs'], - files: [ - './client/src/app.js', - './node_modules/angular-mocks/angular-mocks.js', - { pattern: './tests/protractor/**/*-test.js' }, - ], - preprocessors: { - './client/src/app.js': ['webpack', 'sourcemap'], - './tests/protractor/**/*-test.js': ['webpack', 'sourcemap'], - }, - webpack: { - plugins: [ - // Django-provided definitions - new webpack.DefinePlugin({ - $basePath: '/static/' - }), - // vendor shims: - // [{expected_local_var : dependency}, ...] - new webpack.ProvidePlugin({ - $: 'jquery', - jQuery: 'jquery', - 'window.jQuery': 'jquery', - _: 'lodash', - 'CodeMirror': 'codemirror', - '$.fn.datepicker': 'bootstrap-datepicker' - }) - ], - module: { - loaders: [{ - test: /\.angular.js$/, - loader: 'expose?angular' - }, - { - test: /\.js$/, - loader: 'babel-loader', - include: [path.resolve() + '/tests/'], - exclude: '/(node_modules)/', - query: { - presets: ['es2015'] - } - }, { - test: /\.js$/, - loader: 'babel-loader', - include: [path.resolve() + '/client/src/'], - exclude: '/(node_modules)/', - query: { - presets: ['es2015'], - plugins: ['istanbul'] - } - } - ] - }, - resolve: { - root: [], - modulesDirectory: ['node_modules'], - alias: { - 'jquery.resize': path.resolve() + '/node_modules/javascript-detect-element-resize/jquery.resize.js', - 'select2': path.resolve() + '/node_modules/select2/dist/js/select2.full.js' - } - }, - devtool: 'inline-source-map', - debug: true, - cache: true - }, - webpackMiddleware: { - stats: { - colors: true - } - }, - junitReporter: { - outputFile: 'coverage/test-results.xml' - } - }); -}; diff --git a/awx/ui/package.json b/awx/ui/package.json index cf61646922..8744e3abe4 100644 --- a/awx/ui/package.json +++ b/awx/ui/package.json @@ -72,7 +72,6 @@ "karma-junit-reporter": "^1.2.0", "karma-ng-html2js-preprocessor": "^1.0.0", "karma-phantomjs-launcher": "^1.0.2", - "karma-sauce-launcher": "^1.0.0", "karma-sourcemap-loader": "^0.3.7", "karma-webpack": "^1.8.0", "less": "^2.7.2", diff --git a/awx/ui/tests/protractor/.gitkeep b/awx/ui/tests/protractor/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/awx/ui/tests/util/.gitkeep b/awx/ui/tests/util/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000