From 782291ec84b7cebd7151f3725513b4a36c09bb19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jannis=20Mo=C3=9Fhammer?= Date: Tue, 27 Aug 2013 16:31:15 +0200 Subject: [PATCH] Change basepath for test and .htaccess refs #4491 --- public/.htaccess | 1 + test/frontend/runtests | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/public/.htaccess b/public/.htaccess index 6adf83a17..fd6edea2b 100644 --- a/public/.htaccess +++ b/public/.htaccess @@ -1,6 +1,7 @@ SetEnv APPLICATION_ENV development RewriteEngine on +RewriteBase /icinga2-web RewriteRule ^css/icinga.css css.php RewriteCond %{REQUEST_FILENAME} -s [OR] RewriteCond %{REQUEST_FILENAME} -l [OR] diff --git a/test/frontend/runtests b/test/frontend/runtests index de573389f..dc952aedb 100755 --- a/test/frontend/runtests +++ b/test/frontend/runtests @@ -15,7 +15,7 @@ CASPERJS_HOST="localhost" CASPERJS_PORT=80 CASPERJS_USER="jdoe" CASPERJS_PASS="password" -CASPERJS_PATH="icingaweb" +CASPERJS_PATH="icinga2-web" if [ ! -x $CASPER ]; then echo "CasperJS is not installed but required to run frontend tests\n"\