Skip to content

Commit e356919

Browse files
SC7639SC7639
committed
Update functionality to return assets and added tests for more assets
1 parent 1b0e562 commit e356919

8 files changed

Lines changed: 222 additions & 198 deletions

File tree

‎coverage/coverage.json‎

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

‎coverage/lcov-report/index.html‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -20,28 +20,28 @@ <h1>
2020
</h1>
2121
<div class='clearfix'>
2222
<div class='fl pad1y space-right2'>
23-
<span class="strong">75.23% </span>
23+
<span class="strong">80.56% </span>
2424
<span class="quiet">Statements</span>
25-
<span class='fraction'>82/109</span>
25+
<span class='fraction'>87/108</span>
2626
</div>
2727
<div class='fl pad1y space-right2'>
28-
<span class="strong">67.69% </span>
28+
<span class="strong">73.85% </span>
2929
<span class="quiet">Branches</span>
30-
<span class='fraction'>44/65</span>
30+
<span class='fraction'>48/65</span>
3131
</div>
3232
<div class='fl pad1y space-right2'>
3333
<span class="strong">100% </span>
3434
<span class="quiet">Functions</span>
3535
<span class='fraction'>10/10</span>
3636
</div>
3737
<div class='fl pad1y space-right2'>
38-
<span class="strong">75% </span>
38+
<span class="strong">80.37% </span>
3939
<span class="quiet">Lines</span>
40-
<span class='fraction'>81/108</span>
40+
<span class='fraction'>86/107</span>
4141
</div>
4242
</div>
4343
</div>
44-
<div class='status-line medium'></div>
44+
<div class='status-line high'></div>
4545
<div class="pad1">
4646
<table class="coverage-summary">
4747
<thead>
@@ -59,16 +59,16 @@ <h1>
5959
</tr>
6060
</thead>
6161
<tbody><tr>
62-
<td class="file medium" data-value="small-router/"><a href="small-router/index.html">small-router/</a></td>
63-
<td data-value="75.23" class="pic medium"><div class="chart"><div class="cover-fill" style="width: 75%;"></div><div class="cover-empty" style="width:25%;"></div></div></td>
64-
<td data-value="75.23" class="pct medium">75.23%</td>
65-
<td data-value="109" class="abs medium">82/109</td>
66-
<td data-value="67.69" class="pct medium">67.69%</td>
67-
<td data-value="65" class="abs medium">44/65</td>
62+
<td class="file high" data-value="small-router/"><a href="small-router/index.html">small-router/</a></td>
63+
<td data-value="80.56" class="pic high"><div class="chart"><div class="cover-fill" style="width: 80%;"></div><div class="cover-empty" style="width:20%;"></div></div></td>
64+
<td data-value="80.56" class="pct high">80.56%</td>
65+
<td data-value="108" class="abs high">87/108</td>
66+
<td data-value="73.85" class="pct medium">73.85%</td>
67+
<td data-value="65" class="abs medium">48/65</td>
6868
<td data-value="100" class="pct high">100%</td>
6969
<td data-value="10" class="abs high">10/10</td>
70-
<td data-value="75" class="pct medium">75%</td>
71-
<td data-value="108" class="abs medium">81/108</td>
70+
<td data-value="80.37" class="pct high">80.37%</td>
71+
<td data-value="107" class="abs high">86/107</td>
7272
</tr>
7373

7474
</tbody>
@@ -77,7 +77,7 @@ <h1>
7777
</div><!-- /wrapper -->
7878
<div class='footer quiet pad2 space-top1 center small'>
7979
Code coverage
80-
generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Fri Mar 25 2016 14:43:51 GMT+0000 (GMT Standard Time)
80+
generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Sun Apr 17 2016 18:32:32 GMT+0100 (GMT Summer Time)
8181
</div>
8282
</div>
8383
<script src="prettify.js"></script>

