Обновление зависимостей @csssr/e2e-tools

CSSSR · Dec 18, 2024 · 944dab3 · 944dab3
1 parent c4926a0
commit 944dab3
Show file tree

Hide file tree

Showing 4 changed files with 141 additions and 78 deletions.
diff --git a/e2e-tests/.vscode/settings.json b/e2e-tests/.vscode/settings.json
@@ -1,5 +1,6 @@
 // Этот файл сгенерирован автоматически, не редактируйте его вручную
 {
   "editor.formatOnSave": true,
+  "editor.defaultFormatter": "esbenp.prettier-vscode",
   "git.ignoreLimitWarning": true
 }
diff --git a/e2e-tests/nightwatch/jenkins-pipeline.groovy b/e2e-tests/nightwatch/jenkins-pipeline.groovy
@@ -25,6 +25,11 @@ browserCredentials = basicAuths
     )
   } as List
 
+defaultCredentials = [
+  usernamePassword(credentialsId: "browserstack", usernameVariable: "BROWSERSTACK_USER", passwordVariable: "BROWSERSTACK_KEY"),
+  usernamePassword(credentialsId: "selenium", usernameVariable: "SELENIUM_USERNAME", passwordVariable: "SELENIUM_PASSWORD")
+]
+
 filesCheckboxes = getTestFiles()
   .collect {
     booleanParam(defaultValue: true, name: it)
@@ -137,7 +142,7 @@ pipeline {
 
       steps {
         script {
-          withCredentials(browserCredentials + [usernamePassword(credentialsId: "browserstack", usernameVariable: "BROWSERSTACK_USER", passwordVariable: "BROWSERSTACK_KEY")]) {
+          withCredentials(browserCredentials + defaultCredentials) {
             sh """
               pwd
               cd e2e-tests

diff --git a/e2e-tests/package.json b/e2e-tests/package.json
@@ -2,10 +2,11 @@
   "private": true,
   "prettier": "@csssr/e2e-tools/prettier",
   "devDependencies": {
-    "@csssr/e2e-tools": "~1.6.6",
-    "@csssr/e2e-tools-nightwatch": "~1.15.14"
+    "@csssr/e2e-tools": "~1.6.15",
+    "@csssr/e2e-tools-nightwatch": "1.15.23"
   },
   "resolutions": {
-    "netmask": ">=2.0.1"
+    "netmask": ">=2.0.1",
+    "canvas": "^2.11.2"
   }
 }