Merge pull request ome#34 from mtbc/config-var-names

Rename configuration variables
jburel · Aug 21, 2013 · 23582b5 · 23582b5
2 parents cce81c2 + 6a47e70
commit 23582b5
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/components/tests/ui/testcases/config.txt b/components/tests/ui/testcases/config.txt
@@ -9,18 +9,18 @@ ${ROOT PASSWORD}        omero
 
 ${USERNAME}             root
 ${PASSWORD}             omero
-${FULLNAME}             root root
+${FULL NAME}            root root
 
 # Web config
-${HOST}                 localhost
-${PORT}                 8080
+${WEB HOST}             localhost
+${WEB PORT}             8080
 ${BROWSER}              Firefox
 ${DELAY}                0
 
-${LOGIN URL}            http://${HOST}:${PORT}/webclient/login/
-${WELCOME URL}          http://${HOST}:${PORT}/webclient/
+${LOGIN URL}            http://${WEB HOST}:${WEB PORT}/webclient/login/
+${WELCOME URL}          http://${WEB HOST}:${WEB PORT}/webclient/
 
-${WEBADMIN WELCOME URL}     http://${HOST}:${PORT}/webadmin/
+${WEBADMIN WELCOME URL}     http://${WEB HOST}:${WEB PORT}/webadmin/
 ${WEBADMIN LOGIN URL}       ${LOGIN URL}?url=%2Fwebadmin%2F
 
 ${USERS URL}            ${WEBADMIN WELCOME URL}experimenters/

diff --git a/components/tests/ui/testcases/web/tree_test.txt b/components/tests/ui/testcases/web/tree_test.txt
@@ -13,15 +13,15 @@ Resource          ../../resources/web/thumbs.txt
 Test Keywords
     User "${USERNAME}" logs in with password "${PASSWORD}"
     Tree Should Be Visible
-    Wait For Node To Be Visible    ${FULLNAME}
+    Wait For Node To Be Visible    ${FULL NAME}
     Node Should Be Visible    Orphaned images
     Create Button Should Be Enabled    project
     Create Button Should Be Enabled    dataset
     Create Button Should Be Enabled    screen
-    Node Popup Menu Item Should Be Enabled    Project    ${FULLNAME}
-    Node Popup Menu Item Should Be Enabled    Dataset    ${FULLNAME}
-    Node Popup Menu Item Should Be Enabled    Screen    ${FULLNAME}
-    Node Popup Menu Item Should Be Disabled    Delete    ${FULLNAME}
+    Node Popup Menu Item Should Be Enabled    Project    ${FULL NAME}
+    Node Popup Menu Item Should Be Enabled    Dataset    ${FULL NAME}
+    Node Popup Menu Item Should Be Enabled    Screen    ${FULL NAME}
+    Node Popup Menu Item Should Be Disabled    Delete    ${FULL NAME}
     Select And Expand Project
     Create Button Should Be Enabled    project
     Create Button Should Be Enabled    dataset