Skip to content

Commit 7039b03

Browse files
authored
fix(ssr): address scope token test failures (#5324)
* test(ssr): add test for imported template not used for rendering * fix(ssr-compiler): always attach default template Can't detect at compile time whether or not it will be used * test(ssr): add test for empty render method * chore(fixtures): rename empty-render to render-undefined * chore(fixtures): clean up test * test(ssr): add fixture for rendering with an invalid function * test(ssr): update scope token tests to expect correct results
1 parent 741cd63 commit 7039b03

File tree

7 files changed

+29
-7
lines changed

7 files changed

+29
-7
lines changed
Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
{
22
"entry": "x/component",
3-
"features": ["DISABLE_SCOPE_TOKEN_VALIDATION"]
3+
"features": ["DISABLE_SCOPE_TOKEN_VALIDATION"],
4+
"ssrFiles": {
5+
"expected": "expected-ssr.html"
6+
}
47
}
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<fixture-test class="lwc-6a8uqob2ku4-host" data-lwc-host-scope-token="lwc-6a8uqob2ku4-host">
2+
<style class="lwc-6a8uqob2ku4" id="lwc-style--0" type="text/css">
3+
p.lwc-6a8uqob2ku4 {font-size: 2em;}
4+
</style>
5+
<lwc-style style-id="lwc-style--0">
6+
</lwc-style>
7+
<p class="lwc-6a8uqob2ku4">
8+
je suis une pomme de terre
9+
</p>
10+
</fixture-test>

packages/@lwc/engine-server/src/__tests__/fixtures/scope-token/.skip

Lines changed: 0 additions & 3 deletions
This file was deleted.
Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
11
{
2-
"entry": "x/component"
2+
"entry": "x/component",
3+
"ssrFiles": {
4+
"error": "error-ssr.txt",
5+
"expected": "expected-ssr.html"
6+
}
37
}

packages/@lwc/engine-server/src/__tests__/fixtures/scope-token/error-ssr.txt

Whitespace-only changes.
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<fixture-test class="lwc-6a8uqob2ku4-host" data-lwc-host-scope-token="lwc-6a8uqob2ku4-host">
2+
<style class="lwc-6a8uqob2ku4" id="lwc-style--0" type="text/css">
3+
p.lwc-6a8uqob2ku4 {font-size: 2em;}
4+
</style>
5+
<lwc-style style-id="lwc-style--0">
6+
</lwc-style>
7+
<p class="lwc-6a8uqob2ku4">
8+
je suis une pomme de terre
9+
</p>
10+
</fixture-test>

packages/@lwc/ssr-compiler/src/__tests__/utils/expected-failures.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88
// We should slowly drive down these test failures or at least document where we expect the failures
99
// TODO [#4815]: enable all SSR v2 tests
1010
export const expectedFailures = new Set([
11-
'scope-token/config.json',
12-
'scope-token-extended/config.json',
1311
'render-undefined/config.json',
1412
'render-bad-value/config.json',
1513
]);

0 commit comments

Comments
 (0)