IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2025-02-25 18:55:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

Update Karma to 2.0 with plugins. Fixes #3222

Browse Source
This commit is contained in:
Joao Pedro De Almeida Pereira
2018-03-20 09:31:38 +00:00
committed by Dave Page
parent 534f1f35fe
commit 35b0ab2fe1
3 changed files with 849 additions and 296 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
web/karma.conf.js
View File

@@ -13,13 +13,11 @@ module.exports = function (config) {
'karma-jasmine-html-reporter', 'karma-jasmine-html-reporter',
], ],
files: [ files: [
{pattern: 'pgadmin/static/**/*.js', included: false},
{pattern: 'pgadmin/static/vendor/**/*.js', included: false},
{pattern: 'pgadmin/browser/static/js/**/*.js', included: false},
{pattern: 'pgadmin/browser/static/server_groups/servers/databases/schemas/tables/static/js/*.js', included: false},
'regression/javascript/**/*.jsx',
'regression/javascript/**/*.js',
'pgadmin/static/bundle/slickgrid.js', 'pgadmin/static/bundle/slickgrid.js',
{pattern: 'pgadmin/static/**/*.js', included: false, watched: true},
{pattern: 'pgadmin/browser/static/js/**/*.js', included: false, watched: true},
'regression/javascript/**/*.jsx',
{pattern: 'regression/javascript/**/*.js', watched: true},
], ],
// list of files to exclude // list of files to exclude
@@ -53,6 +51,7 @@ module.exports = function (config) {
// enable / disable watching file and executing tests whenever any file changes // enable / disable watching file and executing tests whenever any file changes
autoWatch: true, autoWatch: true,
usePolling: true,
// start these browsers // start these browsers

11
web/package.json
View File

@@ -20,15 +20,14 @@
"is-docker": "^1.1.0", "is-docker": "^1.1.0",
"jasmine-core": "~2.99.0", "jasmine-core": "~2.99.0",
"jasmine-enzyme": "~4.1.1", "jasmine-enzyme": "~4.1.1",
"karma": "~1.5.0", "karma": "~2.0.0",
"karma-babel-preprocessor": "^6.0.1", "karma-babel-preprocessor": "^7.0.0",
"karma-browserify": "~5.1.1", "karma-browserify": "~5.2.0",
"karma-chrome-launcher": "^2.2.0", "karma-chrome-launcher": "^2.2.0",
"karma-jasmine": "~1.1.0", "karma-jasmine": "~1.1.1",
"karma-jasmine-html-reporter": "^0.2.2", "karma-jasmine-html-reporter": "^0.2.2",
"karma-phantomjs-launcher": "~1.0.2",
"karma-requirejs": "~1.1.0", "karma-requirejs": "~1.1.0",
"karma-webpack": "~2.0.3", "karma-webpack": "~2.0.13",
"node-sass": "^4.5.3", "node-sass": "^4.5.3",
"optimize-css-assets-webpack-plugin": "^2.0.0", "optimize-css-assets-webpack-plugin": "^2.0.0",
"raw-loader": "^0.5.1", "raw-loader": "^0.5.1",

1123
web/yarn.lock
View File

File diff suppressed because it is too large Load Diff