Skip to content

Commit 03943ef

Browse files
committed
fix: [#342] fix en vars to run E2E tests
1 parent 48ec4b1 commit 03943ef

File tree

4 files changed

+4
-8
lines changed

4 files changed

+4
-8
lines changed

contrib/dev-tools/container/e2e/mysql/e2e-env-up.sh

-2
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,10 @@ TORRUST_INDEX_CONFIG=$(cat ./share/default/config/index.container.mysql.toml) \
44
docker compose build
55

66
USER_ID=${USER_ID:-1000} \
7-
# Index
87
TORRUST_INDEX_CONFIG=$(cat ./share/default/config/index.container.mysql.toml) \
98
TORRUST_INDEX_DATABASE_DRIVER="mysql" \
109
TORRUST_INDEX_TRACKER_API_TOKEN="MyAccessToken" \
1110
TORRUST_IDX_BACK_MYSQL_DATABASE="torrust_index_e2e_testing" \
12-
# Tracker
1311
TORRUST_TRACKER_CONFIG=$(cat ./share/default/config/tracker.container.mysql.toml) \
1412
TORRUST_TRACKER_DATABASE_DRIVER="mysql" \
1513
TORRUST_TRACKER_API_ADMIN_TOKEN="MyAccessToken" \

contrib/dev-tools/container/e2e/run-e2e-tests.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ sleep 20s
6060
docker ps
6161

6262
# Run E2E tests with shared app instance
63-
TORRUST_IDX_BACK_E2E_SHARED=true TORRUST_IDX_BACK_E2E_CONFIG_PATH="./share/default/config/index.container.sqlite3.toml" cargo test || exit 1
63+
TORRUST_INDEX_E2E_SHARED=true TORRUST_INDEX_E2E_PATH_CONFIG="./share/default/config/index.container.sqlite3.toml" cargo test || exit 1
6464

6565
# Stop E2E testing environment
6666
./contrib/dev-tools/container/e2e/sqlite/e2e-env-down.sh || exit 1
@@ -91,7 +91,7 @@ echo "Creating MySQL database $MYSQL_DATABASE for for E2E testing ..."
9191
mysql -h $MYSQL_HOST -u $MYSQL_USER -p$MYSQL_PASSWORD -e "CREATE DATABASE IF NOT EXISTS $MYSQL_DATABASE;"
9292

9393
# Run E2E tests with shared app instance
94-
TORRUST_IDX_BACK_E2E_SHARED=true TORRUST_IDX_BACK_E2E_CONFIG_PATH="./share/default/config/index.container.mysql.toml" cargo test || exit 1
94+
TORRUST_INDEX_E2E_SHARED=true TORRUST_INDEX_E2E_PATH_CONFIG="./share/default/config/index.container.mysql.toml" cargo test || exit 1
9595

9696
# Stop E2E testing environment
9797
./contrib/dev-tools/container/e2e/mysql/e2e-env-down.sh || exit 1

contrib/dev-tools/container/e2e/sqlite/e2e-env-up.sh

-2
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,9 @@ TORRUST_INDEX_CONFIG=$(cat ./share/default/config/index.container.sqlite3.toml)
44
docker compose build
55

66
USER_ID=${USER_ID:-1000} \
7-
# Index
87
TORRUST_INDEX_CONFIG=$(cat ./share/default/config/index.container.sqlite3.toml) \
98
TORRUST_INDEX_DATABASE_DRIVER="sqlite3" \
109
TORRUST_INDEX_TRACKER_API_TOKEN="MyAccessToken" \
11-
# Tracker
1210
TORRUST_TRACKER_CONFIG=$(cat ./share/default/config/tracker.container.sqlite3.toml) \
1311
TORRUST_TRACKER_DATABASE_DRIVER="sqlite3" \
1412
TORRUST_TRACKER_API_ADMIN_TOKEN="MyAccessToken" \

tests/e2e/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
//! against an in-process server (isolated).
55
//!
66
//! If you want to run the tests against an out-of-process server, you need to
7-
//! set the environment variable `TORRUST_IDX_BACK_E2E_SHARED` to `true`.
7+
//! set the environment variable `TORRUST_INDEX_E2E_SHARED` to `true`.
88
//!
99
//! > **NOTICE**: The server must be running before running the tests. The
1010
//! server url is hardcoded to `http://localhost:3001` for now. We are planning
1111
//! to make it configurable in the future via a environment variable.
1212
//!
1313
//! ```text
14-
//! TORRUST_IDX_BACK_E2E_SHARED=true cargo test
14+
//! TORRUST_INDEX_E2E_SHARED=true cargo test
1515
//! ```
1616
//!
1717
//! If you want to run the tests against an isolated server, you need to execute

0 commit comments

Comments
 (0)