import 15.2.5

[ceph.git] / ceph / src / pybind / mgr / dashboard / frontend / package.json

diff --git a/ceph/src/pybind/mgr/dashboard/frontend/package.json b/ceph/src/pybind/mgr/dashboard/frontend/package.json
index 3250965721aef185acfde861c7df27aae561e675..cb79d4619684631a52127eb54f84fdae36fa99d1 100644 (file)
--- a/ceph/src/pybind/mgr/dashboard/frontend/package.json
+++ b/ceph/src/pybind/mgr/dashboard/frontend/package.json
@@ -30,15 +30,14 @@
     "i18n:pull": "npx i18ntool pull -c i18n.config.json",
     "i18n:merge": "npx i18ntool merge -c i18n.config.json",
     "i18n:token": "npx i18ntool config token",
-    "test": "npm run test:config && jest --watch",
-    "test:ci": "npm run test:config && JEST_SILENT_REPORTER_DOTS=true jest --coverage --reporters jest-silent-reporter",
-    "test:config": "if [ ! -e 'src/unit-test-configuration.ts' ]; then cp 'src/unit-test-configuration.ts.sample' 'src/unit-test-configuration.ts'; fi",
+    "test": "jest --watch",
+    "test:ci": "JEST_SILENT_REPORTER_DOTS=true jest --coverage --reporters jest-silent-reporter",
     "e2e": "start-test 4200 'cypress open'",
     "e2e:ci": "start-test 4200 'cypress run -b chrome --headless'",
     "lint:tslint": "ng lint",
     "lint:prettier": "prettier --list-different \"{src,cypress}/**/*.{ts,scss}\"",
     "lint:html": "htmllint src/app/**/*.html && html-linter --config html-linter.config.json",
-    "lint:tsc": "npm run test:config && tsc -p src/tsconfig.app.json --noEmit && tsc -p tsconfig.spec.json --noEmit && tsc -p cypress/tsconfig.json --noEmit",
+    "lint:tsc": "tsc -p src/tsconfig.app.json --noEmit && tsc -p tsconfig.spec.json --noEmit && tsc -p cypress/tsconfig.json --noEmit",
     "lint": "npm run lint:tsc && npm run lint:tslint && npm run lint:prettier && npm run lint:html",
     "fix:prettier": "prettier --write \"{src,cypress}/**/*.{ts,scss}\"",
     "fix:tslint": "npm run lint:tslint -- --fix",
@@ -125,12 +124,12 @@
     "cypress": "4.4.0",
     "html-linter": "1.1.1",
     "htmllint-cli": "0.0.7",
-    "jest": "25.2.4",
+    "jest": "25.5.4",
     "jest-canvas-mock": "2.2.0",
-    "jest-preset-angular": "8.1.3",
+    "jest-preset-angular": "8.2.0",
     "jest-silent-reporter": "0.2.1",
     "ng-bullet": "1.0.3",
-    "ng-mocks": "9.2.0",
+    "ng-mocks": "9.3.0",
     "npm-force-resolutions": "0.0.3",
     "npm-run-all": "4.1.5",
     "prettier": "2.0.2",