[PATCH 1/3] FIX: cmd_* moved to wiki_* in test-gitmw-lib.sh and other files
From: Simon Cathebras <simon.cathebras@ensimag.imag.fr>
Function cmd_* has been renamed in wiki_* in t/install-wiki.sh.
Change the calls in t/test-gitmw-lib.sh
---
t/install-wiki.sh | 4 ++--
t/test-gitmw-lib.sh | 10 +++++-----
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/t/install-wiki.sh b/t/install-wiki.sh
index 725346e..322f46d 100755
--- a/t/install-wiki.sh
+++ b/t/install-wiki.sh
@@ -19,11 +19,11 @@ usage () {
# Argument: install, delete, --help | -h
case "$1" in
"install")
- cmd_install
+ wiki_install
exit 0
;;
"delete")
- cmd_delete
+ wiki_delete
exit 0
;;
"--help" | "-h")
diff --git a/t/test-gitmw-lib.sh b/t/test-gitmw-lib.sh
index 8698625..b89b45a 100755
--- a/t/test-gitmw-lib.sh
+++ b/t/test-gitmw-lib.sh
@@ -136,7 +136,7 @@ fail()
# Install a wiki in your web server directory.
-cmd_install () {
+wiki_install () {
# Copy the generic LocalSettings.php in the web server's directory
# And modify parameters according to the ones set at the top
@@ -206,7 +206,7 @@ cmd_install () {
# Argument $1 is the relative path to the folder $FILES_FOLDER
#
# Warning: This function should be not called by user. This is a private
-# function used by cmd_install and cmd_delete
+# function used by wiki_install and wiki_delete
reset_db_wiki () {
# Copy initial database of the wiki
@@ -221,7 +221,7 @@ reset_db_wiki () {
# Set the admin WikiAdmin with password AdminPass in the database.
#
# Warning: This function should be not called by user. This is a private
-# function used by cmd_install and cmd_delete
+# function used by wiki_install and wiki_delete
set_admin_wiki () {
#Add the admin
@@ -237,14 +237,14 @@ set_admin_wiki () {
# Reset the database of the wiki and the password of the admin
#
# Warning: This function must be called only in a subdirectory of t/ directory
-cmd_reset () {
+wiki_reset () {
reset_db_wiki ".."
set_admin_wiki
}
# Delete the wiki created in the web server's directory and all its content
# saved in the database.
-cmd_delete () {
+wiki_delete () {
# Delete the wiki's directory.
rm -rf "$WIKI_DIR_INST/$WIKI_DIR_NAME" ||
fail "Wiki's directory $WIKI_DIR_INST/" \
--
1.7.10.2.568.g4c26a3a