Skip to content
This repository has been archived by the owner on Nov 9, 2017. It is now read-only.

Commit

Permalink
Update assets version, fix function test - side menu
Browse files Browse the repository at this point in the history
  • Loading branch information
Alex Eng committed Dec 12, 2013
1 parent c681419 commit 822a399
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 17 deletions.
16 changes: 0 additions & 16 deletions functional-test/src/main/java/org/zanata/page/BasePage.java
Expand Up @@ -76,7 +76,6 @@ public BasePage(final WebDriver driver) {

public MyAccountPage goToMyProfile() {
userAvatar.click();
waitForSideMenuOpened();

clickLinkAfterAnimation(BY_PROFILE_LINK);

Expand All @@ -95,7 +94,6 @@ public VersionGroupsPage goToGroups() {

public AdministrationPage goToAdministration() {
userAvatar.click();
waitForSideMenuOpened();

clickLinkAfterAnimation(BY_ADMINISTRATION_LINK);

Expand Down Expand Up @@ -131,8 +129,6 @@ public String loggedInAs() {
public HomePage logout() {
userAvatar.click();

waitForSideMenuOpened();

clickLinkAfterAnimation(BY_SIGN_OUT);
return new HomePage(getDriver());
}
Expand Down Expand Up @@ -189,16 +185,4 @@ public void clickLinkAfterAnimation(By locator) {
executor.executeScript("arguments[0].click();", getDriver()
.findElement(locator));
}

public void waitForSideMenuClosed() {
WebElementUtil.waitForTenSeconds(getDriver()).until(
ExpectedConditions.invisibilityOfElementLocated(By
.className("off-canvas--right-under")));
}

public void waitForSideMenuOpened() {
WebElementUtil.waitForTenSeconds(getDriver()).until(
ExpectedConditions.visibilityOfElementLocated(By
.className("off-canvas--right-under")));
}
}
2 changes: 1 addition & 1 deletion zanata-war/pom.xml
Expand Up @@ -42,7 +42,7 @@
Waiting for 2.9.0-01. -->
<groovy.eclipse.compiler.version>2.7.0-01</groovy.eclipse.compiler.version>

<zanata.web.assets.version>master</zanata.web.assets.version>
<zanata.web.assets.version>4</zanata.web.assets.version>
</properties>

<build>
Expand Down

0 comments on commit 822a399

Please sign in to comment.