Просмотр исходного кода

Delete all exsting config tests before tests (#3349)

* Delete all exsting config tests before tests

* Fix typo in command

* Use correct path

* Update test
Jaap Marcus 3 лет назад
Родитель
Сommit
785d4ab363
2 измененных файлов с 13 добавлено и 4 удалено
  1. 1 1
      bin/v-check-user-2fa
  2. 12 3
      test/config-tests.bats

+ 1 - 1
bin/v-check-user-2fa

@@ -44,7 +44,7 @@ if [ -z "$TWOFA" ]; then
 fi
 
 # Check if token is valid
-result=$($HESIA_PHP $HESTIA/web/inc/2fa/check.php "$TWOFA" "$token")
+result=$($HESTIA_PHP $HESTIA/web/inc/2fa/check.php "$TWOFA" "$token")
 if [ "$result" != "ok" ]; then
 	echo "Error: Authentication token mismatch."
 	exit 9

+ 12 - 3
test/config-tests.bats

@@ -35,12 +35,21 @@ function setup() {
     source $HESTIA/func/ip.sh
 }
 
-@test "Setup" {
+@test "Prepare for tests" {
+	run rm -f /usr/local/hestia/data/templates/web/nginx/php-fpm/*.*
+	run rm -f /usr/local/hestia/data/templates/web/nginx/*.*
+	run rm -f /usr/local/hestia/data/templates/web/apache2/php-fpm/*.*
+	run rm -f /usr/local/hestia/data/templates/web/apache2/*.*
+
+	run v-update-web-templates
+}
+
+@test "Setup Test domain" {
     run v-add-user $user $user $user@hestiacp.com default "Super Test"
     assert_success
     refute_output
 
-    run run v-add-web-domain $user 'testhestiacp.com'
+    run v-add-web-domain $user 'testhestiacp.com'
     assert_success
     refute_output
 
@@ -78,4 +87,4 @@ function setup() {
     run v-delete-user $user
     assert_success
     refute_output
-}
+}