LPS-34059 SF

ipeychev · Mar 31, 2013 · 2f6d52b · 2f6d52b
1 parent 0a25dc4
commit 2f6d52b
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 27 deletions.
diff --git a/...b/test/functional/com/liferay/portalweb/portal/util/liferayselenium/BaseSeleniumImpl.java b/...b/test/functional/com/liferay/portalweb/portal/util/liferayselenium/BaseSeleniumImpl.java
@@ -15,6 +15,7 @@
 package com.liferay.portalweb.portal.util.liferayselenium;
 
 import com.liferay.portal.kernel.util.FileUtil;
+import com.liferay.portal.kernel.util.StringBundler;
 import com.liferay.portal.kernel.util.StringUtil;
 import com.liferay.portalweb.portal.util.RuntimeVariables;
 import com.liferay.portalweb.portal.util.TestPropsValues;
@@ -253,18 +254,21 @@ public void keyUpAndWait(String locator, String keySequence) {
 	}
 
 	public void makeVisible(String locator) {
-		String script =
-			"var xpathResult =" +
-			"document.evaluate(" + locator + ", document, null," +
-			"XPathResult.FIRST_ORDERED_NODE_TYPE, null);" +
-			"if (xpathResult.singleNodeValue) {" +
-			"var element = xpathResult.singleNodeValue;" +
-			"element.style.display='inline-block';" +
-			"element.style.overflow='visible';" +
-			"element.style.visibility='visible';" +
-			"}";
-
-		super.runScript(script);
+		StringBundler sb = new StringBundler(10);
+
+		sb.append("var xpathResult = document.evaluate(");
+		sb.append(locator);
+		sb.append(", document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, ");
+		sb.append("null);");
+
+		sb.append("if (xpathResult.singleNodeValue) {");
+		sb.append("var element = xpathResult.singleNodeValue;");
+		sb.append("element.style.display = 'inline-block';");
+		sb.append("element.style.overflow = 'visible';");
+		sb.append("element.style.visibility = 'visible';");
+		sb.append("}");
+
+		super.runScript(sb.toString());
 	}
 
 	public void paste(String location) {

diff --git a/.../test/functional/com/liferay/portalweb/portal/util/liferayselenium/BaseWebDriverImpl.java b/.../test/functional/com/liferay/portalweb/portal/util/liferayselenium/BaseWebDriverImpl.java
@@ -300,8 +300,6 @@ public void keyUpAndWait(String locator, String keySequence) {
 	}
 
 	public void makeVisible(String locator) {
-		WebElement webElement = getWebElement(locator);
-
 		WebElement bodyElement = getWebElement("//body");
 
 		WrapsDriver wrapsDriver = (WrapsDriver)bodyElement;
@@ -310,13 +308,16 @@ public void makeVisible(String locator) {
 
 		JavascriptExecutor javascriptExecutor = (JavascriptExecutor)webDriver;
 
-		String code =
-			"var element = arguments[0];" +
-			"element.style.display='inline-block';" +
-			"element.style.overflow='visible';" +
-			"element.style.visibility='visible';";
+		StringBundler sb = new StringBundler(4);
+
+		sb.append("var element = arguments[0];");
+		sb.append("element.style.display = 'inline-block';");
+		sb.append("element.style.overflow = 'visible';");
+		sb.append("element.style.visibility = 'visible';");
+
+		WebElement webElement = getWebElement(locator);
 
-		javascriptExecutor.executeScript(code, webElement);
+		javascriptExecutor.executeScript(sb.toString(), webElement);
 	}
 
 	public void paste(String location) {

diff --git a/tools/selenium/extensions/ide.js b/tools/selenium/extensions/ide.js
@@ -29,16 +29,15 @@ Selenium.prototype.doLabel = function() {
 };
 
 Selenium.prototype.doMakeVisible = function(locator) {
-	var xpathResult = document.evaluate(locator, document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null);
+	var xPathResult = document.evaluate(locator, document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null);
 
-	if (xpathResult.singleNodeValue) {
-		var element = xpathResult.singleNodeValue;
+	if (xPathResult.singleNodeValue) {
+		var element = xPathResult.singleNodeValue;
 
-		element.style.display="inline-block";
-		element.style.overflow="visible";
-		element.style.visibility="visible";
+		element.style.display = "inline-block";
+		element.style.overflow = "visible";
+		element.style.visibility = "visible";
 	}
-
 };
 
 Selenium.prototype.doSetBrowserOption = function(value) {