Skip to content

Commit 89061f1

Browse files
madsrasmussenmadsrasmussen
authored
V15: Chore: Fix msw in client test runner (#17777)
* remove unused * Update index.ts * add local files * use fetch instead of import
1 parent 2f8866a commit 89061f1

File tree

8 files changed

+119
-20
lines changed

8 files changed

+119
-20
lines changed

‎src/Umbraco.Web.UI.Client/src/mocks/browser-handlers.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { handlers as backofficeHandlers } from './handlers/backoffice.handlers.js';
1+
import { handlers as backofficeHandlers } from './handlers/backoffice/backoffice.handlers.js';
22
import { handlers as configHandlers } from './handlers/config.handlers.js';
33
import { handlers as cultureHandlers } from './handlers/culture.handlers.js';
44
import { handlers as dataTypeHandlers } from './handlers/data-type/index.js';

‎src/Umbraco.Web.UI.Client/src/mocks/handlers/backoffice/assets/login.jpg

286 KB
Loading

‎src/Umbraco.Web.UI.Client/src/mocks/handlers/backoffice/assets/logo.svg

Lines changed: 1 addition & 0 deletions
Loading

‎src/Umbraco.Web.UI.Client/src/mocks/handlers/backoffice/assets/logo_dark.svg

Lines changed: 51 additions & 0 deletions
Loading

‎src/Umbraco.Web.UI.Client/src/mocks/handlers/backoffice/assets/logo_light.svg

Lines changed: 51 additions & 0 deletions
Loading

‎src/Umbraco.Web.UI.Client/src/mocks/handlers/backoffice.handlers.ts renamed to ‎src/Umbraco.Web.UI.Client/src/mocks/handlers/backoffice/backoffice.handlers.ts

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,46 @@
11
const { rest } = window.MockServiceWorker;
22
import { umbracoPath } from '@umbraco-cms/backoffice/utils';
33

4-
import logoUrl from '../../../../Umbraco.Cms.StaticAssets/wwwroot/umbraco/assets/logo.svg';
5-
import loginLogoUrl from '../../../../Umbraco.Cms.StaticAssets/wwwroot/umbraco/assets/logo_light.svg';
6-
import loginLogoAlternativeUrl from '../../../../Umbraco.Cms.StaticAssets/wwwroot/umbraco/assets/logo_dark.svg';
7-
import loginBackgroundUrl from '../../../../Umbraco.Cms.StaticAssets/wwwroot/umbraco/assets/login.jpg';
4+
const logoUrl = './src/mocks/handlers/backoffice/assets/logo.svg';
5+
const loginLogoUrl = './src/mocks/handlers/backoffice/assets/logo_light.svg';
6+
const loginLogoAlternativeUrl = './src/mocks/handlers/backoffice/assets/logo_dark.svg';
7+
const loginBackgroundUrl = './src/mocks/handlers/backoffice/assets/login.jpg';
88

99
export const handlers = [
1010
rest.get(umbracoPath('/security/back-office/graphics/logo'), async (req, res, ctx) => {
11-
const imageBuffer = await fetch(logoUrl)
12-
.then((res) => res.arrayBuffer());
11+
const imageBuffer = await fetch(logoUrl).then((res) => res.arrayBuffer());
1312

1413
return res(
1514
ctx.set('Content-Length', imageBuffer.byteLength.toString()),
1615
ctx.set('Content-Type', 'image/svg+xml'),
17-
ctx.body(imageBuffer)
16+
ctx.body(imageBuffer),
1817
);
1918
}),
2019
rest.get(umbracoPath('/security/back-office/graphics/login-logo'), async (req, res, ctx) => {
21-
const imageBuffer = await fetch(loginLogoUrl)
22-
.then((res) => res.arrayBuffer());
20+
const imageBuffer = await fetch(loginLogoUrl).then((res) => res.arrayBuffer());
2321

2422
return res(
2523
ctx.set('Content-Length', imageBuffer.byteLength.toString()),
2624
ctx.set('Content-Type', 'image/svg+xml'),
27-
ctx.body(imageBuffer)
25+
ctx.body(imageBuffer),
2826
);
2927
}),
3028
rest.get(umbracoPath('/security/back-office/graphics/login-logo-alternative'), async (req, res, ctx) => {
31-
const imageBuffer = await fetch(loginLogoAlternativeUrl)
32-
.then((res) => res.arrayBuffer());
29+
const imageBuffer = await fetch(loginLogoAlternativeUrl).then((res) => res.arrayBuffer());
3330

3431
return res(
3532
ctx.set('Content-Length', imageBuffer.byteLength.toString()),
3633
ctx.set('Content-Type', 'image/svg+xml'),
37-
ctx.body(imageBuffer)
34+
ctx.body(imageBuffer),
3835
);
3936
}),
4037
rest.get(umbracoPath('/security/back-office/graphics/login-background'), async (req, res, ctx) => {
41-
const imageBuffer = await fetch(loginBackgroundUrl)
42-
.then((res) => res.arrayBuffer());
38+
const imageBuffer = await fetch(loginBackgroundUrl).then((res) => res.arrayBuffer());
4339

4440
return res(
4541
ctx.set('Content-Length', imageBuffer.byteLength.toString()),
4642
ctx.set('Content-Type', 'image/jpeg'),
47-
ctx.body(imageBuffer)
43+
ctx.body(imageBuffer),
4844
);
4945
}),
5046
];

‎src/Umbraco.Web.UI.Client/utils/all-umb-consts/index.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ export const foundConsts = [{
9696
},
9797
{
9898
path: '@umbraco-cms/backoffice/content',
99-
consts: ["UMB_CONTENT_COLLECTION_WORKSPACE_CONTEXT","UMB_CONTENT_HAS_PROPERTIES_WORKSPACE_CONDITION","UMB_CONTENT_SECTION_ALIAS","UMB_CONTENT_PROPERTY_CONTEXT","UMB_CONTENT_WORKSPACE_CONTEXT"]
99+
consts: ["UMB_CONTENT_COLLECTION_WORKSPACE_CONTEXT","UMB_CONTENT_HAS_PROPERTIES_WORKSPACE_CONDITION","UMB_CONTENT_SECTION_ALIAS","UMB_CONTENT_PROPERTY_CONTEXT","UMB_CONTENT_PROPERTY_DATASET_CONTEXT","UMB_CONTENT_WORKSPACE_CONTEXT"]
100100
},
101101
{
102102
path: '@umbraco-cms/backoffice/culture',
@@ -216,7 +216,7 @@ export const foundConsts = [{
216216
},
217217
{
218218
path: '@umbraco-cms/backoffice/member',
219-
consts: ["UMB_MEMBER_COLLECTION_ALIAS","UMB_MEMBER_COLLECTION_CONTEXT","UMB_MEMBER_COLLECTION_REPOSITORY_ALIAS","UMB_MEMBER_TABLE_COLLECTION_VIEW_ALIAS","UMB_MEMBER_PICKER_MODAL","UMB_MEMBER_CREATE_OPTIONS_MODAL","UMB_MEMBER_ENTITY_TYPE","UMB_MEMBER_ROOT_ENTITY_TYPE","UMB_MEMBER_WORKSPACE_PATH","UMB_MEMBER_ROOT_WORKSPACE_PATH","UMB_CREATE_MEMBER_WORKSPACE_PATH_PATTERN","UMB_MEMBER_VARIANT_CONTEXT","UMB_MEMBER_DETAIL_REPOSITORY_ALIAS","UMB_MEMBER_DETAIL_STORE_ALIAS","UMB_MEMBER_DETAIL_STORE_CONTEXT","UMB_MEMBER_ITEM_REPOSITORY_ALIAS","UMB_MEMBER_STORE_ALIAS","UMB_MEMBER_ITEM_STORE_CONTEXT","UMB_MEMBER_SEARCH_PROVIDER_ALIAS","UMB_MEMBER_DETAIL_MODEL_VARIANT_SCAFFOLD","UMB_MEMBER_WORKSPACE_ALIAS","UMB_MEMBER_WORKSPACE_CONTEXT","UMB_MEMBER_ROOT_WORKSPACE_ALIAS"]
219+
consts: ["UMB_MEMBER_COLLECTION_ALIAS","UMB_MEMBER_COLLECTION_CONTEXT","UMB_MEMBER_COLLECTION_REPOSITORY_ALIAS","UMB_MEMBER_TABLE_COLLECTION_VIEW_ALIAS","UMB_MEMBER_PICKER_MODAL","UMB_MEMBER_CREATE_OPTIONS_MODAL","UMB_MEMBER_ENTITY_TYPE","UMB_MEMBER_ROOT_ENTITY_TYPE","UMB_MEMBER_WORKSPACE_PATH","UMB_MEMBER_ROOT_WORKSPACE_PATH","UMB_CREATE_MEMBER_WORKSPACE_PATH_PATTERN","UMB_MEMBER_VARIANT_CONTEXT","UMB_MEMBER_DETAIL_REPOSITORY_ALIAS","UMB_MEMBER_DETAIL_STORE_ALIAS","UMB_MEMBER_DETAIL_STORE_CONTEXT","UMB_MEMBER_ITEM_REPOSITORY_ALIAS","UMB_MEMBER_STORE_ALIAS","UMB_MEMBER_ITEM_STORE_CONTEXT","UMB_MEMBER_VALIDATION_REPOSITORY_ALIAS","UMB_MEMBER_SEARCH_PROVIDER_ALIAS","UMB_MEMBER_DETAIL_MODEL_VARIANT_SCAFFOLD","UMB_MEMBER_WORKSPACE_ALIAS","UMB_MEMBER_WORKSPACE_CONTEXT","UMB_MEMBER_ROOT_WORKSPACE_ALIAS"]
220220
},
221221
{
222222
path: '@umbraco-cms/backoffice/menu',

‎src/Umbraco.Web.UI.Client/web-test-runner.index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { handlers } from './src/mocks/browser-handlers.js';
22
import { onUnhandledRequest } from './src/mocks/index.js';
33

4-
const { setupWorker, rest } = window.MockServiceWorker;
4+
const { setupWorker } = window.MockServiceWorker;
55

66
const worker = setupWorker(...handlers);
77

0 commit comments

Comments
 (0)