Merge remote-tracking branch 'origin/release' into integration/master

Conflicts: zanata-war/pom.xml
zanata · May 6, 2015 · 7d04d5b · 7d04d5b
2 parents 7b514b8 + eaa215b
commit 7d04d5b
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/functional-test/src/main/java/org/zanata/page/AbstractPage.java b/functional-test/src/main/java/org/zanata/page/AbstractPage.java
@@ -295,8 +295,9 @@ private void waitForLoaders() {
         waitForAMoment().withMessage("Loader indicator").until(new Predicate<WebDriver>() {
             @Override
             public boolean apply(WebDriver input) {
-                List<WebElement> loaders = driver
-                        .findElements(By.className("js-loader"));
+
+                List<WebElement> loaders = (List<WebElement>) getExecutor()
+                        .executeScript("return (typeof $ == 'undefined') ?  [] : $('.js-loader')");
                 for (WebElement loader : loaders) {
                     if (loader.getAttribute("class").contains("is-active")) {
                         log.info("Wait for loader finished");

diff --git a/functional-test/src/test/java/org/zanata/feature/account/ProfileTest.java b/functional-test/src/test/java/org/zanata/feature/account/ProfileTest.java
@@ -80,7 +80,6 @@ public void verifyProfileData() throws Exception {
     @Feature(summary = "The user can change their API key",
             tcmsTestPlanIds = 5316, tcmsTestCaseIds = 0)
     @Test(timeout = ZanataTestCase.MAX_SHORT_TEST_DURATION)
-    @Ignore("RHBZ1216304")
     public void changeUsersApiKey() throws Exception {
         DashboardClientTab dashboardClientTab = new LoginWorkFlow()
                 .signIn("translator", "translator")

diff --git a/functional-test/src/test/java/org/zanata/feature/account/RegisterTest.java b/functional-test/src/test/java/org/zanata/feature/account/RegisterTest.java
@@ -162,7 +162,6 @@ public void requiredFields() throws Exception {
             "page, and vice versa",
             tcmsTestPlanIds = 5316, tcmsTestCaseIds = 0)
     @Test
-    @Ignore("RHBZ1216304")
     public void signUpToLoginAndBack() {
         RegisterPage registerPage = new BasicWorkFlow()
                 .goToHome()