Skip to content

Commit 544aabe

Browse files
authored
Merge branch 'trunk' into patch-1
2 parents e507ba1 + 27ef6ff commit 544aabe

File tree

9 files changed

+93
-96
lines changed

9 files changed

+93
-96
lines changed

website_and_docs/content/documentation/grid/advanced_features/endpoints.zh-cn.md

Lines changed: 38 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -21,19 +21,19 @@ Grid状态提供Grid的当前状态.
2121
cURL GET 'http://localhost:4444/status'
2222
```
2323

24-
### 检查会话所有者
24+
### 删除会话
2525

26-
要检查会话是否属于某一节点, 请使用下面列出的cURL命令.
26+
删除会话会终止 WebDriver 会话、退出驱动程序并将其从活动会话映射中删除。任何使用删除的会话标识或重新使用驱动程序实例的请求都会出错。
2727

2828
```shell
2929
cURL --request DELETE 'http://localhost:4444/session/<session-id>'
3030
```
3131

32-
### Which URL should I use?
32+
### 我应该使用哪一个URL?
3333

34-
在独立模式下, Grid URL是独立服务器的地址.
34+
在 Standalone 模式下, Grid URL是独立服务器的地址.
3535

36-
在集线器节点模式下, Grid URL是集线器服务器的地址.
36+
在 Hub-Node 模式下, Grid URL是集线器服务器的地址.
3737

3838
在完全分布式模式下, Grid URL是路由服务器的地址.
3939

@@ -43,90 +43,66 @@ cURL --request DELETE 'http://localhost:4444/session/<session-id>'
4343

4444
### 删除节点
4545

46-
要从Grid中删除节点,
47-
请使用下面列出的cURL命令.
48-
它不会停止在该节点上运行的任何持续中的会话.
49-
除非显式终止, 否则节点将继续按原样运行.
50-
分发器不再知晓该节点,
51-
因此任何匹配的新会话请求
52-
也不会转发到该节点.
46+
要从网格中删除节点,请使用下面列出的 cURL 命令。该命令不会停止正在该节点上运行的任何会话。除非显式终止, 否则节点将继续运行。分发器不再知道该节点,因此任何匹配的新会话请求都不会转发到该节点。
5347

54-
在独立模式下, 分发器URL是独立服务器的地址.
48+
在 Standalone 模式下,分发器 URL 是独立服务器地址。
5549

56-
在集线器节点模式下, 分发器URL是集线器服务器的地址.
50+
在 Hub-Node 模式下, 分发器 URL 是 Hub 服务器的地址。
5751

5852
```shell
5953
cURL --request DELETE 'http://localhost:4444/se/grid/distributor/node/<node-id>' --header 'X-REGISTRATION-SECRET: <secret> '
6054
```
61-
在完全分布式模式下, URL是分发器的地址.
55+
在完全分布式模式下, URL是分发器的地址
6256

6357
```shell
6458
cURL --request DELETE 'http://localhost:4444/se/grid/distributor/node/<node-id>' --header 'X-REGISTRATION-SECRET: <secret>'
6559
```
66-
如果在设置Grid时未配置注册密码,
67-
则使用
60+
如果在设置Grid时未配置注册密码, 则使用
6861
```shell
6962
cURL --request DELETE 'http://<Router-URL>/se/grid/distributor/node/<node-id>' --header 'X-REGISTRATION-SECRET;'
7063
```
7164

72-
### 放空节点
65+
### 释放节点
7366

74-
节点放空命令用于优雅地关闭节点.
75-
放空节点将在所有持续中的会话完成后停止节点.
76-
但是, 它不接受任何新的会话请求.
67+
节点释放命令用于优雅地关闭节点。在所有正在进行的会话结束后,会停止该节点。并且,它不会接受任何新的会话请求。
7768

78-
在独立模式下, 分发器URL是独立服务器的地址.
69+
在 Standalone 模式下,分发器 URL 是独立服务器地址。
7970

80-
在集线器节点模式下, 分发器URL是集线器服务器的地址.
71+
在 Hub-Node 模式下, 分发器 URL 是 Hub 服务器的地址。
8172
```shell
8273
cURL --request POST 'http://localhost:4444/se/grid/distributor/node/<node-id>/drain' --header 'X-REGISTRATION-SECRET: <secret> '
8374
```
84-
在完全分布式模式下, URL是分发服务器的地址.
75+
在完全分布式模式下, URL是分发服务器的地址
8576
```shell
8677
cURL --request POST 'http://localhost:4444/se/grid/distributor/node/<node-id>/drain' --header 'X-REGISTRATION-SECRET: <secret>'
8778
```
88-
如果在设置Grid时未配置注册密码,
89-
则使用
79+
如果在设置Grid时未配置注册密码, 则使用
9080
```shell
9181
cURL --request POST 'http://<Router-URL>/se/grid/distributor/node/<node-id>/drain' --header 'X-REGISTRATION-SECRET;'
9282
```
9383

9484
## 节点
9585

96-
本节中的端点适用于
97-
集线器节点模式和
98-
节点独立运行的完全分布式网格模式.
99-
在一个节点的情况下, 默认节点的URL为 http://localhost:5555 .
100-
如果有多个节点,
101-
请使用 [Grid 状态](#grid-状态) 获取所有节点详细信息
102-
以及定位地址.
86+
本节中的端点适用于 Hub-Node 模式和节点独立运行的完全分布式网格模式。在一个节点的情况下, 默认节点的URL为 http://localhost:5555
87+
如果有多个节点,请使用 [Grid 状态](#grid-状态) 获取所有节点的详细信息并查找节点地址。
10388

10489
### 状态
10590

106-
节点状态本质上是节点的运行状况检查.
107-
分发器定期ping节点状态,
108-
并相应地更新Grid模型.
109-
状态包括相关的可用性, 会话和插槽的信息.
91+
节点状态本质上是节点的健康检查。分发程序会定期 ping 节点状态,并相应地更新 Grid 模型。状态包括有关可用性、会话和插槽的信息。
11092

11193
```shell
11294
cURL --request GET 'http://localhost:5555/status'
11395
```
11496

115-
### 放空
97+
### 释放
11698

117-
分发器将 [放空](#放空节点) 命令传递给
118-
由node-id标识的相应节点.
119-
要直接放空节点,
120-
请使用下面列出的cuRL命令.
121-
两个端点都有效并产生相同的结果.
122-
放空会等待持续中的会话完成后
123-
才停止节点.
99+
分发器将 [释放](#释放节点) 命令传递给由node-id标识的相应节点。要直接释放节点,请使用下面列出的cuRL命令。
100+
两个端点都有效并产生相同的结果。释放会等待持续中的会话完成后才停止节点。
124101

125102
```shell
126103
cURL --request POST 'http://localhost:5555/se/grid/node/drain' --header 'X-REGISTRATION-SECRET: <secret>'
127104
```
128-
如果在设置Grid时未配置注册密码,
129-
则使用
105+
如果在设置Grid时未配置注册密码,则使用
130106
```shell
131107
cURL --request POST 'http://<node-URL>/se/grid/node/drain' --header 'X-REGISTRATION-SECRET;'
132108
```
@@ -138,30 +114,23 @@ cURL --request POST 'http://<node-URL>/se/grid/node/drain' --header 'X-REGISTRAT
138114
```shell
139115
cURL --request GET 'http://localhost:5555/se/grid/node/owner/<session-id>' --header 'X-REGISTRATION-SECRET: <secret>'
140116
```
141-
如果在设置Grid时未配置注册密码,
142-
则使用
117+
如果在设置Grid时未配置注册密码, 则使用
143118
```shell
144119
cURL --request GET 'http://<node-URL>/se/grid/node/owner/<session-id>' --header 'X-REGISTRATION-SECRET;'
145120
```
146121

147122
如果会话属于该节点,
148123
则返回true,
149-
否则返回false.
124+
否则返回false
150125

151126
### 删除会话
152127

153-
删除会话将终止WebDriver会话,
154-
退出驱动程序
155-
并将其从活动会话集合中删除.
156-
任何使用删除的会话id
157-
或重用驱动程序实例的请求
158-
都将抛出错误.
128+
删除会话会终止 WebDriver 会话、退出驱动程序并将其从活动会话映射中删除。任何使用删除的会话标识或重新使用驱动程序实例的请求都会出错。
159129

160130
```shell
161131
cURL --request DELETE 'http://localhost:5555/se/grid/node/session/<session-id>' --header 'X-REGISTRATION-SECRET: <secret>'
162132
```
163-
如果在设置Grid时未配置注册密码,
164-
则使用
133+
如果在设置Grid时未配置注册密码, 则使用
165134
```shell
166135
cURL --request DELETE 'http://<node-URL>/se/grid/node/session/<session-id>' --header 'X-REGISTRATION-SECRET;'
167136
```
@@ -170,52 +139,41 @@ cURL --request DELETE 'http://<node-URL>/se/grid/node/session/<session-id>' --he
170139

171140
### 清除新会话队列
172141

173-
新会话请求队列保存新会话请求.
174-
要清除队列,
175-
请使用下面列出的cURL命令.
176-
清除队列将拒绝队列中的所有请求.
177-
对于每个这样的请求,
178-
服务器都会向相应的客户端返回一个错误响应.
179-
清除命令的返回结果是
180-
已删除请求的总数.
142+
新会话请求队列保存新会话请求。要清除队列,请使用下面列出的 cURL 命令。清除队列会拒绝队列中的所有请求。对于每个此类请求,服务器都会向相应的客户端返回错误响应。清除命令的结果是被删除请求的总数。
181143

182-
在独立模式下, 队列URL是独立服务器的地址.
183-
在集线器节点模式下, 队列URL是集线器服务器的地址.
144+
在 Standalone 模式下, 队列URL是独立服务器的地址
145+
在 Hub-Node 模式下, 队列URL是集线器服务器的地址
184146

185147
```shell
186148
cURL --request DELETE 'http://localhost:4444/se/grid/newsessionqueue/queue' --header 'X-REGISTRATION-SECRET: <secret>'
187149
```
188150

189151
在完全分布式模式下,
190-
队列URL是新会话队列服务器的地址.
152+
队列URL是新会话队列服务器的地址
191153
```shell
192154
cURL --request DELETE 'http://localhost:4444/se/grid/newsessionqueue/queue' --header 'X-REGISTRATION-SECRET: <secret>'
193155
```
194156

195-
如果在设置Grid时未配置注册密码,
196-
则使用
157+
如果在设置Grid时未配置注册密码, 则使用
197158
```shell
198159
cURL --request DELETE 'http://<Router-URL>/se/grid/newsessionqueue/queue' --header 'X-REGISTRATION-SECRET;'
199160
```
200161

201162
### 获取新会话队列请求
202163

203-
New Session Request Queue holds the new session requests.
204-
To get the current requests in the queue, use the cURL command enlisted below.
205-
The response returns the total number of requests in the queue and the request payloads.
206-
新会话请求队列保存新会话请求.
164+
新会话请求队列保存新会话请求。
207165
要获取队列中的当前请求,
208-
请使用下面列出的cURL命令.
209-
响应会返回队列中的请求总数以及请求内容.
166+
请使用下面列出的cURL命令
167+
响应会返回队列中的请求总数以及请求内容
210168

211-
在独立模式下, 队列URL是独立服务器的地址.
212-
在集线器节点模式下, 队列URL是集线器服务器的地址.
169+
在 Standalone 模式下, 队列URL是独立服务器的地址
170+
在 Hub-Node 模式下, 队列URL是集线器服务器的地址
213171

214172
```shell
215173
cURL --request GET 'http://localhost:4444/se/grid/newsessionqueue/queue'
216174
```
217175

218176
在完全分布式模式下,
219-
队列URL是新会话队列服务器的地址.
177+
队列URL是新会话队列服务器的地址
220178
```shell
221179
cURL --request GET 'http://localhost:4444/se/grid/newsessionqueue/queue'

