test cases fixed (obsolete form field renamed)

html encoding changed to utf-8 http redirects fixed ("refresh" did not contain the "url" keyword)
18 years ago · 2521d5f74a
parent 936bb4880c
commit 2521d5f74a
17 changed files with 34 additions and 34 deletions
--- a/cbox-tree.d/_offline/doc_header.inc
+++ b/cbox-tree.d/_offline/doc_header.inc
@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="utf-16"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 	<title>CryptoBox</title>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-16" />
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 	<link rel="stylesheet" media="screen" href="../../var/www/cryptobox.css" type="text/css" />
 	
 </head>
--- a/cbox-tree.d/usr/share/cryptobox/templates/header.cs
+++ b/cbox-tree.d/usr/share/cryptobox/templates/header.cs
@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="utf-16"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 	<title>CryptoBox</title>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-16" />
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 	<meta http-equiv="pragma" content="no-cache" />
 	<meta http-equiv="cache-control" content="no-cache" />
 	<meta http-equiv="expires" content="0" />
 	<link rel="stylesheet" media="screen" href="/cryptobox.css" type="text/css" />
-	<?cs if:Data.Redirect.URL ?><meta http-equiv="refresh" content="<?cs var:Data.Redirect.Delay ?>;<?cs var:Data.Redirect.URL ?>"><?cs /if ?>
+	<?cs if:Data.Redirect.URL ?><meta http-equiv="refresh" content="<?cs var:Data.Redirect.Delay ?>;url=<?cs var:Data.Redirect.URL ?>"><?cs /if ?>
 </head>
 <body>

--- a/validation/test-cases/1-init/020-init_empty_pw/input.curl
+++ b/validation/test-cases/1-init/020-init_empty_pw/input.curl
@ -1,5 +1,5 @@
 url	https://_HOST_IP_DEFAULT_/cryptobox
 data	action=init_do
-data	password=
-data	password2=
+data	crypto_password=
+data	crypto_password2=
 data	confirm=ja%2C%20loesche%20alle%20Daten%21
--- a/validation/test-cases/1-init/030-init_different_pw/input.curl
+++ b/validation/test-cases/1-init/030-init_different_pw/input.curl
@ -1,5 +1,5 @@
 url	https://_HOST_IP_DEFAULT_/cryptobox
 data	action=init_do
-data	password=hallo
-data	password2=hall
+data	crypto_password=hallo
+data	crypto_password2=hall
 data	confirm=ja%2C%20loesche%20alle%20Daten%21
--- a/validation/test-cases/1-init/040-init_wrong_confirmation/input.curl
+++ b/validation/test-cases/1-init/040-init_wrong_confirmation/input.curl
@ -1,5 +1,5 @@
 url	https://_HOST_IP_DEFAULT_/cryptobox
 data	action=init_do
-data	password=hallo
-data	password2=hallo
+data	crypto_password=hallo
+data	crypto_password2=hallo
 data	confirm=something
--- a/validation/test-cases/1-init/060-mount_do_before_init/input.curl
+++ b/validation/test-cases/1-init/060-mount_do_before_init/input.curl
@ -1,3 +1,3 @@
 url	https://_HOST_IP_DEFAULT_/cryptobox
 data	action=mount_do
-data	password=hallo
+data	crypto_password=hallo
--- a/validation/test-cases/1-init/110-init_valid/input.curl
+++ b/validation/test-cases/1-init/110-init_valid/input.curl
@ -1,5 +1,5 @@
 url	https://_HOST_IP_DEFAULT_/cryptobox
 data	action=init_do
-data	password=hallo
-data	password2=hallo
+data	crypto_password=hallo
+data	crypto_password2=hallo
 data	confirm=ja%2C%20loesche%20alle%20Daten%21
--- a/validation/test-cases/1-init/130-mount_do_during_init/input.curl
+++ b/validation/test-cases/1-init/130-mount_do_during_init/input.curl
@ -1,3 +1,3 @@
 url	https://_HOST_IP_DEFAULT_/cryptobox
 data	action=mount_do
-data	password=hallo
+data	crypto_password=hallo
--- a/validation/test-cases/1-init/190-init_do_during_init/input.curl
+++ b/validation/test-cases/1-init/190-init_do_during_init/input.curl
@ -1,5 +1,5 @@
 url	https://_HOST_IP_DEFAULT_/cryptobox
 data	action=init_do
