parent
b2fb036f62
commit
1368dc0564
|
@ -128,12 +128,13 @@ export const test = base.extend<Fixtures>({
|
||||||
await context.route(`http://localhost:8080/config.json*`, async (route) => {
|
await context.route(`http://localhost:8080/config.json*`, async (route) => {
|
||||||
const json = {
|
const json = {
|
||||||
...CONFIG_JSON,
|
...CONFIG_JSON,
|
||||||
|
...config,
|
||||||
default_server_config: {
|
default_server_config: {
|
||||||
|
...config.default_server_config,
|
||||||
"m.homeserver": {
|
"m.homeserver": {
|
||||||
base_url: homeserver.baseUrl,
|
base_url: homeserver.baseUrl,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
...config,
|
|
||||||
};
|
};
|
||||||
json["features"] = {
|
json["features"] = {
|
||||||
...json["features"],
|
...json["features"],
|
||||||
|
|
Loading…
Reference in New Issue