From 23288b7fb15455b972fcafbc81633d2d0c0d7408 Mon Sep 17 00:00:00 2001 From: Wing Date: Tue, 17 Jun 2014 17:08:08 +0800 Subject: [PATCH 1/2] fix test --- test/test.js | 44 +++++++++++++++++++++++++++++--------------- 1 file changed, 29 insertions(+), 15 deletions(-) diff --git a/test/test.js b/test/test.js index 00e3044..a8ea313 100644 --- a/test/test.js +++ b/test/test.js @@ -53,21 +53,24 @@ it('String template', function () { expect( - tmpl('{%=o.value%}', data), + tmpl('{%=o.value%}', data) + ).to.be( 'value' ); }); it('Load template by id', function () { expect( - tmpl('template', data), + tmpl('template', data) + ).to.be( 'value' ); }); it('Retun function when called without data parameter', function () { expect( - tmpl('{%=o.value%}')(data), + tmpl('{%=o.value%}')(data) + ).to.be( 'value' ); }); @@ -85,49 +88,56 @@ it('Escape HTML special characters with {%=o.prop%}', function () { expect( - tmpl('{%=o.special%}', data), + tmpl('{%=o.special%}', data) + ).to.be( '<>&"'' ); }); it('Allow HTML special characters with {%#o.prop%}', function () { expect( - tmpl('{%#o.special%}', data), + tmpl('{%#o.special%}', data) + ).to.be( '<>&"\'\x00' ); }); it('Function call', function () { expect( - tmpl('{%=o.func()%}', data), + tmpl('{%=o.func()%}', data) + ).to.be( 'value' ); }); it('Dot notation', function () { expect( - tmpl('{%=o.deep.value%}', data), + tmpl('{%=o.deep.value%}', data) + ).to.be( 'value' ); }); it('Handle single quotes', function () { expect( - tmpl('\'single quotes\'{%=": \'"%}', data), - '\'single quotes\': \'' + tmpl('\'single quotes\'{%=": \'"%}', data) + ).to.be( + '\'single quotes\': '' ); }); it('Handle double quotes', function () { expect( - tmpl('"double quotes"{%=": \\""%}', data), + tmpl('"double quotes"{%=": \\""%}', data) + ).to.be( '"double quotes": "' ); }); it('Handle backslashes', function () { expect( - tmpl('\\backslashes\\{%=": \\\\"%}', data), + tmpl('\\backslashes\\{%=": \\\\"%}', data) + ).to.be( '\\backslashes\\: \\' ); }); @@ -177,14 +187,16 @@ it('Escape HTML special characters with print(data)', function () { expect( - tmpl('{% print(o.special); %}', data), + tmpl('{% print(o.special); %}', data) + ).to.be( '<>&"'' ); }); it('Allow HTML special characters with print(data, true)', function () { expect( - tmpl('{% print(o.special, true); %}', data), + tmpl('{% print(o.special, true); %}', data) + ).to.be( '<>&"\'\x00' ); }); @@ -219,14 +231,16 @@ it('Include template', function () { expect( - tmpl('{% include("template", {value: "value"}); %}', data), + tmpl('{% include("template", {value: "value"}); %}', data) + ).to.be( 'value' ); }); it('If condition', function () { expect( - tmpl('{% if (o.value) { %}true{% } else { %}false{% } %}', data), + tmpl('{% if (o.value) { %}true{% } else { %}false{% } %}', data) + ).to.be( 'true' ); }); From 579867916dcb4a3c8a6c7a7faa9945f3286a0ccd Mon Sep 17 00:00:00 2001 From: Wing Date: Tue, 17 Jun 2014 17:18:46 +0800 Subject: [PATCH 2/2] use .to.eql() instead of .to.be() --- test/test.js | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/test/test.js b/test/test.js index a8ea313..d005e54 100644 --- a/test/test.js +++ b/test/test.js @@ -54,7 +54,7 @@ it('String template', function () { expect( tmpl('{%=o.value%}', data) - ).to.be( + ).to.eql( 'value' ); }); @@ -62,7 +62,7 @@ it('Load template by id', function () { expect( tmpl('template', data) - ).to.be( + ).to.eql( 'value' ); }); @@ -70,7 +70,7 @@ it('Retun function when called without data parameter', function () { expect( tmpl('{%=o.value%}')(data) - ).to.be( + ).to.eql( 'value' ); }); @@ -89,7 +89,7 @@ it('Escape HTML special characters with {%=o.prop%}', function () { expect( tmpl('{%=o.special%}', data) - ).to.be( + ).to.eql( '<>&"'' ); }); @@ -97,7 +97,7 @@ it('Allow HTML special characters with {%#o.prop%}', function () { expect( tmpl('{%#o.special%}', data) - ).to.be( + ).to.eql( '<>&"\'\x00' ); }); @@ -105,7 +105,7 @@ it('Function call', function () { expect( tmpl('{%=o.func()%}', data) - ).to.be( + ).to.eql( 'value' ); }); @@ -113,7 +113,7 @@ it('Dot notation', function () { expect( tmpl('{%=o.deep.value%}', data) - ).to.be( + ).to.eql( 'value' ); }); @@ -121,7 +121,7 @@ it('Handle single quotes', function () { expect( tmpl('\'single quotes\'{%=": \'"%}', data) - ).to.be( + ).to.eql( '\'single quotes\': '' ); }); @@ -129,7 +129,7 @@ it('Handle double quotes', function () { expect( tmpl('"double quotes"{%=": \\""%}', data) - ).to.be( + ).to.eql( '"double quotes": "' ); }); @@ -137,7 +137,7 @@ it('Handle backslashes', function () { expect( tmpl('\\backslashes\\{%=": \\\\"%}', data) - ).to.be( + ).to.eql( '\\backslashes\\: \\' ); }); @@ -151,7 +151,7 @@ '{%=o.zeroValue%}', data ) - ).to.be( + ).to.eql( 'false0' ); }); @@ -165,7 +165,7 @@ '{%#o.zeroValue%}', data ) - ).to.be( + ).to.eql( 'false0' ); }); @@ -176,7 +176,7 @@ '\n\r\t{%=o.value%} \n\r\t{%=o.value%} ', data ) - ).to.be( + ).to.eql( '\n\r\tvalue \n\r\tvalue ' ); }); @@ -188,7 +188,7 @@ it('Escape HTML special characters with print(data)', function () { expect( tmpl('{% print(o.special); %}', data) - ).to.be( + ).to.eql( '<>&"'' ); }); @@ -196,7 +196,7 @@ it('Allow HTML special characters with print(data, true)', function () { expect( tmpl('{% print(o.special, true); %}', data) - ).to.be( + ).to.eql( '<>&"\'\x00' ); }); @@ -210,7 +210,7 @@ '{% print(o.zeroValue); %}', data ) - ).to.be( + ).to.eql( 'false0' ); }); @@ -224,7 +224,7 @@ '{% print(o.zeroValue, true); %}', data ) - ).to.be( + ).to.eql( 'false0' ); }); @@ -232,7 +232,7 @@ it('Include template', function () { expect( tmpl('{% include("template", {value: "value"}); %}', data) - ).to.be( + ).to.eql( 'value' ); }); @@ -240,7 +240,7 @@ it('If condition', function () { expect( tmpl('{% if (o.value) { %}true{% } else { %}false{% } %}', data) - ).to.be( + ).to.eql( 'true' ); }); @@ -251,7 +251,7 @@ '{% if (o.undefinedValue) { %}false{% } else { %}true{% } %}', data ) - ).to.be( + ).to.eql( 'true' ); }); @@ -263,7 +263,7 @@ '{%=o.list[i]%}{% } %}', data ) - ).to.be( + ).to.eql( '12345' ); }); @@ -275,7 +275,7 @@ 'print(o.list[i]);} %}', data ) - ).to.be( + ).to.eql( '12345' ); }); @@ -287,7 +287,7 @@ 'include("template", {value: o.list[i]});} %}', data ).replace(/[\r\n]/g, '') - ).to.be( + ).to.eql( '12345' ); }); @@ -298,7 +298,7 @@ '{% if (o.list.length % 5 === 0) { %}5 list items{% } %}', data ).replace(/[\r\n]/g, '') - ).to.be( + ).to.eql( '5 list items' ); });