Skip to content

Commit

Permalink
Merge branch 'trunk' into js-pin-script
Browse files Browse the repository at this point in the history
  • Loading branch information
harsha509 committed Feb 3, 2023
2 parents 5abdc8c + 7e8d9d2 commit b20fdbf
Show file tree
Hide file tree
Showing 47 changed files with 2,760 additions and 338 deletions.
6 changes: 2 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,10 @@ before submitting your pull requests.
* [Bazelisk](https://github.com/bazelbuild/bazelisk), a Bazel wrapper that automatically downloads
the version of Bazel specified in `.bazelversion` file and transparently passes through all
command-line arguments to the real Bazel binary.
* The latest version of the [Java 11 OpenJDK](https://openjdk.java.net/)
* Java JDK version 11 or greater (e.g., [Java 11 OpenJDK](https://openjdk.java.net/))
* `java` and `jar` on the `$PATH` (make sure you use `java` executable from JDK but not JRE).
* To test this, try running the command `javac`. This command won't exist if you only have the JRE
installed. If you're met with a list of command-line options, you're referencing the JDK properly.
* [Python 3.7+](https://www.python.org/downloads/) and `python` on the `PATH`
* [The tox automation project](http://tox.readthedocs.org/) for Python: `pip install tox`
* macOS users:
* Install the latest version of Xcode including the command-line tools. This command should work `xcode-select --install`
* Apple Silicon Macs should add `build --host_platform=//:rosetta` to their `.bazelrc.local` file. We are working
Expand All @@ -66,7 +64,7 @@ If you plan to compile the
[IE driver](https://github.com/SeleniumHQ/selenium/wiki/InternetExplorerDriver),
you also need:

* [Visual Studio 2008](https://www.visualstudio.com/)
* [Visual Studio 2022](https://www.visualstudio.com/)
* 32 and 64-bit cross compilers

The build will work on any platform, but the tests for IE will be
Expand Down
6 changes: 0 additions & 6 deletions WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -229,12 +229,6 @@ rules_closure_toolchains()

http_archive(
name = "rules_pkg",
patch_args = [
"-p1",
],
patches = [
"//py:rules_pkg_tree.patch",
],
sha256 = "eea0f59c28a9241156a47d7a8e32db9122f3d50b505fae0f33de6ce4d9b61834",
urls = [
"https://mirror.bazel.build/github.com/bazelbuild/rules_pkg/releases/download/0.8.0/rules_pkg-0.8.0.tar.gz",
Expand Down
4 changes: 2 additions & 2 deletions dotnet/test/common/DevTools/DevToolsConsoleTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ public class DevToolsConsoleTest : DevToolsTestFixture
[IgnoreBrowser(Selenium.Browser.Safari, "Safari does not support Chrome DevTools Protocol")]
public async Task VerifyMessageAdded()
{
var domains = session.GetVersionSpecificDomains<V108.DevToolsSessionDomains>();
var domains = session.GetVersionSpecificDomains<V109.DevToolsSessionDomains>();
string consoleMessage = "Hello Selenium";

ManualResetEventSlim sync = new ManualResetEventSlim(false);
EventHandler<V108.Console.MessageAddedEventArgs> messageAddedHandler = (sender, e) =>
EventHandler<V109.Console.MessageAddedEventArgs> messageAddedHandler = (sender, e) =>
{
Assert.That(e.Message.Text, Is.EqualTo(consoleMessage));
sync.Set();
Expand Down
6 changes: 3 additions & 3 deletions dotnet/test/common/DevTools/DevToolsLogTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ public class DevToolsLogTest : DevToolsTestFixture
[IgnoreBrowser(Selenium.Browser.Safari, "Safari does not support Chrome DevTools Protocol")]
public async Task VerifyEntryAddedAndClearLog()
{
var domains = session.GetVersionSpecificDomains<V108.DevToolsSessionDomains>();
var domains = session.GetVersionSpecificDomains<V109.DevToolsSessionDomains>();
ManualResetEventSlim sync = new ManualResetEventSlim(false);
EventHandler<V108.Log.EntryAddedEventArgs> entryAddedHandler = (sender, e) =>
EventHandler<V109.Log.EntryAddedEventArgs> entryAddedHandler = (sender, e) =>
{
Assert.That(e.Entry.Text.Contains("404"));
Assert.That(e.Entry.Level == V108.Log.LogEntryLevelValues.Error);
Assert.That(e.Entry.Level == V109.Log.LogEntryLevelValues.Error);
sync.Set();
};

Expand Down
144 changes: 72 additions & 72 deletions dotnet/test/common/DevTools/DevToolsNetworkTest.cs

Large diffs are not rendered by default.

30 changes: 15 additions & 15 deletions dotnet/test/common/DevTools/DevToolsPerformanceTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ public class DevToolsPerformanceTest : DevToolsTestFixture
[IgnoreBrowser(Selenium.Browser.Safari, "Safari does not support Chrome DevTools Protocol")]
public async Task EnableAndDisablePerformance()
{
var domains = session.GetVersionSpecificDomains<V108.DevToolsSessionDomains>();
await domains.Performance.Enable(new V108.Performance.EnableCommandSettings());
var domains = session.GetVersionSpecificDomains<V109.DevToolsSessionDomains>();
await domains.Performance.Enable(new V109.Performance.EnableCommandSettings());
driver.Url = simpleTestPage;
await domains.Performance.Disable();
}
Expand All @@ -24,7 +24,7 @@ public async Task EnableAndDisablePerformance()
[IgnoreBrowser(Selenium.Browser.Safari, "Safari does not support Chrome DevTools Protocol")]
public async Task DisablePerformance()
{
var domains = session.GetVersionSpecificDomains<V108.DevToolsSessionDomains>();
var domains = session.GetVersionSpecificDomains<V109.DevToolsSessionDomains>();
await domains.Performance.Disable();
driver.Url = simpleTestPage;
await domains.Performance.Disable();
Expand All @@ -36,13 +36,13 @@ public async Task DisablePerformance()
[IgnoreBrowser(Selenium.Browser.Safari, "Safari does not support Chrome DevTools Protocol")]
public async Task SetTimeDomainTimeTickPerformance()
{
var domains = session.GetVersionSpecificDomains<V108.DevToolsSessionDomains>();
var domains = session.GetVersionSpecificDomains<V109.DevToolsSessionDomains>();
await domains.Performance.Disable();
await domains.Performance.SetTimeDomain(new V108.Performance.SetTimeDomainCommandSettings()
await domains.Performance.SetTimeDomain(new V109.Performance.SetTimeDomainCommandSettings()
{
TimeDomain = "timeTicks"
});
await domains.Performance.Enable(new V108.Performance.EnableCommandSettings());
await domains.Performance.Enable(new V109.Performance.EnableCommandSettings());
driver.Url = simpleTestPage;
await domains.Performance.Disable();
}
Expand All @@ -54,13 +54,13 @@ await domains.Performance.SetTimeDomain(new V108.Performance.SetTimeDomainComman
[IgnoreBrowser(Selenium.Browser.Safari, "Safari does not support Chrome DevTools Protocol")]
public async Task SetTimeDomainsThreadTicksPerformance()
{
var domains = session.GetVersionSpecificDomains<V108.DevToolsSessionDomains>();
var domains = session.GetVersionSpecificDomains<V109.DevToolsSessionDomains>();
await domains.Performance.Disable();
await domains.Performance.SetTimeDomain(new V108.Performance.SetTimeDomainCommandSettings()
await domains.Performance.SetTimeDomain(new V109.Performance.SetTimeDomainCommandSettings()
{
TimeDomain = "threadTicks"
});
await domains.Performance.Enable(new V108.Performance.EnableCommandSettings());
await domains.Performance.Enable(new V109.Performance.EnableCommandSettings());
driver.Url = simpleTestPage;
await domains.Performance.Disable();
}
Expand All @@ -71,12 +71,12 @@ await domains.Performance.SetTimeDomain(new V108.Performance.SetTimeDomainComman
[IgnoreBrowser(Selenium.Browser.Safari, "Safari does not support Chrome DevTools Protocol")]
public async Task GetMetricsByTimeTicks()
{
var domains = session.GetVersionSpecificDomains<V108.DevToolsSessionDomains>();
await domains.Performance.SetTimeDomain(new V108.Performance.SetTimeDomainCommandSettings()
var domains = session.GetVersionSpecificDomains<V109.DevToolsSessionDomains>();
await domains.Performance.SetTimeDomain(new V109.Performance.SetTimeDomainCommandSettings()
{
TimeDomain = "timeTicks"
});
await domains.Performance.Enable(new V108.Performance.EnableCommandSettings());
await domains.Performance.Enable(new V109.Performance.EnableCommandSettings());
driver.Url = simpleTestPage;
var response = await domains.Performance.GetMetrics();
var metrics = response.Metrics;
Expand All @@ -92,12 +92,12 @@ await domains.Performance.SetTimeDomain(new V108.Performance.SetTimeDomainComman
[IgnoreBrowser(Selenium.Browser.Safari, "Safari does not support Chrome DevTools Protocol")]
public async Task GetMetricsByThreadTicks()
{
var domains = session.GetVersionSpecificDomains<V108.DevToolsSessionDomains>();
await domains.Performance.SetTimeDomain(new V108.Performance.SetTimeDomainCommandSettings()
var domains = session.GetVersionSpecificDomains<V109.DevToolsSessionDomains>();
await domains.Performance.SetTimeDomain(new V109.Performance.SetTimeDomainCommandSettings()
{
TimeDomain = "threadTicks"
});
await domains.Performance.Enable(new V108.Performance.EnableCommandSettings());
await domains.Performance.Enable(new V109.Performance.EnableCommandSettings());
driver.Url = simpleTestPage;
var response = await domains.Performance.GetMetrics();
var metrics = response.Metrics;
Expand Down
18 changes: 9 additions & 9 deletions dotnet/test/common/DevTools/DevToolsProfilerTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public class DevToolsProfilerTest : DevToolsTestFixture
[IgnoreBrowser(Selenium.Browser.Safari, "Safari does not support Chrome DevTools Protocol")]
public async Task SimpleStartStopAndGetProfilerTest()
{
var domains = session.GetVersionSpecificDomains<V108.DevToolsSessionDomains>();
var domains = session.GetVersionSpecificDomains<V109.DevToolsSessionDomains>();
await domains.Profiler.Enable();
await domains.Profiler.Start();
var response = await domains.Profiler.Stop();
Expand All @@ -32,10 +32,10 @@ public async Task SimpleStartStopAndGetProfilerTest()
[IgnoreBrowser(Selenium.Browser.Safari, "Safari does not support Chrome DevTools Protocol")]
public async Task SampleGetBestEffortProfilerTest()
{
var domains = session.GetVersionSpecificDomains<V108.DevToolsSessionDomains>();
var domains = session.GetVersionSpecificDomains<V109.DevToolsSessionDomains>();
await domains.Profiler.Enable();
driver.Url = simpleTestPage;
await domains.Profiler.SetSamplingInterval(new V108.Profiler.SetSamplingIntervalCommandSettings()
await domains.Profiler.SetSamplingInterval(new V109.Profiler.SetSamplingIntervalCommandSettings()
{
Interval = 30
});
Expand All @@ -53,10 +53,10 @@ await domains.Profiler.SetSamplingInterval(new V108.Profiler.SetSamplingInterval
[IgnoreBrowser(Selenium.Browser.Safari, "Safari does not support Chrome DevTools Protocol")]
public async Task SampleSetStartPreciseCoverageTest()
{
var domains = session.GetVersionSpecificDomains<V108.DevToolsSessionDomains>();
var domains = session.GetVersionSpecificDomains<V109.DevToolsSessionDomains>();
await domains.Profiler.Enable();
driver.Url = simpleTestPage;
await domains.Profiler.StartPreciseCoverage(new V108.Profiler.StartPreciseCoverageCommandSettings()
await domains.Profiler.StartPreciseCoverage(new V109.Profiler.StartPreciseCoverageCommandSettings()
{
CallCount = true,
Detailed = true
Expand All @@ -78,11 +78,11 @@ await domains.Profiler.StartPreciseCoverage(new V108.Profiler.StartPreciseCovera
[IgnoreBrowser(Selenium.Browser.Safari, "Safari does not support Chrome DevTools Protocol")]
public async Task SampleProfileEvents()
{
var domains = session.GetVersionSpecificDomains<V108.DevToolsSessionDomains>();
var domains = session.GetVersionSpecificDomains<V109.DevToolsSessionDomains>();
await domains.Profiler.Enable();
driver.Url = simpleTestPage;
ManualResetEventSlim startSync = new ManualResetEventSlim(false);
EventHandler<V108.Profiler.ConsoleProfileStartedEventArgs> consoleProfileStartedHandler = (sender, e) =>
EventHandler<V109.Profiler.ConsoleProfileStartedEventArgs> consoleProfileStartedHandler = (sender, e) =>
{
Assert.That(e, Is.Not.Null);
startSync.Set();
Expand All @@ -94,7 +94,7 @@ public async Task SampleProfileEvents()
driver.Navigate().Refresh();

ManualResetEventSlim finishSync = new ManualResetEventSlim(false);
EventHandler<V108.Profiler.ConsoleProfileFinishedEventArgs> consoleProfileFinishedHandler = (sender, e) =>
EventHandler<V109.Profiler.ConsoleProfileFinishedEventArgs> consoleProfileFinishedHandler = (sender, e) =>
{
Assert.That(e, Is.Not.Null);
finishSync.Set();
Expand All @@ -109,7 +109,7 @@ public async Task SampleProfileEvents()
await domains.Profiler.Disable();
}

private void ValidateProfile(V108.Profiler.Profile profiler)
private void ValidateProfile(V109.Profiler.Profile profiler)
{
Assert.That(profiler, Is.Not.Null);
Assert.That(profiler.Nodes, Is.Not.Null);
Expand Down
10 changes: 5 additions & 5 deletions dotnet/test/common/DevTools/DevToolsSecurityTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,17 @@ public class DevToolsSecurityTest : DevToolsTestFixture
[IgnoreBrowser(Selenium.Browser.Safari, "Safari does not support Chrome DevTools Protocol")]
public async Task LoadInsecureWebsite()
{
var domains = session.GetVersionSpecificDomains<V108.DevToolsSessionDomains>();
var domains = session.GetVersionSpecificDomains<V109.DevToolsSessionDomains>();
await domains.Security.Enable();

await domains.Security.SetIgnoreCertificateErrors(new V108.Security.SetIgnoreCertificateErrorsCommandSettings()
await domains.Security.SetIgnoreCertificateErrors(new V109.Security.SetIgnoreCertificateErrorsCommandSettings()
{
Ignore = false
});

string summary = null;
ManualResetEventSlim sync = new ManualResetEventSlim(false);
EventHandler<V108.Security.SecurityStateChangedEventArgs> securityStateChangedHandler = (sender, e) =>
EventHandler<V109.Security.SecurityStateChangedEventArgs> securityStateChangedHandler = (sender, e) =>
{
summary = e.Summary;
sync.Set();
Expand All @@ -50,10 +50,10 @@ await domains.Security.SetIgnoreCertificateErrors(new V108.Security.SetIgnoreCer
[IgnoreBrowser(Selenium.Browser.Safari, "Safari does not support Chrome DevTools Protocol")]
public async Task LoadSecureWebsite()
{
var domains = session.GetVersionSpecificDomains<V108.DevToolsSessionDomains>();
var domains = session.GetVersionSpecificDomains<V109.DevToolsSessionDomains>();
await domains.Security.Enable();

await domains.Security.SetIgnoreCertificateErrors(new V108.Security.SetIgnoreCertificateErrorsCommandSettings()
await domains.Security.SetIgnoreCertificateErrors(new V109.Security.SetIgnoreCertificateErrorsCommandSettings()
{
Ignore = true
});
Expand Down
Loading

0 comments on commit b20fdbf

Please sign in to comment.