Skip to content

Commit

Permalink
Normalise JS script execution between codecs
Browse files Browse the repository at this point in the history
  • Loading branch information
@shs96c
shs96c committed Aug 19, 2016
1 parent 88fa5ba commit 6109000
Show file tree
Hide file tree
Showing 5 changed files with 106 additions and 21 deletions.
2 changes: 0 additions & 2 deletions java/client/src/org/openqa/selenium/remote/DriverCommand.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,6 @@ public interface DriverCommand {

String EXECUTE_SCRIPT = "executeScript";
String EXECUTE_ASYNC_SCRIPT = "executeAsyncScript";
String EXECUTE_SCRIPT_W3C = "executeScriptW3C";
String EXECUTE_ASYNC_SCRIPT_W3C = "executeAsyncScriptW3C";

String GET_ELEMENT_TEXT = "getElementText";
String GET_ELEMENT_TAG_NAME = "getElementTagName";
Expand Down
6 changes: 0 additions & 6 deletions java/client/src/org/openqa/selenium/remote/RemoteWebDriver.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -569,9 +569,6 @@ public Object executeScript(String script, Object... args) {
"script", script,
"args", Lists.newArrayList(convertedArgs));

if (getW3CStandardComplianceLevel() > 0) {
return execute(DriverCommand.EXECUTE_SCRIPT_W3C, params).getValue();
}
return execute(DriverCommand.EXECUTE_SCRIPT, params).getValue();
}

Expand All @@ -590,9 +587,6 @@ public Object executeAsyncScript(String script, Object... args) {
Map<String, ?> params = ImmutableMap.of(
"script", script, "args", Lists.newArrayList(convertedArgs));

if (getW3CStandardComplianceLevel() > 0) {
return execute(DriverCommand.EXECUTE_ASYNC_SCRIPT_W3C, params).getValue();
}
return execute(DriverCommand.EXECUTE_ASYNC_SCRIPT, params).getValue();
}

