Skip to content

Commit 61218d3

Browse files
authored
chore(test): tidy up html equal (#8599)
1 parent d35d904 commit 61218d3

File tree

13 files changed

+199
-291
lines changed

13 files changed

+199
-291
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@
155155
"tslib": "^2.5.0",
156156
"typescript": "^5.0.4",
157157
"util": "^0.12.5",
158-
"vitest": "^0.31.0"
158+
"vitest": "^0.31.1"
159159
},
160160
"packageManager": "[email protected]"
161161
}

pnpm-lock.yaml

Lines changed: 34 additions & 34 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

test/css/css.test.js

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -24,23 +24,24 @@ describe('css', () => {
2424
const it_fn = solo ? it.only : skip ? it.skip : it;
2525

2626
it_fn(dir, async () => {
27-
const config = await try_load_config(`${__dirname}/samples/${dir}/_config.js`);
27+
const cwd = `${__dirname}/samples/${dir}`;
28+
const config = await try_load_config(`${cwd}/_config.js`);
2829

2930
const input = fs
30-
.readFileSync(`${__dirname}/samples/${dir}/input.svelte`, 'utf-8')
31+
.readFileSync(`${cwd}/input.svelte`, 'utf-8')
3132
.replace(/\s+$/, '')
3233
.replace(/\r/g, '');
3334

3435
const expected_warnings = (config.warnings || []).map(normalize_warning);
3536

3637
const dom = svelte.compile(
3738
input,
38-
Object.assign(config.compileOptions || {}, { format: 'cjs' })
39+
Object.assign({}, config.compileOptions || {}, { format: 'cjs' })
3940
);
4041

4142
const ssr = svelte.compile(
4243
input,
43-
Object.assign(config.compileOptions || {}, { format: 'cjs', generate: 'ssr' })
44+
Object.assign({}, config.compileOptions || {}, { format: 'cjs', generate: 'ssr' })
4445
);
4546

4647
assert.equal(dom.css.code, ssr.css.code);
@@ -51,26 +52,24 @@ describe('css', () => {
5152
assert.deepEqual(dom_warnings, ssr_warnings);
5253
assert.deepEqual(dom_warnings.map(normalize_warning), expected_warnings);
5354

54-
fs.writeFileSync(`${__dirname}/samples/${dir}/_actual.css`, dom.css.code);
55+
fs.writeFileSync(`${cwd}/_actual.css`, dom.css.code);
5556
const expected = {
56-
html: read(`${__dirname}/samples/${dir}/expected.html`),
57-
css: read(`${__dirname}/samples/${dir}/expected.css`)
57+
html: read(`${cwd}/expected.html`),
58+
css: read(`${cwd}/expected.css`)
5859
};
5960

6061
const actual_css = replace_css_hash(dom.css.code);
6162
try {
6263
assert.equal(actual_css, expected.css);
6364
} catch (error) {
6465
if (should_update_expected()) {
65-
fs.writeFileSync(`${__dirname}/samples/${dir}/expected.css`, actual_css);
66+
fs.writeFileSync(`${cwd}/expected.css`, actual_css);
6667
console.log(`Updated ${dir}/expected.css.`);
6768
} else {
6869
throw error;
6970
}
7071
}
7172

72-
const cwd = `${__dirname}/samples/${dir}`;
73-
7473
let ClientComponent;
7574
let ServerComponent;
7675

@@ -102,7 +101,7 @@ describe('css', () => {
102101
new ClientComponent({ target, props: config.props });
103102
const html = target.innerHTML;
104103

105-
fs.writeFileSync(`${__dirname}/samples/${dir}/_actual.html`, html);
104+
fs.writeFileSync(`${cwd}/_actual.html`, html);
106105

107106
const actual_html = replace_css_hash(html);
108107
assert_html_equal(actual_html, expected.html);

0 commit comments

Comments
 (0)