Skip to content

Commit d9557c0

Browse files
author
周立
committed
Merge branch 'master' into ns-master
# Conflicts: # README.md
2 parents 5f4d709 + 7dc47aa commit d9557c0

35 files changed

+2746
-267
lines changed

‎coverage/clover.xml

+17-6
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,22 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<coverage generated="1540525198434" clover="3.2.0">
3-
<project timestamp="1540525198434" name="All files">
4-
<metrics statements="1" coveredstatements="1" conditionals="0" coveredconditionals="0" methods="1" coveredmethods="1" elements="2" coveredelements="2" complexity="0" loc="1" ncloc="1" packages="1" files="1" classes="1">
5-
<file name="add.js" path="/Users/zhouli/mygithub/node-blog-admin/src/utils/add.js">
2+
<coverage generated="1541227761951" clover="3.2.0">
3+
<project timestamp="1541227761951" name="All files">
4+
<metrics statements="3" coveredstatements="1" conditionals="0" coveredconditionals="0" methods="4" coveredmethods="1" elements="7" coveredelements="2" complexity="0" loc="3" ncloc="3" packages="2" files="2" classes="2">
5+
<package name="components">
6+
<metrics statements="2" coveredstatements="0" conditionals="0" coveredconditionals="0" methods="3" coveredmethods="0"/>
7+
<file name="header.js" path="/Users/zhouli/mygithub/node-blog-admin/src/components/header.js">
8+
<metrics statements="2" coveredstatements="0" conditionals="0" coveredconditionals="0" methods="3" coveredmethods="0"/>
9+
<line num="8" count="0" type="stmt"/>
10+
<line num="15" count="0" type="stmt"/>
11+
</file>
12+
</package>
13+
<package name="utils">
614
<metrics statements="1" coveredstatements="1" conditionals="0" coveredconditionals="0" methods="1" coveredmethods="1"/>
7-
<line num="5" count="1" type="stmt"/>
8-
</file>
15+
<file name="add.js" path="/Users/zhouli/mygithub/node-blog-admin/src/utils/add.js">
16+
<metrics statements="1" coveredstatements="1" conditionals="0" coveredconditionals="0" methods="1" coveredmethods="1"/>
17+
<line num="5" count="1" type="stmt"/>
18+
</file>
19+
</package>
920
</metrics>
1021
</project>
1122
</coverage>

