Skip to content

Commit c0c498a

Browse files
committed
Merge branch 'livekit' into toger5/track-processor-blur
2 parents 9f5eae0 + f92c683 commit c0c498a

File tree

4 files changed

+25
-20
lines changed

4 files changed

+25
-20
lines changed

docs/self-hosting.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ the example above, this results in:
9393

9494
Using Nginx, you can achieve this by:
9595

96-
```jsonc
96+
```nginx configuration file
9797
server {
9898
...
9999
location ^~ /livekit/jwt/ {
@@ -203,7 +203,7 @@ Because Element Call uses client-side routing, your server must be able to route
203203
any requests to non-existing paths back to `/index.html`. For example, in Nginx
204204
you can achieve this with the `try_files` directive:
205205

206-
```jsonc
206+
```nginx configuration file
207207
server {
208208
...
209209
location / {

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
"@opentelemetry/sdk-trace-base": "^1.25.1",
5050
"@opentelemetry/sdk-trace-web": "^1.9.1",
5151
"@opentelemetry/semantic-conventions": "^1.25.1",
52-
"@playwright/test": "^1.51.0",
52+
"@playwright/test": "^1.52.0",
5353
"@radix-ui/react-dialog": "^1.0.4",
5454
"@radix-ui/react-slider": "^1.1.2",
5555
"@radix-ui/react-visually-hidden": "^1.0.3",

playwright/fixtures/widget-user.ts

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,8 +154,13 @@ export const widgetTest = test.extend<MyFixtures>({
154154
ewPage1.getByRole("heading", { name: "Invite to Welcome Room" }),
155155
).toBeVisible();
156156

157-
await ewPage1.getByRole("textbox").fill(whistlerMxId);
158-
await ewPage1.getByRole("textbox").click();
157+
// To get the invite textbox we need to specifically select within the
158+
// dialog, since there is another textbox in the background (the message
159+
// composer). In theory the composer shouldn't be visible to Playwright at
160+
// all because the invite dialog has trapped focus, but the focus trap
161+
// doesn't quite work right on Firefox.
162+
await ewPage1.getByRole("dialog").getByRole("textbox").fill(whistlerMxId);
163+
await ewPage1.getByRole("dialog").getByRole("textbox").click();
159164
await ewPage1.getByRole("button", { name: "Invite" }).click();
160165

161166
// Accept the invite

yarn.lock

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3063,14 +3063,14 @@ __metadata:
30633063
languageName: node
30643064
linkType: hard
30653065

3066-
"@playwright/test@npm:^1.51.0":
3067-
version: 1.51.0
3068-
resolution: "@playwright/test@npm:1.51.0"
3066+
"@playwright/test@npm:^1.52.0":
3067+
version: 1.52.0
3068+
resolution: "@playwright/test@npm:1.52.0"
30693069
dependencies:
3070-
playwright: "npm:1.51.0"
3070+
playwright: "npm:1.52.0"
30713071
bin:
30723072
playwright: cli.js
3073-
checksum: 10c0/ae83dd2c3a32133de58f44a9dbcd73a8059155ebd8acc736ba8bd0a7ca99b194afe2e8f5a500861d18b1c8f06b4e4ea8de4a2402297c59053d4becc404b47e0a
3073+
checksum: 10c0/1c428b421593eb4f79b7c99783a389c3ab3526c9051ec772749f4fca61414dfa9f2344eba846faac5f238084aa96c836364a91d81d3034ac54924f239a93e247
30743074
languageName: node
30753075
linkType: hard
30763076

@@ -6940,7 +6940,7 @@ __metadata:
69406940
"@opentelemetry/sdk-trace-base": "npm:^1.25.1"
69416941
"@opentelemetry/sdk-trace-web": "npm:^1.9.1"
69426942
"@opentelemetry/semantic-conventions": "npm:^1.25.1"
6943-
"@playwright/test": "npm:^1.51.0"
6943+
"@playwright/test": "npm:^1.52.0"
69446944
"@radix-ui/react-dialog": "npm:^1.0.4"
69456945
"@radix-ui/react-slider": "npm:^1.1.2"
69466946
"@radix-ui/react-visually-hidden": "npm:^1.0.3"
@@ -10375,27 +10375,27 @@ __metadata:
1037510375
languageName: node
1037610376
linkType: hard
1037710377

10378-
"playwright-core@npm:1.51.0":
10379-
version: 1.51.0
10380-
resolution: "playwright-core@npm:1.51.0"
10378+
"playwright-core@npm:1.52.0":
10379+
version: 1.52.0
10380+
resolution: "playwright-core@npm:1.52.0"
1038110381
bin:
1038210382
playwright-core: cli.js
10383-
checksum: 10c0/8f5de23088c5e97c00327f356b17e0223181e921baf99f4e38d9a3b18d0693db288f8b5389e96d0cb4a1b55f03870f140dd7346128a0c02ce36d11eb92153841
10383+
checksum: 10c0/640945507e6ca2144e9f596b2a6ecac042c2fd3683ff99e6271e9a7b38f3602d415f282609d569456f66680aab8b3c5bb1b257d8fb63a7fc0ed648261110421f
1038410384
languageName: node
1038510385
linkType: hard
1038610386

10387-
"playwright@npm:1.51.0":
10388-
version: 1.51.0
10389-
resolution: "playwright@npm:1.51.0"
10387+
"playwright@npm:1.52.0":
10388+
version: 1.52.0
10389+
resolution: "playwright@npm:1.52.0"
1039010390
dependencies:
1039110391
fsevents: "npm:2.3.2"
10392-
playwright-core: "npm:1.51.0"
10392+
playwright-core: "npm:1.52.0"
1039310393
dependenciesMeta:
1039410394
fsevents:
1039510395
optional: true
1039610396
bin:
1039710397
playwright: cli.js
10398-
checksum: 10c0/e8509ea500e03e8051fd243f2347ac3196ff8dde4c20ae3aba4cf723e2b647a0158d209fba062995dab90590229a483d723562cf1ea8b2fc11698617027416fd
10398+
checksum: 10c0/2c6edf1e15e59bbaf77f3fa0fe0ac975793c17cff835d9c8b8bc6395a3b6f1c01898b3058ab37891b2e4d424bcc8f1b4844fe70d943e0143d239d7451408c579
1039910399
languageName: node
1040010400
linkType: hard
1040110401

0 commit comments

Comments
 (0)