Skip to content

Commit 76be04b

Browse files
authored
Обновление зависимостей @csssr/e2e-tools
1 parent 555dec0 commit 76be04b

File tree

4 files changed

+141
-78
lines changed

4 files changed

+141
-78
lines changed

e2e-tests/.vscode/settings.json

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// Этот файл сгенерирован автоматически, не редактируйте его вручную
22
{
33
"editor.formatOnSave": true,
4+
"editor.defaultFormatter": "esbenp.prettier-vscode",
45
"git.ignoreLimitWarning": true
56
}

e2e-tests/nightwatch/jenkins-pipeline.groovy

+6-1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,11 @@ browserCredentials = basicAuths
2525
)
2626
} as List
2727

28+
defaultCredentials = [
29+
usernamePassword(credentialsId: "browserstack", usernameVariable: "BROWSERSTACK_USER", passwordVariable: "BROWSERSTACK_KEY"),
30+
usernamePassword(credentialsId: "selenium", usernameVariable: "SELENIUM_USERNAME", passwordVariable: "SELENIUM_PASSWORD")
31+
]
32+
2833
filesCheckboxes = getTestFiles()
2934
.collect {
3035
booleanParam(defaultValue: true, name: it)
@@ -137,7 +142,7 @@ pipeline {
137142

138143
steps {
139144
script {
140-
withCredentials(browserCredentials + [usernamePassword(credentialsId: "browserstack", usernameVariable: "BROWSERSTACK_USER", passwordVariable: "BROWSERSTACK_KEY")]) {
145+
withCredentials(browserCredentials + defaultCredentials) {
141146
sh """
142147
pwd
143148
cd e2e-tests

e2e-tests/package.json

+4-3
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@
22
"private": true,
33
"prettier": "@csssr/e2e-tools/prettier",
44
"devDependencies": {
5-
"@csssr/e2e-tools": "~1.6.6",
6-
"@csssr/e2e-tools-nightwatch": "~1.15.14"
5+
"@csssr/e2e-tools": "~1.6.15",
6+
"@csssr/e2e-tools-nightwatch": "1.15.23"
77
},
88
"resolutions": {
9-
"netmask": ">=2.0.1"
9+
"netmask": ">=2.0.1",
10+
"canvas": "^2.11.2"
1011
}
1112
}

0 commit comments

Comments
 (0)