Clean up

zanata · Feb 26, 2015 · 071d3b0 · 071d3b0
1 parent a83084c
commit 071d3b0
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 11 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
@@ -222,6 +222,8 @@ public boolean apply(WebDriver input) {
                             // if we get here, the old page is still there
                             return false;
                         } catch (StaleElementReferenceException e) {
+                            // http://www.obeythetestinggoat.com/how-to-get-selenium-to-wait-for-page-load-after-a-click.html
+                            //
                             // This exception means the new page has loaded
                             // (or started to).
                             String script = "return document.readyState === " +

diff --git a/functional-test/src/main/java/org/zanata/page/CorePage.java b/functional-test/src/main/java/org/zanata/page/CorePage.java
@@ -126,15 +126,6 @@ public boolean apply(WebDriver input) {
      */
     public List<String> expectErrors() {
         waitForPageSilence();
-        String msg = "an error message";
-        logWaiting(msg);
-//        waitForAMoment().withMessage(msg).until(new Predicate<WebDriver>() {
-//            @Override
-//            public boolean apply(WebDriver input) {
-//                List<String> errors = getErrors();
-//                return !errors.isEmpty();
-//            }
-//        });
         return getErrors();
     }
 

diff --git a/functional-test/src/main/java/org/zanata/page/WebDriverFactory.java b/functional-test/src/main/java/org/zanata/page/WebDriverFactory.java
@@ -91,14 +91,22 @@ private String[] getLogTypes() {
         };
     }
 
+    /**
+     * Retrieves all the outstanding WebDriver logs of the specified type.
+     * @param type a log type from org.openqa.selenium.logging.LogType
+     *             (but they don't all seem to work)
+     */
     public LogEntries getLogs(String type) {
-        JavascriptExecutor exec = (JavascriptExecutor) getDriver();
-        exec.executeScript("console.log('Hello');");
         Logs logs = getDriver().manage().logs();
         LogEntries logEntries = logs.get(type);
         return logEntries;
     }
 
+    /**
+     * Logs all the outstanding WebDriver logs of the specified type.
+     * @param type a log type from org.openqa.selenium.logging.LogType
+     *             (but they don't all seem to work)
+     */
     public void logLogs(String type) {
         String logName = WebDriverFactory.class.getName() + "." + type;
         Logger log = LoggerFactory.getLogger(logName);