Expand Down
2 changes: 0 additions & 2 deletions java/client/src/org/openqa/selenium/remote/http/JsonHttpCommandCodec.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,6 @@ public JsonHttpCommandCodec() {

defineCommand(EXECUTE_SCRIPT, post("/session/:sessionId/execute"));
defineCommand(EXECUTE_ASYNC_SCRIPT, post("/session/:sessionId/execute_async"));
defineCommand(EXECUTE_SCRIPT_W3C, post("/session/:sessionId/execute/sync"));
defineCommand(EXECUTE_ASYNC_SCRIPT_W3C, post("/session/:sessionId/execute/async"));

defineCommand(UPLOAD_FILE, post("/session/:sessionId/file"));
defineCommand(SCREENSHOT, get("/session/:sessionId/screenshot"));
Expand Down
6 changes: 2 additions & 4 deletions java/client/src/org/openqa/selenium/remote/http/W3CHttpCommandCodec.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,10 +105,8 @@ public W3CHttpCommandCodec() {
defineCommand(SET_ALERT_VALUE, post("/session/:sessionId/alert/text"));
defineCommand(SET_ALERT_CREDENTIALS, post("/session/:sessionId/alert/credentials"));

defineCommand(EXECUTE_SCRIPT, post("/session/:sessionId/execute"));
defineCommand(EXECUTE_ASYNC_SCRIPT, post("/session/:sessionId/execute_async"));
defineCommand(EXECUTE_SCRIPT_W3C, post("/session/:sessionId/execute/sync"));
defineCommand(EXECUTE_ASYNC_SCRIPT_W3C, post("/session/:sessionId/execute/async"));
defineCommand(EXECUTE_SCRIPT, post("/session/:sessionId/execute/sync"));
defineCommand(EXECUTE_ASYNC_SCRIPT, post("/session/:sessionId/execute/async"));

defineCommand(UPLOAD_FILE, post("/session/:sessionId/file"));
defineCommand(SCREENSHOT, get("/session/:sessionId/screenshot"));
Expand Down
111 changes: 104 additions & 7 deletions java/server/src/org/openqa/selenium/remote/server/JsonHttpCommandHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,110 @@
import org.openqa.selenium.remote.http.HttpResponse;
import org.openqa.selenium.remote.http.JsonHttpCommandCodec;
import org.openqa.selenium.remote.http.JsonHttpResponseCodec;
import org.openqa.selenium.remote.server.handler.*;
import org.openqa.selenium.remote.server.handler.html5.*;
import org.openqa.selenium.remote.server.handler.interactions.*;
import org.openqa.selenium.remote.server.handler.interactions.touch.*;
import org.openqa.selenium.remote.server.handler.mobile.*;
import org.openqa.selenium.remote.server.handler.AcceptAlert;
import org.openqa.selenium.remote.server.handler.AddConfig;
import org.openqa.selenium.remote.server.handler.AddCookie;
import org.openqa.selenium.remote.server.handler.CaptureScreenshot;
import org.openqa.selenium.remote.server.handler.ChangeUrl;
import org.openqa.selenium.remote.server.handler.ClearElement;
import org.openqa.selenium.remote.server.handler.ClickElement;
import org.openqa.selenium.remote.server.handler.CloseWindow;
import org.openqa.selenium.remote.server.handler.ConfigureTimeout;
import org.openqa.selenium.remote.server.handler.DeleteCookie;
import org.openqa.selenium.remote.server.handler.DeleteNamedCookie;
import org.openqa.selenium.remote.server.handler.DeleteSession;
import org.openqa.selenium.remote.server.handler.DismissAlert;
import org.openqa.selenium.remote.server.handler.ElementEquality;
import org.openqa.selenium.remote.server.handler.ExecuteAsyncScript;
import org.openqa.selenium.remote.server.handler.ExecuteScript;
import org.openqa.selenium.remote.server.handler.FindActiveElement;
import org.openqa.selenium.remote.server.handler.FindChildElement;
import org.openqa.selenium.remote.server.handler.FindChildElements;
import org.openqa.selenium.remote.server.handler.FindElement;
import org.openqa.selenium.remote.server.handler.FindElements;
import org.openqa.selenium.remote.server.handler.FullscreenWindow;
import org.openqa.selenium.remote.server.handler.GetAlertText;
import org.openqa.selenium.remote.server.handler.GetAllCookies;
import org.openqa.selenium.remote.server.handler.GetAllSessions;
import org.openqa.selenium.remote.server.handler.GetAllWindowHandles;
import org.openqa.selenium.remote.server.handler.GetAvailableLogTypesHandler;
import org.openqa.selenium.remote.server.handler.GetCookie;
import org.openqa.selenium.remote.server.handler.GetCssProperty;
import org.openqa.selenium.remote.server.handler.GetCurrentUrl;
import org.openqa.selenium.remote.server.handler.GetCurrentWindowHandle;
import org.openqa.selenium.remote.server.handler.GetElementAttribute;
import org.openqa.selenium.remote.server.handler.GetElementDisplayed;
import org.openqa.selenium.remote.server.handler.GetElementEnabled;
import org.openqa.selenium.remote.server.handler.GetElementLocation;
import org.openqa.selenium.remote.server.handler.GetElementLocationInView;
import org.openqa.selenium.remote.server.handler.GetElementRect;
import org.openqa.selenium.remote.server.handler.GetElementSelected;
import org.openqa.selenium.remote.server.handler.GetElementSize;
import org.openqa.selenium.remote.server.handler.GetElementText;
import org.openqa.selenium.remote.server.handler.GetLogHandler;
import org.openqa.selenium.remote.server.handler.GetPageSource;
import org.openqa.selenium.remote.server.handler.GetScreenOrientation;
import org.openqa.selenium.remote.server.handler.GetSessionCapabilities;
import org.openqa.selenium.remote.server.handler.GetSessionLogsHandler;
import org.openqa.selenium.remote.server.handler.GetTagName;
import org.openqa.selenium.remote.server.handler.GetTitle;
import org.openqa.selenium.remote.server.handler.GetWindowPosition;
import org.openqa.selenium.remote.server.handler.GetWindowSize;
import org.openqa.selenium.remote.server.handler.GoBack;
import org.openqa.selenium.remote.server.handler.GoForward;
import org.openqa.selenium.remote.server.handler.ImeActivateEngine;
import org.openqa.selenium.remote.server.handler.ImeDeactivate;
import org.openqa.selenium.remote.server.handler.ImeGetActiveEngine;
import org.openqa.selenium.remote.server.handler.ImeGetAvailableEngines;
import org.openqa.selenium.remote.server.handler.ImeIsActivated;
import org.openqa.selenium.remote.server.handler.ImplicitlyWait;
import org.openqa.selenium.remote.server.handler.MaximizeWindow;
import org.openqa.selenium.remote.server.handler.NewSession;
import org.openqa.selenium.remote.server.handler.RefreshPage;
import org.openqa.selenium.remote.server.handler.Rotate;
import org.openqa.selenium.remote.server.handler.SendKeys;
import org.openqa.selenium.remote.server.handler.SetAlertCredentials;
import org.openqa.selenium.remote.server.handler.SetAlertText;
import org.openqa.selenium.remote.server.handler.SetScriptTimeout;
import org.openqa.selenium.remote.server.handler.SetWindowPosition;
import org.openqa.selenium.remote.server.handler.SetWindowSize;
import org.openqa.selenium.remote.server.handler.Status;
import org.openqa.selenium.remote.server.handler.SubmitElement;
import org.openqa.selenium.remote.server.handler.SwitchToFrame;
import org.openqa.selenium.remote.server.handler.SwitchToParentFrame;
import org.openqa.selenium.remote.server.handler.SwitchToWindow;
import org.openqa.selenium.remote.server.handler.UploadFile;
import org.openqa.selenium.remote.server.handler.html5.ClearLocalStorage;
import org.openqa.selenium.remote.server.handler.html5.ClearSessionStorage;
import org.openqa.selenium.remote.server.handler.html5.GetAppCacheStatus;
import org.openqa.selenium.remote.server.handler.html5.GetLocalStorageItem;
import org.openqa.selenium.remote.server.handler.html5.GetLocalStorageKeys;
import org.openqa.selenium.remote.server.handler.html5.GetLocalStorageSize;
import org.openqa.selenium.remote.server.handler.html5.GetLocationContext;
import org.openqa.selenium.remote.server.handler.html5.GetSessionStorageItem;
import org.openqa.selenium.remote.server.handler.html5.GetSessionStorageKeys;
import org.openqa.selenium.remote.server.handler.html5.GetSessionStorageSize;
import org.openqa.selenium.remote.server.handler.html5.RemoveLocalStorageItem;
import org.openqa.selenium.remote.server.handler.html5.RemoveSessionStorageItem;
import org.openqa.selenium.remote.server.handler.html5.SetLocalStorageItem;
import org.openqa.selenium.remote.server.handler.html5.SetLocationContext;
import org.openqa.selenium.remote.server.handler.html5.SetSessionStorageItem;
import org.openqa.selenium.remote.server.handler.interactions.ClickInSession;
import org.openqa.selenium.remote.server.handler.interactions.DoubleClickInSession;
import org.openqa.selenium.remote.server.handler.interactions.MouseDown;
import org.openqa.selenium.remote.server.handler.interactions.MouseMoveToLocation;
import org.openqa.selenium.remote.server.handler.interactions.MouseUp;
import org.openqa.selenium.remote.server.handler.interactions.SendKeyToActiveElement;
import org.openqa.selenium.remote.server.handler.interactions.touch.DoubleTapOnElement;
import org.openqa.selenium.remote.server.handler.interactions.touch.Down;
import org.openqa.selenium.remote.server.handler.interactions.touch.Flick;
import org.openqa.selenium.remote.server.handler.interactions.touch.LongPressOnElement;
import org.openqa.selenium.remote.server.handler.interactions.touch.Move;
import org.openqa.selenium.remote.server.handler.interactions.touch.Scroll;
import org.openqa.selenium.remote.server.handler.interactions.touch.SingleTapOnElement;
import org.openqa.selenium.remote.server.handler.interactions.touch.Up;
import org.openqa.selenium.remote.server.handler.mobile.GetNetworkConnection;
import org.openqa.selenium.remote.server.handler.mobile.SetNetworkConnection;
import org.openqa.selenium.remote.server.rest.RestishHandler;
import org.openqa.selenium.remote.server.rest.ResultConfig;

Expand Down Expand Up @@ -119,8 +218,6 @@ private void setUpMappings() {

addNewMapping(EXECUTE_SCRIPT, ExecuteScript.class);
addNewMapping(EXECUTE_ASYNC_SCRIPT, ExecuteAsyncScript.class);
addNewMapping(EXECUTE_SCRIPT_W3C, ExecuteScript.class);
addNewMapping(EXECUTE_ASYNC_SCRIPT_W3C, ExecuteAsyncScript.class);

addNewMapping(GET_PAGE_SOURCE, GetPageSource.class);

Expand Down

0 comments on commit 6109000

Please sign in to comment.