Merge pull request #8313 from umbraco/v8/bugfix/0000-fix-karma-tests
fix of npm run unit, plus begin able to test code that uses promises.
This commit is contained in:
@@ -31,6 +31,6 @@ exports.build = series(parallel(dependencies, js, less, views), testUnit);
|
||||
exports.dev = series(setDevelopmentMode, parallel(dependencies, js, less, views), watchTask);
|
||||
exports.watch = series(watchTask);
|
||||
//
|
||||
exports.runTests = series(setTestMode, parallel(js, testUnit));
|
||||
exports.runUnit = series(setTestMode, parallel(js, runUnitTestServer), watchTask);
|
||||
exports.runTests = series(setTestMode, series(js, testUnit));
|
||||
exports.runUnit = series(setTestMode, series(js, runUnitTestServer), watchTask);
|
||||
exports.testE2e = series(setTestMode, parallel(testE2e));
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
"private": true,
|
||||
"scripts": {
|
||||
"test": "gulp runTests",
|
||||
"unit": "gulp testUnit",
|
||||
"unit": "gulp runUnit",
|
||||
"e2e": "gulp testE2e",
|
||||
"build": "gulp build",
|
||||
"dev": "gulp dev",
|
||||
@@ -39,7 +39,7 @@
|
||||
"moment": "2.22.2",
|
||||
"ng-file-upload": "12.2.13",
|
||||
"nouislider": "14.1.1",
|
||||
"npm": "6.13.6",
|
||||
"npm": "^6.14.0",
|
||||
"signalr": "2.4.0",
|
||||
"spectrum-colorpicker": "1.8.0",
|
||||
"tinymce": "4.9.10",
|
||||
@@ -71,7 +71,9 @@
|
||||
"gulp-wrap": "0.15.0",
|
||||
"gulp-wrap-js": "0.4.1",
|
||||
"jasmine-core": "3.5.0",
|
||||
"jasmine-promise-matchers": "^2.6.0",
|
||||
"karma": "4.4.1",
|
||||
"karma-chrome-launcher": "^3.1.0",
|
||||
"karma-jasmine": "2.0.1",
|
||||
"karma-junit-reporter": "2.0.1",
|
||||
"karma-phantomjs-launcher": "1.0.4",
|
||||
|
||||
@@ -10,6 +10,9 @@ module.exports = function (config) {
|
||||
// list of files / patterns to load in the browser
|
||||
files: [
|
||||
|
||||
// Jasmine plugins
|
||||
'node_modules/jasmine-promise-matchers/dist/jasmine-promise-matchers.js',
|
||||
|
||||
//libraries
|
||||
'node_modules/jquery/dist/jquery.min.js',
|
||||
'node_modules/angular/angular.js',
|
||||
@@ -98,7 +101,14 @@ module.exports = function (config) {
|
||||
// - PhantomJS
|
||||
// - IE (only Windows)
|
||||
// CLI --browsers Chrome,Firefox,Safari
|
||||
browsers: ['PhantomJS'],
|
||||
browsers: ['ChromeHeadless'],
|
||||
|
||||
customLaunchers: {
|
||||
ChromeDebugging: {
|
||||
base: 'Chrome',
|
||||
flags: ['--remote-debugging-port=9333']
|
||||
}
|
||||
},
|
||||
|
||||
// allow waiting a bit longer, some machines require this
|
||||
|
||||
@@ -115,6 +125,7 @@ module.exports = function (config) {
|
||||
plugins: [
|
||||
require('karma-jasmine'),
|
||||
require('karma-phantomjs-launcher'),
|
||||
require('karma-chrome-launcher'),
|
||||
require('karma-junit-reporter'),
|
||||
require('karma-spec-reporter')
|
||||
|
||||
|
||||
Reference in New Issue
Block a user