Author: vrockai Date: 2009-05-22 09:44:25 -0400 (Fri, 22 May 2009) New Revision: 13403 Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/IdentityAdminTestCase.java branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossPortalSeleniumTestCase.java branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/UserLoginTestCase.java Log: [selenium] - trying to fix due to new login form Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/IdentityAdminTestCase.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/IdentityAdminTestCase.java 2009-05-21 19:57:48 UTC (rev 13402) +++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/IdentityAdminTestCase.java 2009-05-22 13:44:25 UTC (rev 13403) @@ -219,6 +219,8 @@ selenium.type(INPUT_USERNAME, userName); selenium.type(INPUT_PASSWORD, userPass); + selenium.fireEvent(INPUT_PASSWORD, "keydown"); + selenium.click(SUBMIT_LOGIN); selenium.waitForPageToLoad(PAGE_LOAD); Assert.assertTrue(selenium.isTextPresent("Your account is disabled"), "Message telling that account is disabled is other then expected or missing."); @@ -620,7 +622,7 @@ selenium.click(SUB_CREATE_USER); selenium.waitForPageToLoad(PAGE_LOAD); - Assert.assertFalse(selenium.isTextPresent("This username is already taken. tempUser"), "User already exists."); + Assert.assertFalse(selenium.isTextPresent("This username is already taken."), "User already exists."); selenium.click(SUB_USER_ROLE); Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossPortalSeleniumTestCase.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossPortalSeleniumTestCase.java 2009-05-21 19:57:48 UTC (rev 13402) +++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossPortalSeleniumTestCase.java 2009-05-22 13:44:25 UTC (rev 13403) @@ -385,6 +385,7 @@ selenium.type(INPUT_USERNAME, username); selenium.type(INPUT_PASSWORD, password); + selenium.fireEvent(INPUT_PASSWORD, "keydown"); Assert.assertTrue(selenium.isElementPresent(SUBMIT_LOGIN)); selenium.click(SUBMIT_LOGIN); selenium.waitForPageToLoad(PAGE_LOAD); Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/UserLoginTestCase.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/UserLoginTestCase.java 2009-05-21 19:57:48 UTC (rev 13402) +++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/UserLoginTestCase.java 2009-05-22 13:44:25 UTC (rev 13403) @@ -21,7 +21,7 @@ private final String FRM_MAIN = getLoc(casePfx+"frm.main","relative=up"); private final String SUB_CANCEL = getLoc(casePfx+"sub.portal","cancel"); private final String LNK_LOGOUT = getLoc(casePfx+"lnk.logout","link=Logout"); - private final String SUB_LOGIN = getLoc(casePfx+"sub.login","login"); + private final String SUB_LOGIN = getLoc(casePfx+"saub.login","login-submit"); private final String INP_PASSWORD = getLoc(casePfx+"inp.password","xpath=id('j_password')"); private final String INP_USERNAME = getLoc(casePfx+"inp.username","xpath=id('j_username')"); private final String FRM_LOGINFORM = getLoc(casePfx+"frm.login","login-content"); @@ -68,6 +68,7 @@ Assert.assertTrue(selenium.isElementPresent(INP_PASSWORD), "Expected input DOM element for password doesn't exist."); selenium.type(INP_PASSWORD, loginPass); + selenium.fireEvent(INP_PASSWORD, "keydown"); selenium.click(SUB_LOGIN); selenium.waitForPageToLoad(PAGE_LOAD); @@ -108,8 +109,10 @@ selenium.type(INP_USERNAME, loginName); Assert.assertTrue(selenium.isElementPresent(INP_PASSWORD), "Expected input DOM element for password doesn't exist."); selenium.type(INP_PASSWORD, loginPass); + selenium.fireEvent(INP_PASSWORD, "keydown"); selenium.click(SUB_LOGIN); + //waitFor(AJAX_LOAD); selenium.waitForPageToLoad(PAGE_LOAD); Assert.assertTrue(selenium.isTextPresent("Logged in as: admin"), "\"Logged in as\" message missing."); @@ -186,8 +189,9 @@ selenium.type(INP_USERNAME, loginName); Assert.assertTrue(selenium.isElementPresent(INP_PASSWORD), "Expected input DOM element for password doesn't exist."); selenium.type(INP_PASSWORD, loginPass); + selenium.fireEvent(INP_PASSWORD, "keydown"); selenium.click(SUB_LOGIN); - + selenium.waitForPageToLoad(PAGE_LOAD); Assert.assertTrue(selenium.isTextPresent("The user doesn't exist or the password is incorrect "), "\"Logged in as\" message missing."); @@ -220,6 +224,7 @@ selenium.type(INP_USERNAME, loginName); Assert.assertTrue(selenium.isElementPresent(INP_PASSWORD), "Expected input DOM element for password doesn't exist."); selenium.type(INP_PASSWORD, loginPass); + selenium.fireEvent(INP_PASSWORD, "keydown"); selenium.click(SUB_LOGIN); selenium.waitForPageToLoad(PAGE_LOAD);