Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Test Fixes

  • Loading branch information...
commit e2cee8207f479dcac6d7027feed89c1ff6ec7a47 1 parent 3dc9b60
@rsrisamang rsrisamang authored brianchandotcom committed
View
5 ...ortalweb/plugins/kaleo/webcontent/wcwebcontent/addwebcontentscopepage/ConfigurePortletScopePageTest.html
@@ -34,6 +34,11 @@
<td>Options</td>
</tr>
<tr>
+ <td>clickAt</td>
+ <td>//strong/a</td>
+ <td>Options</td>
+</tr>
+<tr>
<td>waitForVisible</td>
<td>//div[@class='lfr-component lfr-menu-list']/ul/li[2]/a</td>
<td>Configuration</td>
View
1  ...ortalweb/plugins/kaleo/webcontent/wcwebcontent/addwebcontentscopepage/ConfigurePortletScopePageTest.java
@@ -46,6 +46,7 @@ public void testConfigurePortletScopePage() throws Exception {
Thread.sleep(5000);
assertEquals(RuntimeVariables.replace("Options"),
selenium.getText("//strong/a"));
+ selenium.clickAt("//strong/a", RuntimeVariables.replace("Options"));
for (int second = 0;; second++) {
if (second >= 90) {
View
2  ...l/organizations/organizationaddress/addorganizationaddresszipnull/AddOrganizationAddressZipNullTest.html
@@ -141,7 +141,7 @@
<tr>
<td>assertText</td>
<td>xPath=(//div[@class='portlet-msg-error'])[2]</td>
- <td>Please enter a valid zip.</td>
+ <td>Please enter a valid postal code.</td>
</tr>
</tbody></table>
View
3  ...l/organizations/organizationaddress/addorganizationaddresszipnull/AddOrganizationAddressZipNullTest.java
@@ -175,7 +175,8 @@ public void testAddOrganizationAddressZipNull() throws Exception {
assertEquals(RuntimeVariables.replace(
"Your request failed to complete."),
selenium.getText("xPath=(//div[@class='portlet-msg-error'])[1]"));
- assertEquals(RuntimeVariables.replace("Please enter a valid zip."),
+ assertEquals(RuntimeVariables.replace(
+ "Please enter a valid postal code."),
selenium.getText("xPath=(//div[@class='portlet-msg-error'])[2]"));
}
}
View
2  ...ortal/controlpanel/settings/settingsaddress/addsettingsaddresszipnull/AddSettingsAddressZipNullTest.html
@@ -86,7 +86,7 @@
<tr>
<td>assertText</td>
<td>xPath=(//div[@class='portlet-msg-error'])[2]</td>
- <td>Please enter a valid zip.</td>
+ <td>Please enter a valid postal code.</td>
</tr>
</tbody></table>
View
3  ...ortal/controlpanel/settings/settingsaddress/addsettingsaddresszipnull/AddSettingsAddressZipNullTest.java
@@ -102,7 +102,8 @@ public void testAddSettingsAddressZipNull() throws Exception {
assertEquals(RuntimeVariables.replace(
"Your request failed to complete."),
selenium.getText("xPath=(//div[@class='portlet-msg-error'])[1]"));
- assertEquals(RuntimeVariables.replace("Please enter a valid zip."),
+ assertEquals(RuntimeVariables.replace(
+ "Please enter a valid postal code."),
selenium.getText("xPath=(//div[@class='portlet-msg-error'])[2]"));
}
}
View
2  ...ray/portalweb/portal/controlpanel/users/useraddress/adduseraddresszipnull/AddUserAddressZipNullTest.html
@@ -96,7 +96,7 @@
<tr>
<td>assertText</td>
<td>xPath=(//div[@class='portlet-msg-error'])[2]</td>
- <td>Please enter a valid zip.</td>
+ <td>Please enter a valid postal code.</td>
</tr>
</tbody></table>
View
3  ...ray/portalweb/portal/controlpanel/users/useraddress/adduseraddresszipnull/AddUserAddressZipNullTest.java
@@ -104,7 +104,8 @@ public void testAddUserAddressZipNull() throws Exception {
assertEquals(RuntimeVariables.replace(
"Your request failed to complete."),
selenium.getText("xPath=(//div[@class='portlet-msg-error'])[1]"));
- assertEquals(RuntimeVariables.replace("Please enter a valid zip."),
+ assertEquals(RuntimeVariables.replace(
+ "Please enter a valid postal code."),
selenium.getText("xPath=(//div[@class='portlet-msg-error'])[2]"));
}
}
View
2  .../com/liferay/portalweb/portal/controlpanel/users/useraddress/adduseraddresszipnull/TearDownUserTest.html
@@ -54,7 +54,7 @@
<td>Select All</td>
</tr>
<tr>
- <td>clickAt</td>
+ <td>clickAtAndWait</td>
<td>//input[@value='Deactivate']</td>
<td>Deactivate</td>
</tr>
View
1  .../com/liferay/portalweb/portal/controlpanel/users/useraddress/adduseraddresszipnull/TearDownUserTest.java
@@ -69,6 +69,7 @@ public void testTearDownUser() throws Exception {
"xPath=(//input[@name='_125_allRowIds'])[2]"));
selenium.clickAt("//input[@value='Deactivate']",
RuntimeVariables.replace("Deactivate"));
+ selenium.waitForPageToLoad("30000");
assertTrue(selenium.getConfirmation()
.matches("^Are you sure you want to deactivate the selected users[\\s\\S]$"));
Please sign in to comment.
Something went wrong with that request. Please try again.