Skip to content

Commit f18878a

Browse files
authored
Merge branch 'trunk' into relay-node-match
2 parents 59cdc70 + d77b0c7 commit f18878a

File tree

14 files changed

+75
-75
lines changed

14 files changed

+75
-75
lines changed

.github/label-commenter-config.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,3 +137,17 @@ labels:
137137
138138
Please turn on logging and re-run your code. Information on how to adjust logs for your language can be found in our
139139
[Troubleshooting documentation](https://www.selenium.dev/documentation/webdriver/troubleshooting/logging/).
140+
- name: B-support
141+
labeled:
142+
issue:
143+
body: |
144+
Hi, @{{ issue.user.login }}.
145+
146+
This is related to code in the Support packages. The support packages contain example code that
147+
many users find helpful, but they do not necessarily represent the best practices for using Selenium,
148+
and the Selenium team is not prioritizing work on them right now.
149+
This doesn't mean that we won't ever work on them, but it is not on our roadmap as we push to release Selenium 5.
150+
151+
We actively encourage people to create their own wrapper and helper code that makes sense for them.
152+
If you have any questions, please [contact us](https://www.selenium.dev/support)
153+

.github/renovate.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"labels": ["B-dependencies"]
3+
}

.github/workflows/stale.yml

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,29 @@ jobs:
2020
with:
2121
stale-issue-message: 'This issue is stale because it has been open 280 days with no activity. Remove stale label or comment or this will be closed in 14 days.'
2222
close-issue-message: 'This issue was closed because it has been stalled for 14 days with no activity.'
23-
stale-issue-label: 'I-stale'
23+
stale-issue-label: 'J-stale'
24+
stale-pr-label: 'J-stale'
2425
days-before-stale: 180
2526
days-before-close: 14
2627
exempt-all-milestones: true
2728
- uses: actions/stale@v9
2829
with:
2930
close-issue-message: 'This issue was closed because we did not receive any additional information after 14 days.'
30-
stale-issue-label: 'R-awaiting answer'
31+
stale-issue-label: 'J-awaiting answer'
3132
days-before-stale: -1
3233
days-before-close: 14
33-
labels-to-add-when-unstale: 'needs-triaging'
34-
34+
labels-to-add-when-unstale: 'A-needs-triaging'
35+
- uses: actions/stale@v9
36+
with:
37+
close-issue-message: 'This issue was closed because we did not receive any additional information after 14 days.'
38+
stale-issue-label: 'J-logging'
39+
days-before-stale: -1
40+
days-before-close: 14
41+
labels-to-add-when-unstale: 'A-needs-triaging'
42+
- uses: actions/stale@v9
43+
with:
44+
close-issue-message: 'This issue was closed because we did not receive any additional information after 14 days.'
45+
stale-issue-label: 'J-issue-template'
46+
days-before-stale: -1
47+
days-before-close: 14
48+
labels-to-add-when-unstale: 'A-needs-triaging'

dotnet/src/webdriver/Alert.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public string? Text
4545
{
4646
get
4747
{
48-
Response commandResponse = this.driver.InternalExecute(DriverCommand.GetAlertText, null);
48+
Response commandResponse = this.driver.Execute(DriverCommand.GetAlertText, null);
4949
return (string?)commandResponse.Value;
5050
}
5151
}
@@ -55,15 +55,15 @@ public string? Text
5555
/// </summary>
5656
public void Dismiss()
5757
{
58-
this.driver.InternalExecute(DriverCommand.DismissAlert, null);
58+
this.driver.Execute(DriverCommand.DismissAlert, null);
5959
}
6060

6161
/// <summary>
6262
/// Accepts the alert.
6363
/// </summary>
6464
public void Accept()
6565
{
66-
this.driver.InternalExecute(DriverCommand.AcceptAlert, null);
66+
this.driver.Execute(DriverCommand.AcceptAlert, null);
6767
}
6868

6969
/// <summary>
@@ -81,7 +81,7 @@ public void SendKeys(string keysToSend)
8181
Dictionary<string, object> parameters = new Dictionary<string, object>();
8282
parameters.Add("text", keysToSend);
8383

84-
this.driver.InternalExecute(DriverCommand.SetAlertValue, parameters);
84+
this.driver.Execute(DriverCommand.SetAlertValue, parameters);
8585
}
8686
}
8787
}

