Skip to content

Commit dd1be58

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

File tree

5 files changed

+1416
-1249
lines changed

5 files changed

+1416
-1249
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/.vscode/tasks.json

+16
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,22 @@
7171
"problemMatcher": [],
7272
"presentation": { "showReuseMessage": false },
7373
"group": "build"
74+
},
75+
{
76+
"type": "shell",
77+
"label": "Nightwatch: запустить все тесты в текущей папке в Chrome на удалённом сервере",
78+
"command": "yarn et nightwatch:run --browser remote_chrome --test='${fileDirname}/*.test.js'",
79+
"problemMatcher": [],
80+
"presentation": { "showReuseMessage": false },
81+
"group": "build"
82+
},
83+
{
84+
"type": "shell",
85+
"label": "Nightwatch: запустить все тесты в текущей папке рекурсивно в Chrome на удалённом сервере",
86+
"command": "yarn et nightwatch:run --browser remote_chrome --test='${fileDirname}/**/*.test.js'",
87+
"problemMatcher": [],
88+
"presentation": { "showReuseMessage": false },
89+
"group": "build"
7490
}
7591
],
7692
"inputs": [

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
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.9",
6+
"@csssr/e2e-tools-nightwatch": "1.15.17"
77
},
88
"resolutions": {
99
"netmask": ">=2.0.1"

0 commit comments

Comments
 (0)