aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortusooa <tusooa@kazv.moe>2024-07-24 03:04:14 +0000
committertusooa <tusooa@kazv.moe>2024-07-24 03:04:14 +0000
commit7a7d80270d1ae041f06c1fd9017135cb5b8c34d6 (patch)
treec9063dc2115ddf7da899b26e55141bc58ae376d4
parentd096962b054a49fb4971da30a801738838d08ca0 (diff)
parent8e64b1791bca4b34ec1988dda3fea99eb1715c1f (diff)
Merge branch 'change/selenium-server' into 'develop'
Nightwatch config for selenium-server and gitignore changes See merge request pleroma/pleroma-fe!1806
-rw-r--r--.gitignore1
-rw-r--r--test/e2e/nightwatch.conf.js2
2 files changed, 2 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 4df5ec83..0d5befd2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ selenium-debug.log
.idea/
config/local.json
static/emoji.json
+logs/
diff --git a/test/e2e/nightwatch.conf.js b/test/e2e/nightwatch.conf.js
index 4041c698..fdd2fda2 100644
--- a/test/e2e/nightwatch.conf.js
+++ b/test/e2e/nightwatch.conf.js
@@ -9,7 +9,7 @@ module.exports = {
selenium: {
start_process: true,
- server_path: 'node_modules/selenium-server/lib/runner/selenium-server-standalone-2.53.1.jar',
+ server_path: require('selenium-server').path,
host: '127.0.0.1',
port: 4444,
cli_args: {