dotnet/src/webdriver/CookieJar.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public ReadOnlyCollection<Cookie> AllCookies
3232
{
3333
get
3434
{
35-
Response response = driver.InternalExecute(DriverCommand.GetAllCookies, new Dictionary<string, object>());
35+
Response response = driver.Execute(DriverCommand.GetAllCookies, new Dictionary<string, object>());
3636

3737
List<Cookie> toReturn = new List<Cookie>();
3838
if (response.Value is object?[] cookies)
@@ -65,7 +65,7 @@ public void AddCookie(Cookie cookie)
6565

6666
Dictionary<string, object> parameters = new Dictionary<string, object>();
6767
parameters.Add("cookie", cookie);
68-
driver.InternalExecute(DriverCommand.AddCookie, parameters);
68+
driver.Execute(DriverCommand.AddCookie, parameters);
6969
}
7070

7171
/// <summary>
@@ -82,7 +82,7 @@ public void DeleteCookieNamed(string name)
8282

8383
Dictionary<string, object> parameters = new() { { "name", name } };
8484

85-
driver.InternalExecute(DriverCommand.DeleteCookie, parameters);
85+
driver.Execute(DriverCommand.DeleteCookie, parameters);
8686
}
8787

8888
/// <summary>
@@ -105,7 +105,7 @@ public void DeleteCookie(Cookie cookie)
105105
/// </summary>
106106
public void DeleteAllCookies()
107107
{
108-
driver.InternalExecute(DriverCommand.DeleteAllCookies, null);
108+
driver.Execute(DriverCommand.DeleteAllCookies, null);
109109
}
110110

111111
/// <summary>
@@ -123,7 +123,7 @@ public void DeleteAllCookies()
123123

124124
try
125125
{
126-
var rawCookie = driver.InternalExecute(DriverCommand.GetCookie, new() { { "name", name } }).Value;
126+
var rawCookie = driver.Execute(DriverCommand.GetCookie, new() { { "name", name } }).Value;
127127

128128
return Cookie.FromDictionary((Dictionary<string, object?>)rawCookie!);
129129
}

dotnet/src/webdriver/HttpCommandInfo.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,11 @@ public class HttpCommandInfo : CommandInfo
4949
/// </summary>
5050
/// <param name="method">Method of the Command</param>
5151
/// <param name="resourcePath">Relative URL path to the resource used to execute the command</param>
52+
/// <exception cref="ArgumentNullException">If <paramref name="method"/> or <paramref name="resourcePath"/> are <see langword="null"/>.</exception>
5253
public HttpCommandInfo(string method, string resourcePath)
5354
{
54-
this.ResourcePath = resourcePath;
55-
this.Method = method;
55+
this.ResourcePath = resourcePath ?? throw new ArgumentNullException(nameof(resourcePath));
56+
this.Method = method ?? throw new ArgumentNullException(nameof(method));
5657
}
5758

5859
/// <summary>

dotnet/src/webdriver/Logs.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public ReadOnlyCollection<string> AvailableLogTypes
5050
List<string> availableLogTypes = new List<string>();
5151
try
5252
{
53-
Response commandResponse = this.driver.InternalExecute(DriverCommand.GetAvailableLogTypes, null);
53+
Response commandResponse = this.driver.Execute(DriverCommand.GetAvailableLogTypes, null);
5454
if (commandResponse.Value is object[] responseValue)
5555
{
5656
foreach (object logKind in responseValue)
@@ -86,7 +86,7 @@ public ReadOnlyCollection<LogEntry> GetLog(string logKind)
8686

8787
Dictionary<string, object> parameters = new Dictionary<string, object>();
8888
parameters.Add("type", logKind);
89-
Response commandResponse = this.driver.InternalExecute(DriverCommand.GetLog, parameters);
89+
Response commandResponse = this.driver.Execute(DriverCommand.GetLog, parameters);
9090

9191
if (commandResponse.Value is object?[] responseValue)
9292
{

dotnet/src/webdriver/Navigator.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public void Back()
5757
/// <returns>A task object representing the asynchronous operation.</returns>
5858
public async Task BackAsync()
5959
{
60-
await this.driver.InternalExecuteAsync(DriverCommand.GoBack, null).ConfigureAwait(false);
60+
await this.driver.ExecuteAsync(DriverCommand.GoBack, null).ConfigureAwait(false);
6161
}
6262

6363
/// <summary>
@@ -77,7 +77,7 @@ public void Forward()
7777
/// <returns>A task object representing the asynchronous operation.</returns>
7878
public async Task ForwardAsync()
7979
{
80-
await this.driver.InternalExecuteAsync(DriverCommand.GoForward, null).ConfigureAwait(false);
80+
await this.driver.ExecuteAsync(DriverCommand.GoForward, null).ConfigureAwait(false);
8181
}
8282

8383
/// <summary>
@@ -110,7 +110,7 @@ public async Task GoToUrlAsync(string url)
110110
{
111111
{ "url", url }
112112
};
113-
await this.driver.InternalExecuteAsync(DriverCommand.Get, parameters).ConfigureAwait(false);
113+
await this.driver.ExecuteAsync(DriverCommand.Get, parameters).ConfigureAwait(false);
114114
}
115115

116116
/// <summary>
@@ -160,7 +160,7 @@ public void Refresh()
160160
public async Task RefreshAsync()
161161
{
162162
// driver.SwitchTo().DefaultContent();
163-
await this.driver.InternalExecuteAsync(DriverCommand.Refresh, null).ConfigureAwait(false);
163+
await this.driver.ExecuteAsync(DriverCommand.Refresh, null).ConfigureAwait(false);
164164
}
165165
}
166166
}

