Skip to content

Commit 5304f4e

Browse files
wjhsfwjhsf
authored
test(engine-server): clean up fixture tests (#5219)
* test(engine-server): remove `feature` feature it's unused * chore: remove feature from types * chore(tests): remove unused exports from tests * chore: rename x/test modules to x/static * chore: use static x-test for root fixture component tag name (x-test) may not match directory name of root component * chore: remove tag name that is no longer used * refactor(test): destructure! * chore: `fixture-test` feels better than `x-test` to make it more clear it's special
1 parent 66b4373 commit 5304f4e

File tree

677 files changed

+660
-1372
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

677 files changed

+660
-1372
lines changed

‎packages/@lwc/engine-server/src/__tests__/fixtures.spec.ts‎

Lines changed: 3 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,12 @@ import { rollup } from 'rollup';
1111
import lwcRollupPlugin from '@lwc/rollup-plugin';
1212
import { testFixtureDir, formatHTML } from '@lwc/test-utils-lwc-internals';
1313
import { setFeatureFlagForTest } from '../index';
14-
import type { FeatureFlagName } from '@lwc/features/dist/types';
1514
import type { RollupLwcOptions } from '@lwc/rollup-plugin';
1615
import type * as lwc from '../index';
1716

1817
interface FixtureModule {
19-
tagName: string;
2018
default: typeof lwc.LightningElement;
21-
props?: { [key: string]: any };
22-
features?: any[];
19+
props?: { [key: string]: unknown };
2320
}
2421

2522
vi.mock('lwc', async () => {
@@ -130,20 +127,10 @@ function testFixtures(options?: RollupLwcOptions) {
130127

131128
let result;
132129
let err;
133-
let features: FeatureFlagName[] = [];
134130
try {
135-
const module = (await import(compiledFixturePath)) as FixtureModule;
136-
137-
features = module!.features ?? [];
138-
features.forEach((flag) => {
139-
lwcEngineServer!.setFeatureFlagForTest(flag, true);
140-
});
131+
const { default: module } = (await import(compiledFixturePath)) as FixtureModule;
141132
result = formatHTML(
142-
lwcEngineServer!.renderComponent(
143-
module!.tagName,
144-
module!.default,
145-
config?.props ?? {}
146-
)
133+
lwcEngineServer!.renderComponent('fixture-test', module, config?.props ?? {})
147134
);
148135
} catch (_err: any) {
149136
if (_err?.name === 'AssertionError') {
@@ -152,10 +139,6 @@ function testFixtures(options?: RollupLwcOptions) {
152139
err = _err?.message || 'An empty error occurred?!';
153140
}
154141

155-
features.forEach((flag) => {
156-
lwcEngineServer!.setFeatureFlagForTest(flag, false);
157-
});
158-
159142
return {
160143
'expected.html': result,
161144
'error.txt': err,

‎packages/@lwc/engine-server/src/__tests__/fixtures/adjacent-text-nodes/preserve-comments-off/comments-at-end/expected.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
<x-comments-text>
1+
<fixture-test>
22
<template shadowrootmode="open">
33
<span>
44
‍
55
</span>
66
</template>
7-
</x-comments-text>
7+
</fixture-test>

‎packages/@lwc/engine-server/src/__tests__/fixtures/adjacent-text-nodes/preserve-comments-off/comments-at-end/index.js‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
1-
export const tagName = 'x-comments-text';
21
export { default } from 'x/comments-text';
3-
export * from 'x/comments-text';

‎packages/@lwc/engine-server/src/__tests__/fixtures/adjacent-text-nodes/preserve-comments-off/comments-then-element/expected.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
<x-comments-text>
1+
<fixture-test>
22
<template shadowrootmode="open">
33
<span>
44
‍
55
<div>
66
</div>
77
</span>
88
</template>
9-
</x-comments-text>
9+
</fixture-test>

‎packages/@lwc/engine-server/src/__tests__/fixtures/adjacent-text-nodes/preserve-comments-off/comments-then-element/index.js‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
1-
export const tagName = 'x-comments-text';
21
export { default } from 'x/comments-text';
3-
export * from 'x/comments-text';

‎packages/@lwc/engine-server/src/__tests__/fixtures/adjacent-text-nodes/preserve-comments-off/deep-for-each-with-rendered-item/expected.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
<x-comments-text>
1+
<fixture-test>
22
<template shadowrootmode="open">
33
ab
44
<div data-foo="1">
55
c
66
</div>
77
de
88
</template>
9-
</x-comments-text>
9+
</fixture-test>

‎packages/@lwc/engine-server/src/__tests__/fixtures/adjacent-text-nodes/preserve-comments-off/deep-for-each-with-rendered-item/index.js‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
1-
export const tagName = 'x-comments-text';
21
export { default } from 'x/comments-text';
3-
export * from 'x/comments-text';

‎packages/@lwc/engine-server/src/__tests__/fixtures/adjacent-text-nodes/preserve-comments-off/deep-for-each/expected.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
<x-comments-text>
1+
<fixture-test>
22
<template shadowrootmode="open">
33
ab
44
<div>
55
c
66
</div>
77
de
88
</template>
9-
</x-comments-text>
9+
</fixture-test>

‎packages/@lwc/engine-server/src/__tests__/fixtures/adjacent-text-nodes/preserve-comments-off/deep-for-each/index.js‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
1-
export const tagName = 'x-comments-text';
21
export { default } from 'x/comments-text';
3-
export * from 'x/comments-text';

‎packages/@lwc/engine-server/src/__tests__/fixtures/adjacent-text-nodes/preserve-comments-off/deep-iterator/expected.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
<x-comments-text>
1+
<fixture-test>
22
<template shadowrootmode="open">
33
ab
44
<div>
55
c
66
</div>
77
de
88
</template>
9-
</x-comments-text>
9+
</fixture-test>

0 commit comments

Comments
 (0)