Skip to content

Commit 21168bf

Browse files
committed
remove v1 parser tests
1 parent 4fe8d95 commit 21168bf

File tree

249 files changed

+555
-3996
lines changed

Some content is hidden

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

249 files changed

+555
-3996
lines changed

test/parser/index.js

+27-40
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import assert from 'assert';
22
import fs from 'fs';
33
import { svelte, tryToLoadJson } from '../helpers.js';
44

5-
describe('parse', () => {
5+
describe.only('parse', () => {
66
fs.readdirSync('test/parser/samples').forEach(dir => {
77
if (dir[0] === '.') return;
88

@@ -18,48 +18,35 @@ describe('parse', () => {
1818
(solo ? it.only : it)(dir, () => {
1919
const options = tryToLoadJson(`test/parser/samples/${dir}/options.json`) || {};
2020

21-
function test(options, input, expectedOutput, expectedError, outputFile) {
21+
options.parser = 'v2'; // TODO remove
22+
23+
const input = fs.readFileSync(`test/parser/samples/${dir}/input.html`, 'utf-8').replace(/\s+$/, '');
24+
const expectedOutput = tryToLoadJson(`test/parser/samples/${dir}/output.json`);
25+
const expectedError = tryToLoadJson(`test/parser/samples/${dir}/error.json`);
26+
27+
try {
28+
const actual = svelte.parse(input, options);
29+
30+
fs.writeFileSync(`test/parser/samples/${dir}/_actual.json`, JSON.stringify(actual, null, '\t'));
31+
32+
assert.deepEqual(actual.html, expectedOutput.html);
33+
assert.deepEqual(actual.css, expectedOutput.css);
34+
assert.deepEqual(actual.js, expectedOutput.js);
35+
} catch (err) {
36+
if (err.name !== 'ParseError') throw err;
37+
if (!expectedError) throw err;
38+
2239
try {
23-
const actual = svelte.parse(input, options);
24-
25-
fs.writeFileSync(outputFile, JSON.stringify(actual, null, '\t'));
26-
27-
assert.deepEqual(actual.html, expectedOutput.html);
28-
assert.deepEqual(actual.css, expectedOutput.css);
29-
assert.deepEqual(actual.js, expectedOutput.js);
30-
} catch (err) {
31-
if (err.name !== 'ParseError') throw err;
32-
if (!expectedError) throw err;
33-
34-
try {
35-
assert.equal(err.code, expectedError.code);
36-
assert.equal(err.message, expectedError.message);
37-
assert.deepEqual(err.loc, expectedError.loc);
38-
assert.equal(err.pos, expectedError.pos);
39-
assert.equal(err.toString().split('\n')[0], `${expectedError.message} (${expectedError.loc.line}:${expectedError.loc.column})`);
40-
} catch (err2) {
41-
const e = err2.code === 'MODULE_NOT_FOUND' ? err : err2;
42-
throw e;
43-
}
40+
assert.equal(err.code, expectedError.code);
41+
assert.equal(err.message, expectedError.message);
42+
assert.deepEqual(err.loc, expectedError.loc);
43+
assert.equal(err.pos, expectedError.pos);
44+
assert.equal(err.toString().split('\n')[0], `${expectedError.message} (${expectedError.loc.line}:${expectedError.loc.column})`);
45+
} catch (err2) {
46+
const e = err2.code === 'MODULE_NOT_FOUND' ? err : err2;
47+
throw e;
4448
}
4549
}
46-
47-
// TODO remove v1 tests
48-
test(
49-
options,
50-
fs.readFileSync(`test/parser/samples/${dir}/input.html`, 'utf-8').replace(/\s+$/, ''),
51-
tryToLoadJson(`test/parser/samples/${dir}/output.json`),
52-
tryToLoadJson(`test/parser/samples/${dir}/error.json`),
53-
`test/parser/samples/${dir}/_actual.json`
54-
);
55-
56-
test(
57-
Object.assign({ parser: 'v2' }, options),
58-
fs.readFileSync(`test/parser/samples/${dir}/input-v2.html`, 'utf-8').replace(/\s+$/, ''),
59-
tryToLoadJson(`test/parser/samples/${dir}/output-v2.json`),
60-
tryToLoadJson(`test/parser/samples/${dir}/error-v2.json`),
61-
`test/parser/samples/${dir}/_actual-v2.json`
62-
);
6350
});
6451
});
6552

test/parser/samples/action-with-call/input-v2.html

-1
This file was deleted.

test/parser/samples/action-with-call/output-v2.json

-47
This file was deleted.

test/parser/samples/action-with-identifier/input-v2.html

-1
This file was deleted.

test/parser/samples/action-with-identifier/output-v2.json

-33
This file was deleted.

test/parser/samples/action-with-literal/input-v2.html

-1
This file was deleted.

test/parser/samples/action-with-literal/output-v2.json

-34
This file was deleted.

test/parser/samples/action/input-v2.html

-1
This file was deleted.

test/parser/samples/action/output-v2.json

-28
This file was deleted.

test/parser/samples/attribute-dynamic-boolean/input-v2.html

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<textarea readonly='{{readonly}}'></textarea>
1+
<textarea readonly={readonly}></textarea>

test/parser/samples/attribute-dynamic-boolean/output-v2.json

-40
This file was deleted.

test/parser/samples/attribute-dynamic-boolean/output.json

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,30 @@
11
{
2-
"hash": 3179574701,
2+
"hash": "7xolfv",
33
"html": {
44
"start": 0,
5-
"end": 45,
5+
"end": 41,
66
"type": "Fragment",
77
"children": [
88
{
99
"start": 0,
10-
"end": 45,
10+
"end": 41,
1111
"type": "Element",
1212
"name": "textarea",
1313
"attributes": [
1414
{
1515
"start": 10,
16-
"end": 33,
16+
"end": 29,
1717
"type": "Attribute",
1818
"name": "readonly",
1919
"value": [
2020
{
21-
"start": 20,
22-
"end": 32,
21+
"start": 19,
22+
"end": 29,
2323
"type": "MustacheTag",
2424
"expression": {
2525
"type": "Identifier",
26-
"start": 22,
27-
"end": 30,
26+
"start": 20,
27+
"end": 28,
2828
"name": "readonly"
2929
}
3030
}

test/parser/samples/attribute-dynamic-reserved/input-v2.html

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<div class='{{class}}'></div>
1+
<div class={class}></div>

test/parser/samples/attribute-dynamic-reserved/output-v2.json

-40
This file was deleted.

0 commit comments

Comments
 (0)