dotnet/src/webdriver/ShadowRoot.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ public IWebElement FindElement(By by)
9696
parameters.Add("using", by.Mechanism);
9797
parameters.Add("value", by.Criteria);
9898

99-
Response commandResponse = this.driver.InternalExecute(DriverCommand.FindShadowChildElement, parameters);
99+
Response commandResponse = this.driver.Execute(DriverCommand.FindShadowChildElement, parameters);
100100
return this.driver.GetElementFromResponse(commandResponse)!;
101101
}
102102

@@ -120,7 +120,7 @@ public ReadOnlyCollection<IWebElement> FindElements(By by)
120120
parameters.Add("using", by.Mechanism);
121121
parameters.Add("value", by.Criteria);
122122

123-
Response commandResponse = this.driver.InternalExecute(DriverCommand.FindShadowChildElements, parameters);
123+
Response commandResponse = this.driver.Execute(DriverCommand.FindShadowChildElements, parameters);
124124
return this.driver.GetElementsFromResponse(commandResponse);
125125
}
126126

dotnet/src/webdriver/TargetLocator.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public IWebDriver Frame(int frameIndex)
5151
{
5252
Dictionary<string, object> parameters = new Dictionary<string, object>();
5353
parameters.Add("id", frameIndex);
54-
this.driver.InternalExecute(DriverCommand.SwitchToFrame, parameters);
54+
this.driver.Execute(DriverCommand.SwitchToFrame, parameters);
5555
return this.driver;
5656
}
5757

@@ -114,7 +114,7 @@ public IWebDriver Frame(IWebElement frameElement)
114114

115115
Dictionary<string, object> parameters = new Dictionary<string, object>();
116116
parameters.Add("id", elementDictionary);
117-
this.driver.InternalExecute(DriverCommand.SwitchToFrame, parameters);
117+
this.driver.Execute(DriverCommand.SwitchToFrame, parameters);
118118
return this.driver;
119119
}
120120

@@ -125,7 +125,7 @@ public IWebDriver Frame(IWebElement frameElement)
125125
public IWebDriver ParentFrame()
126126
{
127127
Dictionary<string, object> parameters = new Dictionary<string, object>();
128-
this.driver.InternalExecute(DriverCommand.SwitchToParentFrame, parameters);
128+
this.driver.Execute(DriverCommand.SwitchToParentFrame, parameters);
129129
return this.driver;
130130
}
131131

@@ -146,7 +146,7 @@ public IWebDriver Window(string windowHandleOrName)
146146
parameters.Add("handle", windowHandleOrName);
147147
try
148148
{
149-
this.driver.InternalExecute(DriverCommand.SwitchToWindow, parameters);
149+
this.driver.Execute(DriverCommand.SwitchToWindow, parameters);
150150
return this.driver;
151151
}
152152
catch (NoSuchWindowException)
@@ -193,7 +193,7 @@ public IWebDriver NewWindow(WindowType typeHint)
193193
Dictionary<string, object> parameters = new Dictionary<string, object>();
194194
parameters.Add("type", typeHint.ToString().ToLowerInvariant());
195195

196-
Response response = this.driver.InternalExecute(DriverCommand.NewWindow, parameters);
196+
Response response = this.driver.Execute(DriverCommand.NewWindow, parameters);
197197

198198
Dictionary<string, object> result = (Dictionary<string, object>)response.Value!;
199199
string newWindowHandle = result["handle"].ToString()!;
@@ -210,7 +210,7 @@ public IWebDriver DefaultContent()
210210
{
211211
Dictionary<string, object?> parameters = new Dictionary<string, object?>();
212212
parameters.Add("id", null);
213-
this.driver.InternalExecute(DriverCommand.SwitchToFrame, parameters);
213+
this.driver.Execute(DriverCommand.SwitchToFrame, parameters);
214214
return this.driver;
215215
}
216216

@@ -220,7 +220,7 @@ public IWebDriver DefaultContent()
220220
/// <returns>Element that is active</returns>
221221
public IWebElement ActiveElement()
222222
{
223-
Response response = this.driver.InternalExecute(DriverCommand.GetActiveElement, null);
223+
Response response = this.driver.Execute(DriverCommand.GetActiveElement, null);
224224
return this.driver.GetElementFromResponse(response)!;
225225
}
226226

@@ -232,7 +232,7 @@ public IAlert Alert()
232232
{
233233
// N.B. We only execute the GetAlertText command to be able to throw
234234
// a NoAlertPresentException if there is no alert found.
235-
this.driver.InternalExecute(DriverCommand.GetAlertText, null);
235+
this.driver.Execute(DriverCommand.GetAlertText, null);
236236
return new Alert(this.driver);
237237
}
238238
}

0 commit comments

Comments
 (0)