-data	password=hallo
-data	password2=hallo
+data	crypto_password=hallo
+data	crypto_password2=hallo
 data	confirm=ja%2C%20loesche%20alle%20Daten%21
--- a/validation/test-cases/2-mount/020-mount_empty_pw/input.curl
+++ b/validation/test-cases/2-mount/020-mount_empty_pw/input.curl
@ -1,3 +1,3 @@
 url	https://_HOST_IP_DEFAULT_/cryptobox
 data	action=mount_do
-data	password=
+data	crypto_password=
--- a/validation/test-cases/2-mount/030-mount_do_invalid_pw/input.curl
+++ b/validation/test-cases/2-mount/030-mount_do_invalid_pw/input.curl
@ -1,3 +1,3 @@
 url	https://_HOST_IP_DEFAULT_/cryptobox
 data	action=mount_do
-data	password=hallo
+data	crypto_password=hallo
--- a/validation/test-cases/2-mount/040-mount_do_valid/input.curl
+++ b/validation/test-cases/2-mount/040-mount_do_valid/input.curl
@ -1,3 +1,3 @@
 url	https://_HOST_IP_DEFAULT_/cryptobox
 data	action=mount_do
-data	password=hallo
+data	crypto_password=hallo
--- a/validation/test-cases/2-mount/060-mount_do_while_mounted/input.curl
+++ b/validation/test-cases/2-mount/060-mount_do_while_mounted/input.curl
@ -1,3 +1,3 @@
 url	https://_HOST_IP_DEFAULT_/cryptobox
 data	action=mount_do
-data	password=hallo
+data	crypto_password=hallo
--- a/validation/test-cases/4-admin_pw/010-init_different_admin_pw/input.curl
+++ b/validation/test-cases/4-admin_pw/010-init_different_admin_pw/input.curl
@ -1,7 +1,7 @@
 url	https://_HOST_IP_DEFAULT_/cryptobox
 data	action=init_do
-data	password=hallo
-data	password2=hallo
-data	admin_password=root
+data	crypto_password=hallo
+data	crypto_password2=hallo
+data	admin_crypto_password=root
 data	admin_password2=rootA
 data	confirm=ja%2C%20loesche%20alle%20Daten%21
--- a/validation/test-cases/4-admin_pw/020-init_with_admin_pw/input.curl
+++ b/validation/test-cases/4-admin_pw/020-init_with_admin_pw/input.curl
@ -1,7 +1,7 @@
 url	https://_HOST_IP_DEFAULT_/cryptobox
 data	action=init_do
-data	password=hallo
-data	password2=hallo
-data	admin_password=root
+data	crypto_password=hallo
+data	crypto_password2=hallo
+data	admin_crypto_password=root
 data	admin_password2=root
 data	confirm=ja%2C%20loesche%20alle%20Daten%21
--- a/validation/test-cases/4-admin_pw/070-init_wrong_admin_pw/input.curl
+++ b/validation/test-cases/4-admin_pw/070-init_wrong_admin_pw/input.curl
@ -1,8 +1,8 @@
 url	https://_HOST_IP_DEFAULT_/cryptobox
 data	action=init_do
-data	password=hallo
-data	password2=hallo
-data	current_admin_password=rootA
-data	admin_password=root
+data	crypto_password=hallo
+data	crypto_password2=hallo
+data	current_admin_crypto_password=rootA
+data	admin_crypto_password=root
 data	admin_password2=root
 data	confirm=ja%2C%20loesche%20alle%20Daten%21
--- a/validation/test-cases/4-admin_pw/200-init_remove_admin_pw/input.curl
+++ b/validation/test-cases/4-admin_pw/200-init_remove_admin_pw/input.curl
@ -1,6 +1,6 @@
 url	https://_HOST_IP_DEFAULT_/cryptobox
 data	action=init_do
-data	password=hallo
-data	password2=hallo
-data	current_admin_password=root
+data	crypto_password=hallo
+data	crypto_password2=hallo
+data	current_admin_crypto_password=root
 data	confirm=ja%2C%20loesche%20alle%20Daten%21