Skip to content

Commit 84ea2c8

Browse files
committed
Setting Json.NET to ignore dates when parsing response values
Fixes issue #7367.
1 parent df47513 commit 84ea2c8

File tree

2 files changed

+20
-1
lines changed

2 files changed

+20
-1
lines changed

dotnet/src/webdriver/Remote/Response.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,9 @@ public WebDriverResult Status
8787
/// <returns>A <see cref="Response"/> object described by the JSON string.</returns>
8888
public static Response FromJson(string value)
8989
{
90-
return JsonConvert.DeserializeObject<Response>(value);
90+
JsonSerializerSettings settings = new JsonSerializerSettings();
91+
settings.DateParseHandling = DateParseHandling.None;
92+
return JsonConvert.DeserializeObject<Response>(value, settings);
9193
}
9294

9395
/// <summary>

dotnet/test/common/ExecutingJavascriptTest.cs

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -738,6 +738,23 @@ public void ShouldBeAbleToPassInMixedArguments()
738738

739739
}
740740

741+
[Test]
742+
[Category("Javascript")]
743+
public void ShouldBeAbleToPassInAndRetrieveDates()
744+
{
745+
string function = "displayMessage(arguments[0]);";
746+
747+
if (!(driver is IJavaScriptExecutor))
748+
return;
749+
750+
driver.Url = javascriptPage;
751+
752+
ExecuteScript(function, "2014-05-20T20:00:00+08:00");
753+
IWebElement element = driver.FindElement(By.Id("result"));
754+
string text = element.Text;
755+
Assert.AreEqual("2014-05-20T20:00:00+08:00", text);
756+
}
757+
741758
private bool CompareLists(ReadOnlyCollection<object> first, ReadOnlyCollection<object> second)
742759
{
743760
if (first.Count != second.Count)

0 commit comments

Comments
 (0)