Skip to content

Commit e1cf4ea

Browse files
SwatinemSwatinem
committed
restructure tests
* split up tests into separate files * fix coverage generation for SSR
1 parent 2cc3e82 commit e1cf4ea

13 files changed

+589
-557
lines changed

‎mocha.coverage.opts

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
--require reify
33
--recursive
44
./**/__test__.js
5-
test/test.js
5+
test/*.js

‎mocha.opts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
--require reify
22
--recursive
33
./**/__test__.js
4-
test/test.js
4+
test/*.js

‎package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"coverage": "nyc report --reporter=text-lcov > coverage.lcov",
1515
"codecov": "codecov",
1616
"precodecov": "npm run coverage",
17-
"lint": "eslint src",
17+
"lint": "eslint src test/*.js",
1818
"build": "npm run build:main && npm run build:ssr",
1919
"build:main": "rollup -c rollup.config.main.js",
2020
"build:ssr": "rollup -c rollup.config.ssr.js",
@@ -66,10 +66,10 @@
6666
},
6767
"nyc": {
6868
"include": [
69-
"compiler/**/*.js"
69+
"src/**/*.js"
7070
],
7171
"exclude": [
72-
"compiler/**/__test__.js"
72+
"src/**/__test__.js"
7373
]
7474
},
7575
"babel": {

‎rollup.config.ssr.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ export default {
1111
nodeResolve({ jsnext: true, module: true }),
1212
commonjs()
1313
],
14-
external: [ 'svelte', 'magic-string' ],
14+
external: [ 'src/index.js', 'magic-string' ],
1515
paths: {
16-
svelte: '../compiler/svelte.js'
16+
'src/index.js': '../compiler/svelte.js'
1717
},
1818
sourceMap: true
1919
};

‎src/server-side-rendering/compile.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { parse, validate } from 'svelte';
1+
import { parse, validate } from '../index.js';
22
import { walk } from 'estree-walker';
33
import deindent from '../utils/deindent.js';
44
import isReference from '../utils/isReference.js';

‎test/formats.js

+178
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,178 @@
1+
import deindent from '../src/utils/deindent.js';
2+
import assert from 'assert';
3+
import { svelte, env, setupHtmlEqual } from './helpers.js';
4+
5+
function testAmd ( code, expectedId, dependencies, html ) {
6+
const fn = new Function( 'define', code );
7+
8+
return env().then( window => {
9+
function define ( id, deps, factory ) {
10+
assert.equal( id, expectedId );
11+
assert.deepEqual( deps, Object.keys( dependencies ) );
12+
13+
const SvelteComponent = factory( ...Object.keys( dependencies ).map( key => dependencies[ key ] ) );
14+
15+
const main = window.document.body.querySelector( 'main' );
16+
const component = new SvelteComponent({ target: main });
17+
18+
assert.htmlEqual( main.innerHTML, html );
19+
20+
component.teardown();
21+
}
22+
23+
define.amd = true;
24+
25+
fn( define );
26+
});
27+
}
28+
29+
function testCjs ( code, dependencyById, html ) {
30+
const fn = new Function( 'module', 'exports', 'require', code );
31+
32+
return env().then( window => {
33+
const module = { exports: {} };
34+
const require = id => {
35+
return dependencyById[ id ];
36+
};
37+
38+
fn( module, module.exports, require );
39+
40+
const SvelteComponent = module.exports;
41+
42+
const main = window.document.body.querySelector( 'main' );
43+
const component = new SvelteComponent({ target: main });
44+
45+
assert.htmlEqual( main.innerHTML, html );
46+
47+
component.teardown();
48+
});
49+
}
50+
51+
function testIife ( code, name, globals, html ) {
52+
const fn = new Function( Object.keys( globals ), `${code}\n\nreturn ${name};` );
53+
54+
return env().then( window => {
55+
const SvelteComponent = fn( ...Object.keys( globals ).map( key => globals[ key ] ) );
56+
57+
const main = window.document.body.querySelector( 'main' );
58+
const component = new SvelteComponent({ target: main });
59+
60+
assert.htmlEqual( main.innerHTML, html );
61+
62+
component.teardown();
63+
});
64+
}
65+
66+
describe( 'formats', () => {
67+
before( setupHtmlEqual );
68+
69+
describe( 'amd', () => {
70+
it( 'generates an AMD module', () => {
71+
const source = deindent`
72+
<div>{{answer}}</div>
73+
74+
<script>
75+
import answer from 'answer';
76+
77+
export default {
78+
data () {
79+
return { answer };
80+
}
81+
};
82+
</script>
83+
`;
84+
85+
const { code } = svelte.compile( source, {
86+
format: 'amd',
87+
amd: { id: 'foo' }
88+
});
89+
90+
return testAmd( code, 'foo', { answer: 42 }, `<div>42</div>` );
91+
});
92+
});
93+
94+
describe( 'cjs', () => {
95+
it( 'generates a CommonJS module', () => {
96+
const source = deindent`
97+
<div>{{answer}}</div>
98+
99+
<script>
100+
import answer from 'answer';
101+
102+
export default {
103+
data () {
104+
return { answer };
105+
}
106+
};
107+
</script>
108+
`;
109+
110+
const { code } = svelte.compile( source, {
111+
format: 'cjs'
112+
});
113+
114+
return testCjs( code, { answer: 42 }, `<div>42</div>` );
115+
});
116+
});
117+
118+
describe( 'iife', () => {
119+
it( 'generates a self-executing script', () => {
120+
const source = deindent`
121+
<div>{{answer}}</div>
122+
123+
<script>
124+
import answer from 'answer';
125+
126+
export default {
127+
data () {
128+
return { answer };
129+
}
130+
};
131+
</script>
132+
`;
133+
134+
const { code } = svelte.compile( source, {
135+
format: 'iife',
136+
name: 'Foo',
137+
globals: {
138+
answer: 'answer'
139+
}
140+
});
141+
142+
return testIife( code, 'Foo', { answer: 42 }, `<div>42</div>` );
143+
});
144+
});
145+
146+
describe( 'umd', () => {
147+
it( 'generates a UMD build', () => {
148+
const source = deindent`
149+
<div>{{answer}}</div>
150+
151+
<script>
152+
import answer from 'answer';
153+
154+
export default {
155+
data () {
156+
return { answer };
157+
}
158+
};
159+
</script>
160+
`;
161+
162+
const { code } = svelte.compile( source, {
163+
format: 'umd',
164+
name: 'Foo',
165+
globals: {
166+
answer: 'answer'
167+
},
168+
amd: {
169+
id: 'foo'
170+
}
171+
});
172+
173+
return testAmd( code, 'foo', { answer: 42 }, `<div>42</div>` )
174+
.then( () => testCjs( code, { answer: 42 }, `<div>42</div>` ) )
175+
.then( () => testIife( code, 'Foo', { answer: 42 }, `<div>42</div>` ) );
176+
});
177+
});
178+
});

