From: Laura Paduano <lpaduano@suse.com>
Date: Thu, 9 Jul 2020 07:26:56 +0000 (+0200)
Subject: Merge pull request #34908 from tspmelo/wip-e2e-shared
X-Git-Tag: v16.1.0~1787
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=114bb845d19f579eed13d24b455a24338006e99b;p=ceph.git

Merge pull request #34908 from tspmelo/wip-e2e-shared

mgr/dashboard: Add E2E tests for navigation, language and login

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Stephan Müller <smueller@suse.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
---

114bb845d19f579eed13d24b455a24338006e99b
diff --cc src/pybind/mgr/dashboard/frontend/package.json
index a4aaf51d04a8,7f97ac9e68a0..83b626f6dc2c
--- a/src/pybind/mgr/dashboard/frontend/package.json
+++ b/src/pybind/mgr/dashboard/frontend/package.json
@@@ -112,15 -112,15 +112,15 @@@
      "@types/node": "12.12.47",
      "@types/simplebar": "5.1.1",
      "codelyzer": "5.2.2",
-     "cypress": "4.8.0",
+     "cypress": "4.10.0",
      "html-linter": "1.1.1",
      "htmllint-cli": "0.0.7",
 -    "jest": "26.0.1",
 +    "jest": "26.1.0",
      "jest-canvas-mock": "2.2.0",
 -    "jest-preset-angular": "8.2.0",
 +    "jest-preset-angular": "8.2.1",
      "jest-silent-reporter": "0.2.1",
      "ng-bullet": "1.0.3",
 -    "ng-mocks": "9.5.0",
 +    "ng-mocks": "10.0.0",
      "npm-force-resolutions": "0.0.3",
      "npm-run-all": "4.1.5",
      "prettier": "2.0.5",