‎coverage/lcov-report/small-router/index.html‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -20,28 +20,28 @@ <h1>
2020
</h1>
2121
<div class='clearfix'>
2222
<div class='fl pad1y space-right2'>
23-
<span class="strong">75.23% </span>
23+
<span class="strong">80.56% </span>
2424
<span class="quiet">Statements</span>
25-
<span class='fraction'>82/109</span>
25+
<span class='fraction'>87/108</span>
2626
</div>
2727
<div class='fl pad1y space-right2'>
28-
<span class="strong">67.69% </span>
28+
<span class="strong">73.85% </span>
2929
<span class="quiet">Branches</span>
30-
<span class='fraction'>44/65</span>
30+
<span class='fraction'>48/65</span>
3131
</div>
3232
<div class='fl pad1y space-right2'>
3333
<span class="strong">100% </span>
3434
<span class="quiet">Functions</span>
3535
<span class='fraction'>10/10</span>
3636
</div>
3737
<div class='fl pad1y space-right2'>
38-
<span class="strong">75% </span>
38+
<span class="strong">80.37% </span>
3939
<span class="quiet">Lines</span>
40-
<span class='fraction'>81/108</span>
40+
<span class='fraction'>86/107</span>
4141
</div>
4242
</div>
4343
</div>
44-
<div class='status-line medium'></div>
44+
<div class='status-line high'></div>
4545
<div class="pad1">
4646
<table class="coverage-summary">
4747
<thead>
@@ -59,16 +59,16 @@ <h1>
5959
</tr>
6060
</thead>
6161
<tbody><tr>
62-
<td class="file medium" data-value="index.js"><a href="index.js.html">index.js</a></td>
63-
<td data-value="75.23" class="pic medium"><div class="chart"><div class="cover-fill" style="width: 75%;"></div><div class="cover-empty" style="width:25%;"></div></div></td>
64-
<td data-value="75.23" class="pct medium">75.23%</td>
65-
<td data-value="109" class="abs medium">82/109</td>
66-
<td data-value="67.69" class="pct medium">67.69%</td>
67-
<td data-value="65" class="abs medium">44/65</td>
62+
<td class="file high" data-value="index.js"><a href="index.js.html">index.js</a></td>
63+
<td data-value="80.56" class="pic high"><div class="chart"><div class="cover-fill" style="width: 80%;"></div><div class="cover-empty" style="width:20%;"></div></div></td>
64+
<td data-value="80.56" class="pct high">80.56%</td>
65+
<td data-value="108" class="abs high">87/108</td>
66+
<td data-value="73.85" class="pct medium">73.85%</td>
67+
<td data-value="65" class="abs medium">48/65</td>
6868
<td data-value="100" class="pct high">100%</td>
6969
<td data-value="10" class="abs high">10/10</td>
70-
<td data-value="75" class="pct medium">75%</td>
71-
<td data-value="108" class="abs medium">81/108</td>
70+
<td data-value="80.37" class="pct high">80.37%</td>
71+
<td data-value="107" class="abs high">86/107</td>
7272
</tr>
7373

7474
</tbody>
@@ -77,7 +77,7 @@ <h1>
7777
</div><!-- /wrapper -->
7878
<div class='footer quiet pad2 space-top1 center small'>
7979
Code coverage
80-
generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Fri Mar 25 2016 14:43:51 GMT+0000 (GMT Standard Time)
80+
generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Sun Apr 17 2016 18:32:32 GMT+0100 (GMT Summer Time)
8181
</div>
8282
</div>
8383
<script src="../prettify.js"></script>

‎coverage/lcov-report/small-router/index.js.html‎