‎coverage/coverage-final.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1-
{"/Users/zhouli/mygithub/node-blog-admin/src/utils/add.js": {"path":"/Users/zhouli/mygithub/node-blog-admin/src/utils/add.js","statementMap":{"0":{"start":{"line":5,"column":4},"end":{"line":5,"column":15}}},"fnMap":{"0":{"name":"add","decl":{"start":{"line":4,"column":24},"end":{"line":4,"column":27}},"loc":{"start":{"line":4,"column":33},"end":{"line":6,"column":1}},"line":4}},"branchMap":{},"s":{"0":1},"f":{"0":1},"b":{},"_coverageSchema":"332fd63041d2c1bcb487cc26dd0d5f7d97098a6c","hash":"cdb265089da40aebbe5658e6d08ad70bcbe350cb"}
1+
{"/Users/zhouli/mygithub/node-blog-admin/src/components/header.js": {"path":"/Users/zhouli/mygithub/node-blog-admin/src/components/header.js","statementMap":{"0":{"start":{"line":8,"column":8},"end":{"line":8,"column":16}},"1":{"start":{"line":15,"column":8},"end":{"line":17,"column":16}}},"fnMap":{"0":{"name":"(anonymous_0)","decl":{"start":{"line":7,"column":4},"end":{"line":7,"column":5}},"loc":{"start":{"line":7,"column":17},"end":{"line":10,"column":5}},"line":7},"1":{"name":"(anonymous_1)","decl":{"start":{"line":11,"column":4},"end":{"line":11,"column":5}},"loc":{"start":{"line":11,"column":23},"end":{"line":12,"column":5}},"line":11},"2":{"name":"(anonymous_2)","decl":{"start":{"line":14,"column":13},"end":{"line":14,"column":14}},"loc":{"start":{"line":14,"column":19},"end":{"line":18,"column":5}},"line":14}},"branchMap":{},"s":{"0":0,"1":0},"f":{"0":0,"1":0,"2":0},"b":{},"_coverageSchema":"332fd63041d2c1bcb487cc26dd0d5f7d97098a6c","hash":"6469d2fe292c584ae47b7854b26c7eaef8f87779"}
2+
,"/Users/zhouli/mygithub/node-blog-admin/src/utils/add.js": {"path":"/Users/zhouli/mygithub/node-blog-admin/src/utils/add.js","statementMap":{"0":{"start":{"line":5,"column":4},"end":{"line":5,"column":15}}},"fnMap":{"0":{"name":"add","decl":{"start":{"line":4,"column":24},"end":{"line":4,"column":27}},"loc":{"start":{"line":4,"column":33},"end":{"line":6,"column":1}},"line":4}},"branchMap":{},"s":{"0":1},"f":{"0":1},"b":{},"_coverageSchema":"332fd63041d2c1bcb487cc26dd0d5f7d97098a6c","hash":"cdb265089da40aebbe5658e6d08ad70bcbe350cb"}
23
}

‎coverage/lcov-report/add.js.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ <h1>
6767
</div><!-- /wrapper -->
6868
<div class='footer quiet pad2 space-top1 center small'>
6969
Code coverage
70-
generated by <a href="https://istanbul.js.org/" target="_blank">istanbul</a> at Fri Oct 26 2018 11:39:58 GMT+0800 (CST)
70+
generated by <a href="https://istanbul.js.org/" target="_blank">istanbul</a> at Sat Nov 03 2018 14:45:51 GMT+0800 (CST)
7171
</div>
7272
</div>
7373
<script src="prettify.js"></script>

‎coverage/lcov-report/components/header.js.html

+125
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,125 @@
1+
<!doctype html>
2+
<html lang="en">
3+
<head>
4+
<title>Code coverage report for components/header.js</title>
5+
<meta charset="utf-8" />
6+
<link rel="stylesheet" href="../prettify.css" />
7+
<link rel="stylesheet" href="../base.css" />
8+
<meta name="viewport" content="width=device-width, initial-scale=1">
9+
<style type='text/css'>
10+
.coverage-summary .sorter {
11+
background-image: url(../sort-arrow-sprite.png);
12+
}
13+
</style>
14+
</head>
15+
<body>
16+
<div class='wrapper'>
17+
<div class='pad1'>
18+
<h1>
19+
<a href="../index.html">All files</a> / <a href="index.html">components</a> header.js
20+
</h1>
21+
<div class='clearfix'>
22+
<div class='fl pad1y space-right2'>
23+
<span class="strong">0% </span>
24+
<span class="quiet">Statements</span>
25+
<span class='fraction'>0/2</span>
26+
</div>
27+
<div class='fl pad1y space-right2'>
28+
<span class="strong">100% </span>
29+
<span class="quiet">Branches</span>
30+
<span class='fraction'>0/0</span>
31+
</div>
32+
<div class='fl pad1y space-right2'>
33+
<span class="strong">0% </span>
34+
<span class="quiet">Functions</span>
35+
<span class='fraction'>0/3</span>
36+
</div>
37+
<div class='fl pad1y space-right2'>
38+
<span class="strong">0% </span>
39+
<span class="quiet">Lines</span>
40+
<span class='fraction'>0/2</span>
41+
</div>
42+
</div>
43+
</div>
44+
<div class='status-line low'></div>
45+
<pre><table class="coverage">
46+
<tr><td class="line-count quiet">1
47+
2
48+
3
49+
4
50+
5
51+
6
52+
7
53+
8
54+
9
55+
10
56+
11
57+
12
58+
13
59+
14
60+
15
61+
16
62+
17
63+
18
64+
19
65+
20
66+
21</td><td class="line-coverage quiet"><span class="cline-any cline-neutral">&nbsp;</span>
67+
<span class="cline-any cline-neutral">&nbsp;</span>
68+
<span class="cline-any cline-neutral">&nbsp;</span>
69+
<span class="cline-any cline-neutral">&nbsp;</span>
70+
<span class="cline-any cline-neutral">&nbsp;</span>
71+
<span class="cline-any cline-neutral">&nbsp;</span>
72+
<span class="cline-any cline-neutral">&nbsp;</span>
73+
<span class="cline-any cline-no">&nbsp;</span>
74+
<span class="cline-any cline-neutral">&nbsp;</span>
75+
<span class="cline-any cline-neutral">&nbsp;</span>
76+
<span class="cline-any cline-neutral">&nbsp;</span>
77+
<span class="cline-any cline-neutral">&nbsp;</span>
78+
<span class="cline-any cline-neutral">&nbsp;</span>
79+
<span class="cline-any cline-neutral">&nbsp;</span>
80+
<span class="cline-any cline-no">&nbsp;</span>
81+
<span class="cline-any cline-neutral">&nbsp;</span>
82+
<span class="cline-any cline-neutral">&nbsp;</span>
83+
<span class="cline-any cline-neutral">&nbsp;</span>
84+
<span class="cline-any cline-neutral">&nbsp;</span>
85+
<span class="cline-any cline-neutral">&nbsp;</span>
86+
<span class="cline-any cline-neutral">&nbsp;</span></td><td class="text"><pre class="prettyprint lang-js">/**
87+
* Created by zhouli on 18/9/17
88+
*/
89+
import React from 'react';
90+
// import '../styles/components/header.css';
91+
class Header extends React.Component {
92+
<span class="fstat-no" title="function not covered" > co</span>nstructor(){
93+
<span class="cstat-no" title="statement not covered" > super();</span>
94+
&nbsp;
95+
}
96+
<span class="fstat-no" title="function not covered" > co</span>mponentDidMount(){
97+
}
98+
&nbsp;
99+
render = <span class="fstat-no" title="function not covered" >()</span> =&gt; {
100+
<span class="cstat-no" title="statement not covered" > return (&lt;div className="header-wrap"&gt;</span>
101+
{this.props.children}
102+
&lt;/div&gt; )
103+
}
104+
}
105+
export default Header;
106+
&nbsp;</pre></td></tr>
107+
</table></pre>
108+
<div class='push'></div><!-- for sticky footer -->
109+
</div><!-- /wrapper -->
110+
<div class='footer quiet pad2 space-top1 center small'>
111+
Code coverage
112+
generated by <a href="https://istanbul.js.org/" target="_blank">istanbul</a> at Sat Nov 03 2018 14:49:21 GMT+0800 (CST)
113+
</div>
114+
</div>
115+
<script src="../prettify.js"></script>
116+
<script>
117+
window.onload = function () {
118+
if (typeof prettyPrint === 'function') {
119+
prettyPrint();
120+
}
121+
};
122+
</script>
123+
<script src="../sorter.js"></script>
124+
</body>
125+
</html>

‎coverage/lcov-report/components/index.html

+93
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
1+
<!doctype html>
2+
<html lang="en">
3+
<head>
4+
<title>Code coverage report for components</title>
5+
<meta charset="utf-8" />
6+
<link rel="stylesheet" href="../prettify.css" />
7+
<link rel="stylesheet" href="../base.css" />
8+
<meta name="viewport" content="width=device-width, initial-scale=1">
9+
<style type='text/css'>
10+
.coverage-summary .sorter {
11+
background-image: url(../sort-arrow-sprite.png);
12+
}
13+
</style>
14+
</head>
15+
<body>
16+
<div class='wrapper'>
17+
<div class='pad1'>
18+
<h1>
19+
<a href="../index.html">All files</a> components
20+
</h1>
21+
<div class='clearfix'>
22+
<div class='fl pad1y space-right2'>
23+
<span class="strong">0% </span>
24+
<span class="quiet">Statements</span>
25+
<span class='fraction'>0/2</span>
26+
</div>
27+
<div class='fl pad1y space-right2'>
28+
<span class="strong">100% </span>
29+
<span class="quiet">Branches</span>
30+
<span class='fraction'>0/0</span>
31+
</div>
32+
<div class='fl pad1y space-right2'>
33+
<span class="strong">0% </span>
34+
<span class="quiet">Functions</span>
35+
<span class='fraction'>0/3</span>
36+
</div>
37+
<div class='fl pad1y space-right2'>
38+
<span class="strong">0% </span>
39+
<span class="quiet">Lines</span>
40+
<span class='fraction'>0/2</span>
41+
</div>
42+
</div>
43+
</div>
44+
<div class='status-line low'></div>
45+
<div class="pad1">
46+
<table class="coverage-summary">
47+
<thead>
48+
<tr>
49+
<th data-col="file" data-fmt="html" data-html="true" class="file">File</th>
50+
<th data-col="pic" data-type="number" data-fmt="html" data-html="true" class="pic"></th>
51+
<th data-col="statements" data-type="number" data-fmt="pct" class="pct">Statements</th>
52+
<th data-col="statements_raw" data-type="number" data-fmt="html" class="abs"></th>
53+
<th data-col="branches" data-type="number" data-fmt="pct" class="pct">Branches</th>
54+
<th data-col="branches_raw" data-type="number" data-fmt="html" class="abs"></th>
55+
<th data-col="functions" data-type="number" data-fmt="pct" class="pct">Functions</th>
56+
<th data-col="functions_raw" data-type="number" data-fmt="html" class="abs"></th>
57+
<th data-col="lines" data-type="number" data-fmt="pct" class="pct">Lines</th>
58+
<th data-col="lines_raw" data-type="number" data-fmt="html" class="abs"></th>
59+
</tr>
60+
</thead>
61+
<tbody><tr>
62+
<td class="file low" data-value="header.js"><a href="header.js.html">header.js</a></td>
63+
<td data-value="0" class="pic low"><div class="chart"><div class="cover-fill" style="width: 0%;"></div><div class="cover-empty" style="width:100%;"></div></div></td>
64+
<td data-value="0" class="pct low">0%</td>
65+
<td data-value="2" class="abs low">0/2</td>
66+
<td data-value="100" class="pct high">100%</td>
67+
<td data-value="0" class="abs high">0/0</td>
68+
<td data-value="0" class="pct low">0%</td>
69+
<td data-value="3" class="abs low">0/3</td>
70+
<td data-value="0" class="pct low">0%</td>
71+
<td data-value="2" class="abs low">0/2</td>
72+
</tr>
73+
74+
</tbody>
75+
</table>
76+
</div><div class='push'></div><!-- for sticky footer -->
77+
</div><!-- /wrapper -->
78+
<div class='footer quiet pad2 space-top1 center small'>
79+
Code coverage
80+
generated by <a href="https://istanbul.js.org/" target="_blank">istanbul</a> at Sat Nov 03 2018 14:49:21 GMT+0800 (CST)
81+
</div>
82+
</div>
83+
<script src="../prettify.js"></script>
84+
<script>
85+
window.onload = function () {
86+
if (typeof prettyPrint === 'function') {
87+
prettyPrint();
88+
}
89+
};
90+
</script>
91+
<script src="../sorter.js"></script>
92+
</body>
93+
</html>

‎coverage/lcov-report/index.html

+22-9
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">100% </span>
23+
<span class="strong">33.33% </span>
2424
<span class="quiet">Statements</span>
25-
<span class='fraction'>1/1</span>
25+
<span class='fraction'>1/3</span>
2626
</div>
2727
<div class='fl pad1y space-right2'>
2828
<span class="strong">100% </span>
2929
<span class="quiet">Branches</span>
3030
<span class='fraction'>0/0</span>
3131
</div>
3232
<div class='fl pad1y space-right2'>
33-
<span class="strong">100% </span>
33+
<span class="strong">25% </span>
3434
<span class="quiet">Functions</span>
35-
<span class='fraction'>1/1</span>
35+
<span class='fraction'>1/4</span>
3636
</div>
3737
<div class='fl pad1y space-right2'>
38-
<span class="strong">100% </span>
38+
<span class="strong">33.33% </span>
3939
<span class="quiet">Lines</span>
40-
<span class='fraction'>1/1</span>
40+
<span class='fraction'>1/3</span>
4141
</div>
4242
</div>
4343
</div>
44-
<div class='status-line high'></div>
44+
<div class='status-line low'></div>
4545
<div class="pad1">
4646
<table class="coverage-summary">
4747
<thead>
@@ -59,7 +59,20 @@ <h1>
5959
</tr>
6060
</thead>
6161
<tbody><tr>
62-
<td class="file high" data-value="add.js"><a href="add.js.html">add.js</a></td>
62+
<td class="file low" data-value="components"><a href="components/index.html">components</a></td>
63+
<td data-value="0" class="pic low"><div class="chart"><div class="cover-fill" style="width: 0%;"></div><div class="cover-empty" style="width:100%;"></div></div></td>
64+
<td data-value="0" class="pct low">0%</td>
65+
<td data-value="2" class="abs low">0/2</td>
66+
<td data-value="100" class="pct high">100%</td>
67+
<td data-value="0" class="abs high">0/0</td>
68+
<td data-value="0" class="pct low">0%</td>
69+
<td data-value="3" class="abs low">0/3</td>
70+
<td data-value="0" class="pct low">0%</td>
71+
<td data-value="2" class="abs low">0/2</td>
72+
</tr>
73+
74+
<tr>
75+
<td class="file high" data-value="utils"><a href="utils/index.html">utils</a></td>
6376
<td data-value="100" class="pic high"><div class="chart"><div class="cover-fill cover-full" style="width: 100%;"></div><div class="cover-empty" style="width:0%;"></div></div></td>
6477
<td data-value="100" class="pct high">100%</td>
6578
<td data-value="1" class="abs high">1/1</td>
@@ -77,7 +90,7 @@ <h1>
7790
</div><!-- /wrapper -->
7891
<div class='footer quiet pad2 space-top1 center small'>
7992
Code coverage
80-
generated by <a href="https://istanbul.js.org/" target="_blank">istanbul</a> at Fri Oct 26 2018 11:39:58 GMT+0800 (CST)
93+
generated by <a href="https://istanbul.js.org/" target="_blank">istanbul</a> at Sat Nov 03 2018 14:49:21 GMT+0800 (CST)
8194
</div>
8295
</div>
8396
<script src="prettify.js"></script>

0 commit comments

Comments
 (0)