‎test/generate.js

+121
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,121 @@
1+
import spaces from '../src/utils/spaces.js';
2+
import assert from 'assert';
3+
import * as path from 'path';
4+
import * as fs from 'fs';
5+
import * as acorn from 'acorn';
6+
7+
import { svelte, env, setupHtmlEqual } from './helpers.js';
8+
9+
const cache = {};
10+
11+
let showCompiledCode = false;
12+
let compileOptions = null;
13+
14+
require.extensions[ '.html' ] = function ( module, filename ) {
15+
const options = Object.assign({ filename }, compileOptions );
16+
const code = cache[ filename ] || ( cache[ filename ] = svelte.compile( fs.readFileSync( filename, 'utf-8' ), options ).code );
17+
if ( showCompiledCode ) console.log( addLineNumbers( code ) ); // eslint-disable-line no-console
18+
19+
return module._compile( code, filename );
20+
};
21+
22+
function addLineNumbers ( code ) {
23+
return code.split( '\n' ).map( ( line, i ) => {
24+
i = String( i + 1 );
25+
while ( i.length < 3 ) i = ` ${i}`;
26+
27+
return `${i}: ${line.replace( /^\t+/, match => match.split( '\t' ).join( ' ' ) )}`;
28+
}).join( '\n' );
29+
}
30+
31+
function loadConfig ( dir ) {
32+
try {
33+
return require( `./generator/${dir}/_config.js` ).default;
34+
} catch ( err ) {
35+
if ( err.code === 'E_NOT_FOUND' ) {
36+
return {};
37+
}
38+
39+
throw err;
40+
}
41+
}
42+
43+
describe( 'generate', () => {
44+
before( setupHtmlEqual );
45+
46+
fs.readdirSync( 'test/generator' ).forEach( dir => {
47+
if ( dir[0] === '.' ) return;
48+
49+
const config = loadConfig( dir );
50+
51+
( config.skip ? it.skip : config.solo ? it.only : it )( dir, () => {
52+
let compiled;
53+
54+
showCompiledCode = config.show;
55+
compileOptions = config.compileOptions || {};
56+
57+
try {
58+
const source = fs.readFileSync( `test/generator/${dir}/main.html`, 'utf-8' );
59+
compiled = svelte.compile( source );
60+
} catch ( err ) {
61+
if ( config.compileError ) {
62+
config.compileError( err );
63+
return;
64+
} else {
65+
throw err;
66+
}
67+
}
68+
69+
const { code } = compiled;
70+
71+
// check that no ES2015+ syntax slipped in
72+
try {
73+
const startIndex = code.indexOf( 'function renderMainFragment' ); // may change!
74+
const es5 = spaces( startIndex ) + code.slice( startIndex ).replace( /export default .+/, '' );
75+
acorn.parse( es5, { ecmaVersion: 5 });
76+
} catch ( err ) {
77+
if ( !config.show ) console.log( addLineNumbers( code ) ); // eslint-disable-line no-console
78+
throw err;
79+
}
80+
81+
cache[ path.resolve( `test/generator/${dir}/main.html` ) ] = code;
82+
83+
let SvelteComponent;
84+
85+
try {
86+
SvelteComponent = require( `./generator/${dir}/main.html` ).default;
87+
} catch ( err ) {
88+
if ( !config.show ) console.log( addLineNumbers( code ) ); // eslint-disable-line no-console
89+
throw err;
90+
}
91+
92+
return env()
93+
.then( window => {
94+
// Put the constructor on window for testing
95+
window.SvelteComponent = SvelteComponent;
96+
97+
const target = window.document.querySelector( 'main' );
98+
99+
const component = new SvelteComponent({
100+
target,
101+
data: config.data
102+
});
103+
104+
if ( config.html ) {
105+
assert.htmlEqual( target.innerHTML, config.html );
106+
}
107+
108+
if ( config.test ) {
109+
config.test( assert, component, target, window );
110+
} else {
111+
component.teardown();
112+
assert.equal( target.innerHTML, '' );
113+
}
114+
})
115+
.catch( err => {
116+
if ( !config.show ) console.log( addLineNumbers( code ) ); // eslint-disable-line no-console
117+
throw err;
118+
});
119+
});
120+
});
121+
});

0 commit comments

Comments
 (0)