Lines changed: 49 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -20,28 +20,28 @@ <h1>
2020
</h1>
2121
<div class='clearfix'>
2222
<div class='fl pad1y space-right2'>
23-
<span class="strong">75.23% </span>
23+
<span class="strong">80.56% </span>
2424
<span class="quiet">Statements</span>
25-
<span class='fraction'>82/109</span>
25+
<span class='fraction'>87/108</span>
2626
</div>
2727
<div class='fl pad1y space-right2'>
28-
<span class="strong">67.69% </span>
28+
<span class="strong">73.85% </span>
2929
<span class="quiet">Branches</span>
30-
<span class='fraction'>44/65</span>
30+
<span class='fraction'>48/65</span>
3131
</div>
3232
<div class='fl pad1y space-right2'>
3333
<span class="strong">100% </span>
3434
<span class="quiet">Functions</span>
3535
<span class='fraction'>10/10</span>
3636
</div>
3737
<div class='fl pad1y space-right2'>
38-
<span class="strong">75% </span>
38+
<span class="strong">80.37% </span>
3939
<span class="quiet">Lines</span>
40-
<span class='fraction'>81/108</span>
40+
<span class='fraction'>86/107</span>
4141
</div>
4242
</div>
4343
</div>
44-
<div class='status-line medium'></div>
44+
<div class='status-line high'></div>
4545
<pre><table class="coverage">
4646
<tr><td class="line-count quiet">1
4747
2
@@ -319,7 +319,7 @@ <h1>
319319
<span class="cline-any cline-neutral">&nbsp;</span>
320320
<span class="cline-any cline-yes">1×</span>
321321
<span class="cline-any cline-yes">1×</span>
322-
<span class="cline-any cline-yes">16×</span>
322+
<span class="cline-any cline-yes">18×</span>
323323
<span class="cline-any cline-yes">1×</span>
324324
<span class="cline-any cline-neutral">&nbsp;</span>
325325
<span class="cline-any cline-neutral">&nbsp;</span>
@@ -361,26 +361,26 @@ <h1>
361361
<span class="cline-any cline-neutral">&nbsp;</span>
362362
<span class="cline-any cline-neutral">&nbsp;</span>
363363
<span class="cline-any cline-neutral">&nbsp;</span>
364-
<span class="cline-any cline-yes">1×</span>
365-
<span class="cline-any cline-yes">1×</span>
364+
<span class="cline-any cline-yes">2×</span>
365+
<span class="cline-any cline-yes">2×</span>
366366
<span class="cline-any cline-neutral">&nbsp;</span>
367-
<span class="cline-any cline-yes">1×</span>
368-
<span class="cline-any cline-yes">1×</span>
367+
<span class="cline-any cline-yes">2×</span>
368+
<span class="cline-any cline-yes">2×</span>
369369
<span class="cline-any cline-no">&nbsp;</span>
370370
<span class="cline-any cline-neutral">&nbsp;</span>
371371
<span class="cline-any cline-no">&nbsp;</span>
372372
<span class="cline-any cline-no">&nbsp;</span>
373373
<span class="cline-any cline-neutral">&nbsp;</span>
374374
<span class="cline-any cline-neutral">&nbsp;</span>
375375
<span class="cline-any cline-neutral">&nbsp;</span>
376-
<span class="cline-any cline-yes">1×</span>
376+
<span class="cline-any cline-yes">2×</span>
377377
<span class="cline-any cline-neutral">&nbsp;</span>
378378
<span class="cline-any cline-neutral">&nbsp;</span>
379379
<span class="cline-any cline-neutral">&nbsp;</span>
380380
<span class="cline-any cline-no">&nbsp;</span>
381381
<span class="cline-any cline-neutral">&nbsp;</span>
382382
<span class="cline-any cline-neutral">&nbsp;</span>
383-
<span class="cline-any cline-yes">1×</span>
383+
<span class="cline-any cline-yes">2×</span>
384384
<span class="cline-any cline-neutral">&nbsp;</span>
385385
<span class="cline-any cline-neutral">&nbsp;</span>
386386
<span class="cline-any cline-neutral">&nbsp;</span>
@@ -389,34 +389,28 @@ <h1>
389389
<span class="cline-any cline-neutral">&nbsp;</span>
390390
<span class="cline-any cline-neutral">&nbsp;</span>
391391
<span class="cline-any cline-neutral">&nbsp;</span>
392-
<span class="cline-any cline-yes">16×</span>
393-
<span class="cline-any cline-yes">16×</span>
394-
<span class="cline-any cline-yes">16×</span>
395-
<span class="cline-any cline-yes">16×</span>
392+
<span class="cline-any cline-yes">18×</span>
393+
<span class="cline-any cline-yes">18×</span>
394+
<span class="cline-any cline-yes">18×</span>
395+
<span class="cline-any cline-yes">18×</span>
396396
<span class="cline-any cline-neutral">&nbsp;</span>
397-
<span class="cline-any cline-yes">16×</span>
398-
<span class="cline-any cline-yes">2×</span>
397+
<span class="cline-any cline-yes">18×</span>
398+
<span class="cline-any cline-yes">4×</span>
399+
<span class="cline-any cline-yes">4×</span>
400+
<span class="cline-any cline-yes">4×</span>
401+
<span class="cline-any cline-neutral">&nbsp;</span>
402+
<span class="cline-any cline-yes">4×</span>
399403
<span class="cline-any cline-yes">2×</span>
400404
<span class="cline-any cline-yes">2×</span>
401405
<span class="cline-any cline-neutral">&nbsp;</span>
402406
<span class="cline-any cline-yes">2×</span>
403-
<span class="cline-any cline-no">&nbsp;</span>
404407
<span class="cline-any cline-neutral">&nbsp;</span>
405408
<span class="cline-any cline-yes">2×</span>
406409
<span class="cline-any cline-yes">2×</span>
407410
<span class="cline-any cline-neutral">&nbsp;</span>
408411
<span class="cline-any cline-neutral">&nbsp;</span>
409412
<span class="cline-any cline-no">&nbsp;</span>
410413
<span class="cline-any cline-no">&nbsp;</span>
411-
<span class="cline-any cline-no">&nbsp;</span>
412-
<span class="cline-any cline-no">&nbsp;</span>
413-
<span class="cline-any cline-no">&nbsp;</span>
414-
<span class="cline-any cline-no">&nbsp;</span>
415-
<span class="cline-any cline-neutral">&nbsp;</span>
416-
<span class="cline-any cline-neutral">&nbsp;</span>
417-
<span class="cline-any cline-no">&nbsp;</span>
418-
<span class="cline-any cline-neutral">&nbsp;</span>
419-
<span class="cline-any cline-neutral">&nbsp;</span>
420414
<span class="cline-any cline-neutral">&nbsp;</span>
421415
<span class="cline-any cline-no">&nbsp;</span>
422416
<span class="cline-any cline-neutral">&nbsp;</span>
@@ -499,15 +493,21 @@ <h1>
499493
<span class="cline-any cline-neutral">&nbsp;</span>
500494
<span class="cline-any cline-neutral">&nbsp;</span>
501495
<span class="cline-any cline-neutral">&nbsp;</span>
502-
<span class="cline-any cline-yes">2×</span>
503-
<span class="cline-any cline-yes">2×</span>
496+
<span class="cline-any cline-neutral">&nbsp;</span>
497+
<span class="cline-any cline-yes">4×</span>
498+
<span class="cline-any cline-yes">4×</span>
504499
<span class="cline-any cline-no">&nbsp;</span>
505500
<span class="cline-any cline-no">&nbsp;</span>
506501
<span class="cline-any cline-neutral">&nbsp;</span>
507502
<span class="cline-any cline-neutral">&nbsp;</span>
503+
<span class="cline-any cline-neutral">&nbsp;</span>
504+
<span class="cline-any cline-yes">4×</span>
508505
<span class="cline-any cline-yes">2×</span>
509506
<span class="cline-any cline-neutral">&nbsp;</span>
510507
<span class="cline-any cline-neutral">&nbsp;</span>
508+
<span class="cline-any cline-yes">4×</span>
509+
<span class="cline-any cline-neutral">&nbsp;</span>
510+
<span class="cline-any cline-neutral">&nbsp;</span>
511511
<span class="cline-any cline-neutral">&nbsp;</span>
512512
<span class="cline-any cline-neutral">&nbsp;</span>
513513
<span class="cline-any cline-yes">2×</span>
@@ -661,29 +661,23 @@ <h1>
661661
&nbsp;
662662
if(url.includes('.')) { // If the url is for an asset
663663
let fileType = url.split('.')[2] || url.split('.')[1];
664-
let file = urlParts[urlParts.length - 1];
664+
let file = url.replace('/', '');
665665
let assetType = urlParts[urlParts.length - 2];
666666
&nbsp;
667-
<span class="missing-if-branch" title="if path not taken" >I</span>if(assetPaths.indexOf(assetType) !== -1) { // If the asset has been speicified
668-
<span class="cstat-no" title="statement not covered" > this.renderAsset(this.assetPaths[assetType], file, res);</span>
667+
if(assetPaths.indexOf(assetType) !== -1) { // If the asset has been speicified
668+
<span class="missing-if-branch" title="else path not taken" >E</span>if(file.indexOf(assetType) !== -1) {
669+
file = file.replace(`${assetType}/`, '');
670+
}
671+
this.renderAsset(this.assetPaths[assetType], file, assetType, res);
669672
}
670673
else <span class="missing-if-branch" title="else path not taken" >E</span>if(assetPaths.indexOf(fileType) !== -1) {
671-
this.renderAsset(this.assetPaths[fileType], file, res);
674+
this.renderAsset(this.assetPaths[fileType], file, fileType, res);
672675
}
673676
else {
674677
<span class="cstat-no" title="statement not covered" > let path = assetType;</span>
675-
<span class="cstat-no" title="statement not covered" > if(urlParts.length &gt; 2) {</span>
676-
<span class="cstat-no" title="statement not covered" > path = urlParts.reduce((prevVal, nextVal, index) =&gt; {</span>
677-
<span class="cstat-no" title="statement not covered" > let part = '';</span>
678-
<span class="cstat-no" title="statement not covered" > if(index !== (urlParts.length - 1)) {</span>
679-
<span class="cstat-no" title="statement not covered" > part = nextVal;</span>
680-
}
678+
<span class="cstat-no" title="statement not covered" > file = this.assetPaths[file].replace(`${path}/`, '');</span>
681679
&nbsp;
682-
<span class="cstat-no" title="statement not covered" > return prevVal + part;</span>
683-
});
684-
}
685-
&nbsp;
686-
<span class="cstat-no" title="statement not covered" > this.renderAsset(path, file, res);</span>
680+
<span class="cstat-no" title="statement not covered" > this.renderAsset(path, file, path, res);</span>
687681
}
688682
}
689683
else {
@@ -761,14 +755,20 @@ <h1>
761755
* Responde with asset file contents to the http request
762756
* @param {string} path
763757
* @param {string} file
758+
* @param {string} assetType
764759
* @param {Server.Response} res
765760
*/
766-
renderAsset(path, file, res) {
761+
renderAsset(path, file, assetType, res) {
767762
fs.readFile(`${path}/${file}`, (err, data) =&gt; {
768763
<span class="missing-if-branch" title="if path not taken" >I</span>if(err) {
769764
<span class="cstat-no" title="statement not covered" > res.statusCode = 404;</span>
770765
<span class="cstat-no" title="statement not covered" > res.end(`File ${path}/${file} doesn't exist`);</span>
771766
}
767+
&nbsp;
768+
&nbsp;
769+
if(assetType == 'css') {
770+
res.writeHead(200, { 'Content-Type': 'text/css' });
771+
}
772772
&nbsp;
773773
res.end(data);
774774
});
@@ -844,7 +844,7 @@ <h1>
844844
</div><!-- /wrapper -->
845845
<div class='footer quiet pad2 space-top1 center small'>
846846
Code coverage
847-
generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Fri Mar 25 2016 14:43:51 GMT+0000 (GMT Standard Time)
847+
generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Sun Apr 17 2016 18:32:32 GMT+0100 (GMT Summer Time)
848848
</div>
849849
</div>
850850
<script src="../prettify.js"></script>

0 commit comments

Comments
 (0)