Skip to content

Commit e2c123a

Browse files
committed
use blacklist instead
1 parent c50e503 commit e2c123a

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

tests/System/entrypoint.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,22 +8,22 @@ JOOMLA_BASE=$1
88
TEST_GROUP=$2
99
DB_ENGINE=$3
1010
DB_HOST=$4
11-
BROWSER=${5:-firefox}
1211

13-
echo "[RUNNER] Prepare test environment for $BROWSER"
12+
echo "[RUNNER] Prepare test environment"
1413

1514
# Switch to Joomla base directory
1615
cd $JOOMLA_BASE
1716

18-
echo "[RUNNER] Copy files from $JOOMLA_BASE to test installation /tests/www/$TEST_GROUP/"
17+
echo "[RUNNER] Copy files to test installation"
1918
rsync -a --exclude-from=tests/System/exclude.txt $JOOMLA_BASE/ /tests/www/$TEST_GROUP/
2019
chown -R www-data /tests/www/$TEST_GROUP/
2120

2221
# Required for media manager tests
2322
chmod -R 777 /tests/www/$TEST_GROUP/images
2423

25-
# Disable opcache, otherwise there are issues when the config is changed in a test like the SefPlugin.cy.js
26-
rm /etc/php/*/apache2/conf.d/10-opcache.ini
24+
# Disable opcache, otherwise there are issues when the config is changed in a test
25+
echo "/tests/www/$TEST_GROUP/configuration.php" > /tmp/blacklist.ini
26+
echo "opcache.blacklist_filename=/tmp/blacklist.ini" >> /etc/php/*/apache2/conf.d/10-opcache.ini
2727

2828
echo "[RUNNER] Start Apache"
2929
a2enmod rewrite
@@ -43,4 +43,4 @@ if [ -z "$( ls -A '/root/.cache/Cypress' )" ]; then
4343
npx cypress verify
4444
fi
4545

46-
npx cypress run --browser=$BROWSER --e2e --env cmsPath=/tests/www/$TEST_GROUP,db_type=$DB_ENGINE,db_host=$DB_HOST,db_password=joomla_ut,db_prefix="${TEST_GROUP}_",logFile=/var/log/apache2/error.log --config baseUrl=https://localhost/$TEST_GROUP,screenshotsFolder=$JOOMLA_BASE/tests/System/output/screenshots
46+
npx cypress run --browser=firefox --e2e --env cmsPath=/tests/www/$TEST_GROUP,db_type=$DB_ENGINE,db_host=$DB_HOST,db_password=joomla_ut,db_prefix="${TEST_GROUP}_",logFile=/var/log/apache2/error.log --config baseUrl=https://localhost/$TEST_GROUP,screenshotsFolder=$JOOMLA_BASE/tests/System/output/screenshots

0 commit comments

Comments
 (0)