Skip to content

Commit aefe62e

Browse files
committed
Updating .NET bindings to better handle W3C error responses
1 parent 75fc22a commit aefe62e

File tree

3 files changed

+39
-8
lines changed

3 files changed

+39
-8
lines changed

dotnet/src/webdriver/Remote/RemoteWebDriver.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1385,6 +1385,7 @@ private static void UnpackAndThrowOnError(Response errorResponse)
13851385

13861386
case WebDriverResult.InvalidElementState:
13871387
case WebDriverResult.ElementNotSelectable:
1388+
case WebDriverResult.ElementNotInteractable:
13881389
throw new InvalidElementStateException(errorMessage);
13891390

13901391
case WebDriverResult.UnhandledError:

dotnet/src/webdriver/Remote/WebDriverError.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ private static void InitializeResultMap()
205205
resultMap = new Dictionary<string, WebDriverResult>();
206206
resultMap[ElementNotSelectable] = WebDriverResult.ElementNotSelectable;
207207
resultMap[ElementNotVisible] = WebDriverResult.ElementNotDisplayed;
208-
resultMap[ElementNotInteractable] = WebDriverResult.ElementNotDisplayed;
208+
resultMap[ElementNotInteractable] = WebDriverResult.ElementNotInteractable;
209209
resultMap[InsecureCertificate] = WebDriverResult.InsecureCertificate;
210210
resultMap[InvalidArgument] = WebDriverResult.InvalidArgument;
211211
resultMap[InvalidCookieDomain] = WebDriverResult.InvalidCookieDomain;
@@ -215,18 +215,18 @@ private static void InitializeResultMap()
215215
resultMap[InvalidSelector] = WebDriverResult.InvalidSelector;
216216
resultMap[InvalidSessionId] = WebDriverResult.NoSuchDriver;
217217
resultMap[JavaScriptError] = WebDriverResult.UnexpectedJavaScriptError;
218-
resultMap[MoveTargetOutOfBounds] = WebDriverResult.InvalidElementCoordinates;
218+
resultMap[MoveTargetOutOfBounds] = WebDriverResult.MoveTargetOutOfBounds;
219219
resultMap[NoSuchAlert] = WebDriverResult.NoAlertPresent;
220220
resultMap[NoSuchCookie] = WebDriverResult.NoSuchCookie;
221221
resultMap[NoSuchElement] = WebDriverResult.NoSuchElement;
222222
resultMap[NoSuchFrame] = WebDriverResult.NoSuchFrame;
223223
resultMap[NoSuchWindow] = WebDriverResult.NoSuchWindow;
224224
resultMap[ScriptTimeout] = WebDriverResult.AsyncScriptTimeout;
225-
resultMap[SessionNotCreated] = WebDriverResult.NoSuchDriver;
225+
resultMap[SessionNotCreated] = WebDriverResult.SessionNotCreated;
226226
resultMap[StaleElementReference] = WebDriverResult.ObsoleteElement;
227227
resultMap[Timeout] = WebDriverResult.Timeout;
228228
resultMap[UnableToSetCookie] = WebDriverResult.UnableToSetCookie;
229-
resultMap[UnableToCaptureScreen] = WebDriverResult.UnhandledError;
229+
resultMap[UnableToCaptureScreen] = WebDriverResult.UnableToCaptureScreen;
230230
resultMap[UnexpectedAlertOpen] = WebDriverResult.UnexpectedAlertOpen;
231231
resultMap[UnknownCommand] = WebDriverResult.UnknownCommand;
232232
resultMap[UnknownError] = WebDriverResult.UnhandledError;

dotnet/src/webdriver/WebDriverResult.cs

Lines changed: 34 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -178,19 +178,49 @@ public enum WebDriverResult
178178
/// </summary>
179179
InvalidSelector = 32,
180180

181+
/// <summary>
182+
/// A session was not created by the driver
183+
/// </summary>
184+
SessionNotCreated = 33,
185+
186+
/// <summary>
187+
/// The requested move was outside the active view port
188+
/// </summary>
189+
MoveTargetOutOfBounds = 34,
190+
191+
/// <summary>
192+
/// The XPath selector was invalid.
193+
/// </summary>
194+
InvalidXPathSelector = 51,
195+
181196
/// <summary>
182197
/// An insecure SSl certificate was specified.
183198
/// </summary>
184-
InsecureCertificate = 33,
199+
InsecureCertificate = 59,
185200

186201
/// <summary>
187-
/// No cookie was found matching the name requested.
202+
/// The element was not interactable
188203
/// </summary>
189-
NoSuchCookie = 34,
204+
ElementNotInteractable = 60,
190205

191206
/// <summary>
192207
/// An invalid argument was passed to the command.
193208
/// </summary>
194-
InvalidArgument = 1000
209+
InvalidArgument = 61,
210+
211+
/// <summary>
212+
/// No cookie was found matching the name requested.
213+
/// </summary>
214+
NoSuchCookie = 62,
215+
216+
/// <summary>
217+
/// The driver was unable to capture the screen.
218+
/// </summary>
219+
UnableToCaptureScreen = 63,
220+
221+
/// <summary>
222+
/// The click on the element was intercepted by a different element.
223+
/// </summary>
224+
ElementClickIntercepted = 64
195225
}
196226
}

0 commit comments

Comments
 (0)