From c2253170ca4fe7113a0079747eac522b0873a4fc Mon Sep 17 00:00:00 2001 From: hlm7 Date: Mon, 29 Mar 2010 20:15:13 +0000 Subject: [PATCH] Holly has fixed the suite to work with the test model. --- .../suites/AdminSecurity/AdminBadLogin.html | 14 ++--- .../AdminSecurity/AdminChangePassword.html | 56 ++++++------------- .../suites/AdminSecurity/AdminLogouts.html | 15 +++-- .../suites/AdminSecurity/Suite.html | 1 - 4 files changed, 35 insertions(+), 51 deletions(-) diff --git a/utilities/acceptance-tests/suites/AdminSecurity/AdminBadLogin.html b/utilities/acceptance-tests/suites/AdminSecurity/AdminBadLogin.html index 9a156df8..c8fa02c2 100644 --- a/utilities/acceptance-tests/suites/AdminSecurity/AdminBadLogin.html +++ b/utilities/acceptance-tests/suites/AdminSecurity/AdminBadLogin.html @@ -31,7 +31,7 @@ comment - Bad Login Attempt for Admin Account + Bad login attempt for admin account @@ -57,17 +57,17 @@ type username - defaultAdmin + testAdmin comment - Enter bad password + Enter incorrect password type password - itstules + incorrect clickAndWait @@ -86,18 +86,18 @@ comment - Enter bad username + Enter incorrect username type username - defaultAdm + testAdm type password - itsrules + Password clickAndWait diff --git a/utilities/acceptance-tests/suites/AdminSecurity/AdminChangePassword.html b/utilities/acceptance-tests/suites/AdminSecurity/AdminChangePassword.html index d48c640d..9d54b759 100644 --- a/utilities/acceptance-tests/suites/AdminSecurity/AdminChangePassword.html +++ b/utilities/acceptance-tests/suites/AdminSecurity/AdminChangePassword.html @@ -31,7 +31,7 @@ comment - Change Password for Admin Account + Change password for admin account @@ -67,12 +67,12 @@ type username - defaultAdmin + testAdmin type password - itsrules + Password clickAndWait @@ -106,12 +106,12 @@ verifyTextPresent - defaultAdmin + testAdmin clickAndWait - link=defaultAdmin + link=testAdmin @@ -119,11 +119,6 @@ User Account Control Panel - - verifyTextPresent - User Account Control Panel - - clickAndWait //input[@value='Reset Password'] @@ -142,12 +137,12 @@ type Md5password - itsrules2 + Password2 type passwordConfirmation - itsrules3 + incorrect2 click @@ -167,7 +162,7 @@ type passwordConfirmation - itsrules2 + Password2 clickAndWait @@ -179,11 +174,6 @@ User Account Control Panel - - verifyTextPresent - User Account Control Panel - - clickAndWait link=Log out @@ -217,12 +207,12 @@ type username - defaultAdmin + testAdmin type password - itsrules2 + Password2 clickAndWait @@ -256,12 +246,12 @@ verifyTextPresent - defaultAdmin + testAdmin clickAndWait - link=defaultAdmin + link=testAdmin @@ -269,11 +259,6 @@ User Account Control Panel - - verifyTextPresent - User Account Control Panel - - clickAndWait //input[@value='Reset Password'] @@ -284,11 +269,6 @@ User Account Editing Form - - verifyTextPresent - User Account Editing Form - - comment Change password back @@ -297,12 +277,12 @@ type Md5password - itsrules + Password type passwordConfirmation - itsrules + Password clickAndWait @@ -315,13 +295,13 @@ - verifyTextPresent - User Account Control Panel + clickAndWait + link=Log out - clickAndWait - link=Log out + comment + Logout diff --git a/utilities/acceptance-tests/suites/AdminSecurity/AdminLogouts.html b/utilities/acceptance-tests/suites/AdminSecurity/AdminLogouts.html index f1103261..dcb1c7a5 100644 --- a/utilities/acceptance-tests/suites/AdminSecurity/AdminLogouts.html +++ b/utilities/acceptance-tests/suites/AdminSecurity/AdminLogouts.html @@ -67,12 +67,12 @@ type username - defaultAdmin + testAdmin type password - itsrules + Password clickAndWait @@ -127,12 +127,12 @@ type username - defaultAdmin + testAdmin type password - itsrules + Password clickAndWait @@ -146,7 +146,12 @@ verifyTextPresent - Logged in as defaultAdmin (Log out) + Logged in as testAdmin (Log out) + + + + comment + Logout diff --git a/utilities/acceptance-tests/suites/AdminSecurity/Suite.html b/utilities/acceptance-tests/suites/AdminSecurity/Suite.html index 1ac8b40e..136cb5a9 100644 --- a/utilities/acceptance-tests/suites/AdminSecurity/Suite.html +++ b/utilities/acceptance-tests/suites/AdminSecurity/Suite.html @@ -8,7 +8,6 @@ -
Test Suite
AdminFirstLogin
AdminBadLogin
AdminChangePassword
AdminLogouts