website_and_docs/content/documentation/webdriver/browsers/firefox.en.md

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,16 @@ options.profile = FirefoxProfile()
135135
driver = FirefoxDriver(options)
136136
{{< /tab >}}
137137
{{< /tabpane >}}
138-
138+
**Note**: Whether you create an empty `FirefoxProfile` or point it to the directory of your own profile, Selenium
139+
will create a temporary directory to store either the data of the new profile or a copy of your existing one. Every
140+
time you run your program, a different temporary directory will be created. These directories are not cleaned up
141+
explicitly by Selenium, they should eventually get removed by the operating system. However, if you want to remove
142+
the copy manually (e.g. if your profile is large in size), the path of the copy is exposed by the `FirefoxProfile`
143+
object. Check the language specific implementation to see how to retrieve that location.
144+
145+
If you want to use an existing Firefox profile, you can pass in the path to that profile. Please refer to the official
146+
[Firefox documentation](https://support.mozilla.org/en-US/kb/profiles-where-firefox-stores-user-data#w_how-do-i-find-my-profile)
147+
for instructions on how to find the directory of your profile.
139148

140149
## Service
141150

website_and_docs/content/documentation/webdriver/browsers/firefox.ja.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,16 @@ driver = RemoteWebDriver(options)
141141
{{< /tabpane >}}
142142
</div>
143143

144+
**Note**: Whether you create an empty `FirefoxProfile` or point it to the directory of your own profile, Selenium
145+
will create a temporary directory to store either the data of the new profile or a copy of your existing one. Every
146+
time you run your program, a different temporary directory will be created. These directories are not cleaned up
147+
explicitly by Selenium, they should eventually get removed by the operating system. However, if you want to remove
148+
the copy manually (e.g. if your profile is large in size), the path of the copy is exposed by the `FirefoxProfile`
149+
object. Check the language specific implementation to see how to retrieve that location.
150+
151+
If you want to use an existing Firefox profile, you can pass in the path to that profile. Please refer to the official
152+
[Firefox documentation](https://support.mozilla.org/en-US/kb/profiles-where-firefox-stores-user-data#w_how-do-i-find-my-profile)
153+
for instructions on how to find the directory of your profile.
144154

145155
## サービス
146156

website_and_docs/content/documentation/webdriver/browsers/firefox.pt-br.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,16 @@ driver = RemoteWebDriver(options)
140140
{{< /tabpane >}}
141141
</div>
142142

143+
**Note**: Whether you create an empty `FirefoxProfile` or point it to the directory of your own profile, Selenium
144+
will create a temporary directory to store either the data of the new profile or a copy of your existing one. Every
145+
time you run your program, a different temporary directory will be created. These directories are not cleaned up
146+
explicitly by Selenium, they should eventually get removed by the operating system. However, if you want to remove
147+
the copy manually (e.g. if your profile is large in size), the path of the copy is exposed by the `FirefoxProfile`
148+
object. Check the language specific implementation to see how to retrieve that location.
149+
150+
If you want to use an existing Firefox profile, you can pass in the path to that profile. Please refer to the official
151+
[Firefox documentation](https://support.mozilla.org/en-US/kb/profiles-where-firefox-stores-user-data#w_how-do-i-find-my-profile)
152+
for instructions on how to find the directory of your profile.
143153

144154
## Service
145155

website_and_docs/content/documentation/webdriver/browsers/firefox.zh-cn.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,16 @@ driver = RemoteWebDriver(options)
139139
{{< /tabpane >}}
140140
</div>
141141

142+
**Note**: Whether you create an empty `FirefoxProfile` or point it to the directory of your own profile, Selenium
143+
will create a temporary directory to store either the data of the new profile or a copy of your existing one. Every
144+
time you run your program, a different temporary directory will be created. These directories are not cleaned up
145+
explicitly by Selenium, they should eventually get removed by the operating system. However, if you want to remove
146+
the copy manually (e.g. if your profile is large in size), the path of the copy is exposed by the `FirefoxProfile`
147+
object. Check the language specific implementation to see how to retrieve that location.
148+
149+
If you want to use an existing Firefox profile, you can pass in the path to that profile. Please refer to the official
150+
[Firefox documentation](https://support.mozilla.org/en-US/kb/profiles-where-firefox-stores-user-data#w_how-do-i-find-my-profile)
151+
for instructions on how to find the directory of your profile.
142152

143153
## Service
144154

website_and_docs/content/sponsor/_index.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,8 @@ <h2 class="alert-heading pb-3">General Benefits</h2>
5252
</li>
5353
<li>
5454
Our website is the first place people learn about Selenium. By having a link to your
55-
website, you will be seen as a supporter of the Selenium project that our users adore. </li>
55+
website, you will be seen as a supporter of the Selenium project that our users adore.
56+
</li>
5657
<li>
5758
Contributions are tax-deductible.
5859
</li>
@@ -64,7 +65,6 @@ <h2 class="alert-heading pb-3">General Benefits</h2>
6465
Check the <a href="#support-levels">Sponsorship Levels</a> for more benefits.
6566
</li>
6667
</ul>
67-
</p>
6868
</div>
6969
</div>
7070
</div>
@@ -115,7 +115,7 @@ <h2 class="alert-heading pb-3" id="support-levels">Sponsorship Levels</h2>
115115
needs to be actively contributing to the project.
116116
</li>
117117
<li>
118-
Currently limited to 2 companies but reviewed yearly.
118+
Currently limited to 3 companies but reviewed yearly.
119119
</li>
120120
<li>Special mention at Selenium events</li>
121121
<li>

website_and_docs/data/sponsors.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ development:
99
- logo: "/images/sponsors/saucelabs.png"
1010
url: "https://saucelabs.com/resources/topic-hub/selenium?utm_source=selenium&utm_medium=website&utm_campaign=selenium-sponsorship-fy25"
1111
name: "Sauce Labs"
12+
# Sponsorship renewed October 16, 2024. Renewed again on April 8, 2025, under the "Development" level
13+
- logo: "/images/sponsors/lambda-test.png"
14+
url: "https://www.lambdatest.com/selenium-automation?utm_source=selenium&utm_medium=open-source-sponsor&utm_campaign=nov_14&utm_term=sk&utm_content=web"
15+
name: "LambdaTest"
1216

1317
selenium:
1418
# Set to false if no items are present
@@ -22,10 +26,6 @@ selenium:
2226
- logo: "/images/sponsors/applitools.png"
2327
url: "https://applitools.com/"
2428
name: "Applitools"
25-
# Sponsorship renewed October 16, 2024.
26-
- logo: "/images/sponsors/lambda-test.png"
27-
url: "https://www.lambdatest.com/selenium-automation?utm_source=selenium&utm_medium=open-source-sponsor&utm_campaign=nov_14&utm_term=sk&utm_content=web"
28-
name: "LambdaTest"
2929
# Sponsorship start date: June 24, 2015, updated July 2023 (only logo, not the agreement)
3030
# - logo: "/images/sponsors/Digital.ai.jpg"
3131
# url: "http://bit.ly/36uZ7ad"

website_and_docs/hugo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,8 +164,8 @@ plausible_analytics = true
164164
prism_syntax_highlighting = true
165165

166166
# Enable announcement banner below navbar (Go to announcement-banner.html to change the message)
167-
banner_flag = false
168-
announcement_banner = false
167+
banner_flag = true
168+
announcement_banner = true
169169

170170
# Enable Algolia DocSearch
171171
[params.search.algolia]

website_and_docs/layouts/partials/announcement-banner.html

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
<section id="announcement-banner" class="alert-static g-0 row -bg-{{ $color }}">
55
<div class="container g-0" style="padding: 10px;">
66
<div class="row g-0 justify-content-center">
7-
<div class="alert alert-{{ $color }} col-12 fade show mb-0 p-0 -bg-{{ $color }}" role="alert">
8-
<h4 class="alert-heading text-center m-2">
9-
Registrations Open for SeleniumConf 2025 | March 26–28 | Join Us In-Person!
10-
<a href="https://seleniumconf.com/?utm_medium=Referral&utm_source=selenium.dev&utm_campaign=register" target='_blank' aria-pressed="true"> Register now!</a>
11-
</h4>
12-
</div>
7+
<div class="alert alert-{{ $color }} col-12 fade show mb-0 p-0 -bg-{{ $color }}" role="alert">
8+
<h4 class="alert-heading text-center m-2">
9+
Tune in for the Selenium Community Live scheduled for April 25th, 2025.
10+
<a href="https://www.linkedin.com/events/seleniumcommunitylive-episode57315712465407733761/theater/" target='_blank' aria-pressed="true">Join us!</a>
11+
</h4>
12+
</div>
1313
</div>
1414
</div>
1515
</section>

0 commit comments

Comments
 (0)