"
-})
+ message: 'Some '
+});
diff --git a/test/_files/apostrophe.js b/test/_files/apostrophe.js
index 183c6d540..7acfce057 100644
--- a/test/_files/apostrophe.js
+++ b/test/_files/apostrophe.js
@@ -1,4 +1,4 @@
({
'apos': "'",
'control': 'X'
-})
+});
diff --git a/test/_files/array_of_strings.js b/test/_files/array_of_strings.js
index 6926612f5..6eb9e63e9 100644
--- a/test/_files/array_of_strings.js
+++ b/test/_files/array_of_strings.js
@@ -1,3 +1,3 @@
({
array_of_strings: ['hello', 'world']
-})
+});
diff --git a/test/_files/avoids_obj_prototype_in_view_cache.js b/test/_files/avoids_obj_prototype_in_view_cache.js
index 2ab58cdb7..ae88d2bc8 100644
--- a/test/_files/avoids_obj_prototype_in_view_cache.js
+++ b/test/_files/avoids_obj_prototype_in_view_cache.js
@@ -1,4 +1,4 @@
({
valueOf: 'Avoids methods',
watch: 'in Object.prototype'
-})
+});
diff --git a/test/_files/backslashes.js b/test/_files/backslashes.js
index 427acd9d2..0a5d84501 100644
--- a/test/_files/backslashes.js
+++ b/test/_files/backslashes.js
@@ -1,3 +1,3 @@
({
- value: "\\abc"
-})
+ value: '\\abc'
+});
diff --git a/test/_files/bug_11_eating_whitespace.js b/test/_files/bug_11_eating_whitespace.js
index e41ccd15d..3a91f9608 100644
--- a/test/_files/bug_11_eating_whitespace.js
+++ b/test/_files/bug_11_eating_whitespace.js
@@ -1,3 +1,3 @@
({
- tag: "yo"
-})
+ tag: 'yo'
+});
diff --git a/test/_files/bug_length_property.js b/test/_files/bug_length_property.js
index 74c483bbf..c63899e56 100644
--- a/test/_files/bug_length_property.js
+++ b/test/_files/bug_length_property.js
@@ -1,3 +1,3 @@
({
length: 'hello'
-})
+});
diff --git a/test/_files/changing_delimiters.js b/test/_files/changing_delimiters.js
index b808f4c8b..0bb3b13e0 100644
--- a/test/_files/changing_delimiters.js
+++ b/test/_files/changing_delimiters.js
@@ -1,4 +1,4 @@
({
- "foo": "foooooooooooooo",
- "bar": "bar!"
-})
+ 'foo': 'foooooooooooooo',
+ 'bar': 'bar!'
+});
diff --git a/test/_files/check_falsy.js b/test/_files/check_falsy.js
index 5a599cab7..aeb742221 100644
--- a/test/_files/check_falsy.js
+++ b/test/_files/check_falsy.js
@@ -1,7 +1,7 @@
({
- number: function(text, render) {
- return function(text, render) {
+ number: function (text, render) {
+ return function (text, render) {
return +render(text);
- }
+ };
}
-})
+});
diff --git a/test/_files/cli.cjs b/test/_files/cli.cjs
new file mode 100644
index 000000000..dc090e577
--- /dev/null
+++ b/test/_files/cli.cjs
@@ -0,0 +1,3 @@
+module.exports = {
+ name: 'LeBron'
+};
diff --git a/test/_files/cli.js b/test/_files/cli.js
new file mode 100644
index 000000000..dc090e577
--- /dev/null
+++ b/test/_files/cli.js
@@ -0,0 +1,3 @@
+module.exports = {
+ name: 'LeBron'
+};
diff --git a/test/_files/cli_js_view_with_function.js b/test/_files/cli_js_view_with_function.js
new file mode 100644
index 000000000..29d1a2766
--- /dev/null
+++ b/test/_files/cli_js_view_with_function.js
@@ -0,0 +1,8 @@
+module.exports = {
+ 'name': 'Tater',
+ 'bold': function () {
+ return function (text, render) {
+ return '' + render(text) + '';
+ };
+ }
+};
\ No newline at end of file
diff --git a/test/_files/cli_js_view_with_function.mustache b/test/_files/cli_js_view_with_function.mustache
new file mode 100644
index 000000000..a73ebbe6a
--- /dev/null
+++ b/test/_files/cli_js_view_with_function.mustache
@@ -0,0 +1 @@
+{{#bold}}Hi {{name}}.{{/bold}}
\ No newline at end of file
diff --git a/test/_files/cli_js_view_with_function.txt b/test/_files/cli_js_view_with_function.txt
new file mode 100644
index 000000000..3f6eb97b7
--- /dev/null
+++ b/test/_files/cli_js_view_with_function.txt
@@ -0,0 +1 @@
+Hi Tater.
\ No newline at end of file
diff --git a/test/_files/cli_with_partials.json b/test/_files/cli_with_partials.json
new file mode 100644
index 000000000..c6af1c841
--- /dev/null
+++ b/test/_files/cli_with_partials.json
@@ -0,0 +1,14 @@
+{ "users": [
+ {
+ "name": "LeBron"
+ },
+ {
+ "name": "LeBron 2"
+ }
+ ],
+ "comments": [
+ {
+ "title": "A Comedy of Errors"
+ }
+ ]
+}
\ No newline at end of file
diff --git a/test/_files/cli_with_partials.mustache b/test/_files/cli_with_partials.mustache
new file mode 100644
index 000000000..9c168d841
--- /dev/null
+++ b/test/_files/cli_with_partials.mustache
@@ -0,0 +1,7 @@
+{{#users}}
+{{>cli}}
+{{/users}}
+
+{{#comments}}
+{{>comments}}
+{{/comments}}
\ No newline at end of file
diff --git a/test/_files/cli_with_partials.txt b/test/_files/cli_with_partials.txt
new file mode 100644
index 000000000..f582397ea
--- /dev/null
+++ b/test/_files/cli_with_partials.txt
@@ -0,0 +1,2 @@
+Howdy LeBron, CLI roxHowdy LeBron 2, CLI rox
+A Comedy of Errors
diff --git a/test/_files/comments.js b/test/_files/comments.js
index f20b8b11c..af291cbe0 100644
--- a/test/_files/comments.js
+++ b/test/_files/comments.js
@@ -1,5 +1,5 @@
({
title: function () {
- return "A Comedy of Errors";
+ return 'A Comedy of Errors';
}
-})
+});
diff --git a/test/_files/complex.js b/test/_files/complex.js
index 68a48093e..d6c3ae267 100644
--- a/test/_files/complex.js
+++ b/test/_files/complex.js
@@ -1,14 +1,14 @@
({
header: function () {
- return "Colors";
+ return 'Colors';
},
item: [
- {name: "red", current: true, url: "#Red"},
- {name: "green", current: false, url: "#Green"},
- {name: "blue", current: false, url: "#Blue"}
+ {name: 'red', current: true, url: '#Red'},
+ {name: 'green', current: false, url: '#Green'},
+ {name: 'blue', current: false, url: '#Blue'}
],
link: function () {
- return this["current"] !== true;
+ return this['current'] !== true;
},
list: function () {
return this.item.length !== 0;
@@ -16,4 +16,4 @@
empty: function () {
return this.item.length === 0;
}
-})
+});
diff --git a/test/_files/context_lookup.js b/test/_files/context_lookup.js
index 8ce62999e..b9f891c27 100644
--- a/test/_files/context_lookup.js
+++ b/test/_files/context_lookup.js
@@ -1,8 +1,8 @@
({
- "outer": {
- "id": 1,
- "second": {
- "nothing": 2
+ 'outer': {
+ 'id': 1,
+ 'second': {
+ 'nothing': 2
}
}
-})
+});
diff --git a/test/_files/delimiters.js b/test/_files/delimiters.js
index 365d01e8e..b4c9f5075 100644
--- a/test/_files/delimiters.js
+++ b/test/_files/delimiters.js
@@ -1,6 +1,6 @@
({
- first: "It worked the first time.",
- second: "And it worked the second time.",
- third: "Then, surprisingly, it worked the third time.",
- fourth: "Fourth time also fine!."
-})
+ first: 'It worked the first time.',
+ second: 'And it worked the second time.',
+ third: 'Then, surprisingly, it worked the third time.',
+ fourth: 'Fourth time also fine!.'
+});
diff --git a/test/_files/disappearing_whitespace.js b/test/_files/disappearing_whitespace.js
index 973dd1c9c..1d2f392a4 100644
--- a/test/_files/disappearing_whitespace.js
+++ b/test/_files/disappearing_whitespace.js
@@ -1,4 +1,4 @@
({
bedrooms: true,
total: 1
-})
+});
diff --git a/test/_files/dot_notation.js b/test/_files/dot_notation.js
index de06a03a5..8dbef438e 100644
--- a/test/_files/dot_notation.js
+++ b/test/_files/dot_notation.js
@@ -1,6 +1,6 @@
({
- name: "A Book",
- authors: ["John Power", "Jamie Walsh"],
+ name: 'A Book',
+ authors: ['John Power', 'Jamie Walsh'],
price: {
value: 200,
vat: function () {
@@ -13,11 +13,12 @@
},
availability: {
status: true,
- text: "In Stock"
+ text: 'In Stock'
},
// And now, some truthy false values
truthy: {
zero: 0,
notTrue: false
- }
-})
+ },
+ singletonList: [{singletonItem: 'singleton item'}]
+});
diff --git a/test/_files/dot_notation.mustache b/test/_files/dot_notation.mustache
index f89d70ba2..1ef2209fe 100644
--- a/test/_files/dot_notation.mustache
+++ b/test/_files/dot_notation.mustache
@@ -7,3 +7,6 @@
Test truthy false values:
Zero: {{truthy.zero}}
False: {{truthy.notTrue}}
+length of string should be rendered: {{price.currency.name.length}}
+length of string in a list should be rendered: {{#singletonList}}{{singletonItem.length}}{{/singletonList}}
+length of an array should be rendered: {{authors.length}}
diff --git a/test/_files/dot_notation.txt b/test/_files/dot_notation.txt
index 08afa0529..c71ab27dd 100644
--- a/test/_files/dot_notation.txt
+++ b/test/_files/dot_notation.txt
@@ -7,3 +7,6 @@
Test truthy false values:
Zero: 0
False: false
+length of string should be rendered: 3
+length of string in a list should be rendered: 14
+length of an array should be rendered: 2
diff --git a/test/_files/double_render.js b/test/_files/double_render.js
index 28acb2c1a..d8ade03de 100644
--- a/test/_files/double_render.js
+++ b/test/_files/double_render.js
@@ -1,5 +1,5 @@
({
foo: true,
- bar: "{{win}}",
- win: "FAIL"
-})
+ bar: '{{win}}',
+ win: 'FAIL'
+});
diff --git a/test/_files/empty_list.js b/test/_files/empty_list.js
index c0e115942..c40f6d81c 100644
--- a/test/_files/empty_list.js
+++ b/test/_files/empty_list.js
@@ -1,3 +1,3 @@
({
jobs: []
-})
+});
diff --git a/test/_files/empty_sections.js b/test/_files/empty_sections.js
index b4100a597..b3bf1ddb0 100644
--- a/test/_files/empty_sections.js
+++ b/test/_files/empty_sections.js
@@ -1 +1 @@
-({})
+({});
diff --git a/test/_files/empty_string.js b/test/_files/empty_string.js
index be6e05876..59de15d2e 100644
--- a/test/_files/empty_string.js
+++ b/test/_files/empty_string.js
@@ -1,6 +1,6 @@
({
- description: "That is all!",
+ description: 'That is all!',
child: {
- description: ""
+ description: ''
}
-})
+});
diff --git a/test/_files/empty_template.js b/test/_files/empty_template.js
index b4100a597..b3bf1ddb0 100644
--- a/test/_files/empty_template.js
+++ b/test/_files/empty_template.js
@@ -1 +1 @@
-({})
+({});
diff --git a/test/_files/error_not_found.js b/test/_files/error_not_found.js
index 10e470918..6dcb14fbe 100644
--- a/test/_files/error_not_found.js
+++ b/test/_files/error_not_found.js
@@ -1,3 +1,3 @@
({
bar: 2
-})
+});
diff --git a/test/_files/escaped.js b/test/_files/escaped.js
index cd77c1f49..8345ecbc1 100644
--- a/test/_files/escaped.js
+++ b/test/_files/escaped.js
@@ -1,6 +1,7 @@
({
title: function () {
- return "Bear > Shark";
+ return 'Bear > Shark';
},
- entities: "" \"'<>/"
-})
+ symbol: null,
+ entities: "" \"'<>`=/"
+});
diff --git a/test/_files/escaped.mustache b/test/_files/escaped.mustache
index 93e800b31..5c44268ad 100644
--- a/test/_files/escaped.mustache
+++ b/test/_files/escaped.mustache
@@ -1,2 +1,2 @@
-{{title}}
+{{title}}{{symbol}}
And even {{entities}}, but not {{{entities}}}.
diff --git a/test/_files/escaped.txt b/test/_files/escaped.txt
index c1527d510..182f99ee4 100644
--- a/test/_files/escaped.txt
+++ b/test/_files/escaped.txt
@@ -1,2 +1,2 @@
Bear > Shark
-And even " "'<>/, but not " "'<>/.
+And even " "'<>`=/, but not " "'<>`=/.
diff --git a/test/_files/falsy.js b/test/_files/falsy.js
index ae9b9bf25..e3fd42255 100644
--- a/test/_files/falsy.js
+++ b/test/_files/falsy.js
@@ -1,8 +1,8 @@
({
- "emptyString": "",
- "emptyArray": [],
- "zero": 0,
- "null": null,
- "undefined": undefined,
- "NaN": 0/0
-})
\ No newline at end of file
+ 'emptyString': '',
+ 'emptyArray': [],
+ 'zero': 0,
+ 'null': null,
+ 'undefined': undefined,
+ 'NaN': 0/0
+});
\ No newline at end of file
diff --git a/test/_files/falsy_array.js b/test/_files/falsy_array.js
index f26530878..209c58965 100644
--- a/test/_files/falsy_array.js
+++ b/test/_files/falsy_array.js
@@ -1,10 +1,10 @@
({
- "list": [
- ["", "emptyString"],
- [[], "emptyArray"],
- [0, "zero"],
- [null, "null"],
- [undefined, "undefined"],
- [0/0, "NaN"]
+ 'list': [
+ ['', 'emptyString'],
+ [[], 'emptyArray'],
+ [0, 'zero'],
+ [null, 'null'],
+ [undefined, 'undefined'],
+ [0/0, 'NaN']
]
-})
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/test/_files/grandparent_context.js b/test/_files/grandparent_context.js
index 97dbfd398..4d304005f 100644
--- a/test/_files/grandparent_context.js
+++ b/test/_files/grandparent_context.js
@@ -16,4 +16,4 @@
]
}
]
-})
+});
diff --git a/test/_files/higher_order_sections.js b/test/_files/higher_order_sections.js
index bacb0a44a..6a4a3103d 100644
--- a/test/_files/higher_order_sections.js
+++ b/test/_files/higher_order_sections.js
@@ -1,9 +1,9 @@
({
- name: "Tater",
- helper: "To tinker?",
+ name: 'Tater',
+ helper: 'To tinker?',
bolder: function () {
return function (text, render) {
return text + ' => ' + render(text) + ' ' + this.helper;
- }
+ };
}
-})
+});
diff --git a/test/_files/implicit_iterator.js b/test/_files/implicit_iterator.js
index 2be2997e4..47a6b6876 100644
--- a/test/_files/implicit_iterator.js
+++ b/test/_files/implicit_iterator.js
@@ -5,4 +5,4 @@
name: 'janl'
}
}
-})
+});
diff --git a/test/_files/included_tag.js b/test/_files/included_tag.js
index eb032a42c..2dfc0c3b4 100644
--- a/test/_files/included_tag.js
+++ b/test/_files/included_tag.js
@@ -1,3 +1,3 @@
({
- html: "I like {{mustache}}"
-})
+ html: 'I like {{mustache}}'
+});
diff --git a/test/_files/inverted_section.js b/test/_files/inverted_section.js
index f8f08fd26..40fcba870 100644
--- a/test/_files/inverted_section.js
+++ b/test/_files/inverted_section.js
@@ -1,3 +1,3 @@
({
- "repos": []
-})
+ 'repos': []
+});
diff --git a/test/_files/keys_with_questionmarks.js b/test/_files/keys_with_questionmarks.js
index becd63102..345e97f6b 100644
--- a/test/_files/keys_with_questionmarks.js
+++ b/test/_files/keys_with_questionmarks.js
@@ -1,5 +1,5 @@
({
- "person?": {
- name: "Jon"
+ 'person?': {
+ name: 'Jon'
}
-})
+});
diff --git a/test/_files/malicious_template.js b/test/_files/malicious_template.js
index b4100a597..b3bf1ddb0 100644
--- a/test/_files/malicious_template.js
+++ b/test/_files/malicious_template.js
@@ -1 +1 @@
-({})
+({});
diff --git a/test/_files/multiline_comment.js b/test/_files/multiline_comment.js
index b4100a597..b3bf1ddb0 100644
--- a/test/_files/multiline_comment.js
+++ b/test/_files/multiline_comment.js
@@ -1 +1 @@
-({})
+({});
diff --git a/test/_files/nested_dot.js b/test/_files/nested_dot.js
index 2c22f8e38..72493f69e 100644
--- a/test/_files/nested_dot.js
+++ b/test/_files/nested_dot.js
@@ -1 +1 @@
-({ name: 'Bruno' })
+({ name: 'Bruno' });
diff --git a/test/_files/nested_iterating.js b/test/_files/nested_iterating.js
index 2708b2db5..333d92508 100644
--- a/test/_files/nested_iterating.js
+++ b/test/_files/nested_iterating.js
@@ -5,4 +5,4 @@
bar: 'bar'
}]
}]
-})
+});
diff --git a/test/_files/nesting.js b/test/_files/nesting.js
index 264cc2f77..d0eab3ab4 100644
--- a/test/_files/nesting.js
+++ b/test/_files/nesting.js
@@ -4,4 +4,4 @@
{a: {b: 2}},
{a: {b: 3}}
]
-})
+});
diff --git a/test/_files/nesting_same_name.js b/test/_files/nesting_same_name.js
index 10a0c1401..84bc5c0bc 100644
--- a/test/_files/nesting_same_name.js
+++ b/test/_files/nesting_same_name.js
@@ -5,4 +5,4 @@
items: [1, 2, 3, 4]
}
]
-})
+});
diff --git a/test/_files/null_lookup_array.js b/test/_files/null_lookup_array.js
index 9ebf56a22..40efeea51 100644
--- a/test/_files/null_lookup_array.js
+++ b/test/_files/null_lookup_array.js
@@ -1,9 +1,9 @@
({
- "name": "David",
- "twitter": "@dasilvacontin",
- "farray": [
- ["Flor", "@florrts"],
- ["Miquel", null],
- ["Chris", undefined]
- ]
-})
+ 'name': 'David',
+ 'twitter': '@dasilvacontin',
+ 'farray': [
+ ['Flor', '@florrts'],
+ ['Miquel', null],
+ ['Chris', undefined]
+ ]
+});
diff --git a/test/_files/null_lookup_object.js b/test/_files/null_lookup_object.js
index 0f8248036..6f6b0e5bf 100644
--- a/test/_files/null_lookup_object.js
+++ b/test/_files/null_lookup_object.js
@@ -1,31 +1,31 @@
({
- "name": "David",
- "twitter": "@dasilvacontin",
- "fobject": [
- {
- "name": "Flor",
- "twitter": "@florrts"
- },
- {
- "name": "Miquel",
- "twitter": null
- },
- {
- "name": "Chris",
- "twitter": undefined
- }
- ],
- "favorites": {
- "color": "blue",
- "president": "Bush",
- "show": "Futurama"
+ 'name': 'David',
+ 'twitter': '@dasilvacontin',
+ 'fobject': [
+ {
+ 'name': 'Flor',
+ 'twitter': '@florrts'
},
- "mascot": {
- "name": "Squid",
- "favorites": {
- "color": "orange",
- "president": undefined,
- "show": null
- }
+ {
+ 'name': 'Miquel',
+ 'twitter': null
+ },
+ {
+ 'name': 'Chris',
+ 'twitter': undefined
+ }
+ ],
+ 'favorites': {
+ 'color': 'blue',
+ 'president': 'Bush',
+ 'show': 'Futurama'
+ },
+ 'mascot': {
+ 'name': 'Squid',
+ 'favorites': {
+ 'color': 'orange',
+ 'president': undefined,
+ 'show': null
}
-})
+ }
+});
diff --git a/test/_files/null_string.js b/test/_files/null_string.js
index 984ee516a..4fc1033ac 100644
--- a/test/_files/null_string.js
+++ b/test/_files/null_string.js
@@ -1,10 +1,10 @@
({
- name: "Elise",
+ name: 'Elise',
glytch: true,
binary: false,
value: null,
undef: undefined,
- numeric: function() {
+ numeric: function () {
return NaN;
}
-})
+});
diff --git a/test/_files/null_view.js b/test/_files/null_view.js
index dbdae728e..7f82792d3 100644
--- a/test/_files/null_view.js
+++ b/test/_files/null_view.js
@@ -1,4 +1,4 @@
({
name: 'Joe',
friends: null
-})
+});
diff --git a/test/_files/partial_array.js b/test/_files/partial_array.js
index 2a6ddf1cf..30b3c7711 100644
--- a/test/_files/partial_array.js
+++ b/test/_files/partial_array.js
@@ -1,3 +1,3 @@
({
array: ['1', '2', '3', '4']
-})
+});
diff --git a/test/_files/partial_array_of_partials.js b/test/_files/partial_array_of_partials.js
index 03f13c946..4f21b7549 100644
--- a/test/_files/partial_array_of_partials.js
+++ b/test/_files/partial_array_of_partials.js
@@ -5,4 +5,4 @@
{i: '3'},
{i: '4'}
]
-})
+});
diff --git a/test/_files/partial_array_of_partials_implicit.js b/test/_files/partial_array_of_partials_implicit.js
index 9ec0c00ff..350ad17d5 100644
--- a/test/_files/partial_array_of_partials_implicit.js
+++ b/test/_files/partial_array_of_partials_implicit.js
@@ -1,3 +1,3 @@
({
numbers: ['1', '2', '3', '4']
-})
+});
diff --git a/test/_files/partial_empty.js b/test/_files/partial_empty.js
index 82b8c2242..03db6fd93 100644
--- a/test/_files/partial_empty.js
+++ b/test/_files/partial_empty.js
@@ -1,3 +1,3 @@
({
foo: 1
-})
+});
diff --git a/test/_files/partial_template.js b/test/_files/partial_template.js
index a913f8784..a527657f6 100644
--- a/test/_files/partial_template.js
+++ b/test/_files/partial_template.js
@@ -1,6 +1,6 @@
({
title: function () {
- return "Welcome";
+ return 'Welcome';
},
- again: "Goodbye"
-})
+ again: 'Goodbye'
+});
diff --git a/test/_files/partial_view.js b/test/_files/partial_view.js
index 3ad70d35c..6a83f54fc 100644
--- a/test/_files/partial_view.js
+++ b/test/_files/partial_view.js
@@ -1,14 +1,14 @@
({
greeting: function () {
- return "Welcome";
+ return 'Welcome';
},
farewell: function () {
- return "Fair enough, right?";
+ return 'Fair enough, right?';
},
- name: "Chris",
+ name: 'Chris',
value: 10000,
taxed_value: function () {
return this.value - (this.value * 0.4);
},
in_ca: true
-})
+});
diff --git a/test/_files/partial_whitespace.js b/test/_files/partial_whitespace.js
index 3ad70d35c..6a83f54fc 100644
--- a/test/_files/partial_whitespace.js
+++ b/test/_files/partial_whitespace.js
@@ -1,14 +1,14 @@
({
greeting: function () {
- return "Welcome";
+ return 'Welcome';
},
farewell: function () {
- return "Fair enough, right?";
+ return 'Fair enough, right?';
},
- name: "Chris",
+ name: 'Chris',
value: 10000,
taxed_value: function () {
return this.value - (this.value * 0.4);
},
in_ca: true
-})
+});
diff --git a/test/_files/recursion_with_same_names.js b/test/_files/recursion_with_same_names.js
index ce2650291..fd0f7d081 100644
--- a/test/_files/recursion_with_same_names.js
+++ b/test/_files/recursion_with_same_names.js
@@ -5,4 +5,4 @@
{name: 't1', index: 0},
{name: 't2', index: 1}
]
-})
+});
diff --git a/test/_files/reuse_of_enumerables.js b/test/_files/reuse_of_enumerables.js
index 4368b5743..b59b4a8f6 100644
--- a/test/_files/reuse_of_enumerables.js
+++ b/test/_files/reuse_of_enumerables.js
@@ -3,4 +3,4 @@
{name: 't1', index: 0},
{name: 't2', index: 1}
]
-})
+});
diff --git a/test/_files/section_as_context.js b/test/_files/section_as_context.js
index 425b29cb4..aeb7b1feb 100644
--- a/test/_files/section_as_context.js
+++ b/test/_files/section_as_context.js
@@ -7,4 +7,4 @@
{label: 'listitem2'}
]
}
-})
+});
diff --git a/test/_files/section_functions_in_partials.js b/test/_files/section_functions_in_partials.js
index 4672778bd..ece5fc9d8 100644
--- a/test/_files/section_functions_in_partials.js
+++ b/test/_files/section_functions_in_partials.js
@@ -1,7 +1,7 @@
({
- bold: function(){
- return function(text, render) {
- return "" + render(text) + "";
- }
+ bold: function (){
+ return function (text, render) {
+ return '' + render(text) + '';
+ };
}
-})
+});
diff --git a/test/_files/simple.js b/test/_files/simple.js
index 1d8d6f425..6c6b1f07e 100644
--- a/test/_files/simple.js
+++ b/test/_files/simple.js
@@ -1,8 +1,8 @@
({
- name: "Chris",
+ name: 'Chris',
value: 10000,
taxed_value: function () {
return this.value - (this.value * 0.4);
},
in_ca: true
-})
+});
diff --git a/test/_files/string_as_context.js b/test/_files/string_as_context.js
index e8bb4da00..118e2b5e7 100644
--- a/test/_files/string_as_context.js
+++ b/test/_files/string_as_context.js
@@ -1,4 +1,4 @@
({
a_string: 'aa',
a_list: ['a','b','c']
-})
+});
diff --git a/test/_files/two_in_a_row.js b/test/_files/two_in_a_row.js
index 9c17c1173..272f86039 100644
--- a/test/_files/two_in_a_row.js
+++ b/test/_files/two_in_a_row.js
@@ -1,4 +1,4 @@
({
- name: "Joe",
- greeting: "Welcome"
-})
+ name: 'Joe',
+ greeting: 'Welcome'
+});
diff --git a/test/_files/two_sections.js b/test/_files/two_sections.js
index b4100a597..b3bf1ddb0 100644
--- a/test/_files/two_sections.js
+++ b/test/_files/two_sections.js
@@ -1 +1 @@
-({})
+({});
diff --git a/test/_files/unescaped.js b/test/_files/unescaped.js
index b6d064f12..3b4d3cb8f 100644
--- a/test/_files/unescaped.js
+++ b/test/_files/unescaped.js
@@ -1,5 +1,6 @@
({
title: function () {
- return "Bear > Shark";
- }
-})
+ return 'Bear > Shark';
+ },
+ symbol: null
+});
diff --git a/test/_files/unescaped.mustache b/test/_files/unescaped.mustache
index 6b07d7b71..1a27f587b 100644
--- a/test/_files/unescaped.mustache
+++ b/test/_files/unescaped.mustache
@@ -1 +1 @@
-{{{title}}}
+{{{title}}}{{{symbol}}}
diff --git a/test/_files/uses_props_from_view_prototype.js b/test/_files/uses_props_from_view_prototype.js
index 5fff76a29..6754348c1 100644
--- a/test/_files/uses_props_from_view_prototype.js
+++ b/test/_files/uses_props_from_view_prototype.js
@@ -1,9 +1,9 @@
var Aaa = (function () {
- function Aaa(x, y) {
+ function Aaa (x, y) {
this.x = x;
this._y = y;
}
- Object.defineProperty(Aaa.prototype, "y", {
+ Object.defineProperty(Aaa.prototype, 'y', {
get: function () {
return this._y;
},
@@ -16,15 +16,15 @@ var Aaa = (function () {
return Aaa;
})();
var Bbb = (function () {
- function Bbb() {
+ function Bbb () {
}
return Bbb;
})();
var b = new Bbb();
-b.item = new Aaa("0", "00");
+b.item = new Aaa('0', '00');
b.items = [];
-b.items.push({ a: new Aaa("1", "2") });
-b.items.push({ a: new Aaa("3", "4") });
+b.items.push({ a: new Aaa('1', '2') });
+b.items.push({ a: new Aaa('3', '4') });
-(b)
+(b);
diff --git a/test/_files/whitespace.js b/test/_files/whitespace.js
index f41cb5640..dc12fe297 100644
--- a/test/_files/whitespace.js
+++ b/test/_files/whitespace.js
@@ -1,4 +1,4 @@
({
- tag1: "Hello",
- tag2: "World"
-})
+ tag1: 'Hello',
+ tag2: 'World'
+});
diff --git a/test/_files/zero_view.js b/test/_files/zero_view.js
index 986460860..d584042c6 100644
--- a/test/_files/zero_view.js
+++ b/test/_files/zero_view.js
@@ -1 +1 @@
-({ nums: [0, 1, 2] })
+({ nums: [0, 1, 2] });
diff --git a/test/cli-test.js b/test/cli-test.js
index 52cd7deeb..c01395c65 100644
--- a/test/cli-test.js
+++ b/test/cli-test.js
@@ -2,83 +2,162 @@ require('./helper');
var fs = require('fs');
var path = require('path');
+var child_process = require('child_process');
var _files = path.join(__dirname, '_files');
var cliTxt = path.resolve(_files, 'cli.txt');
+var cliPartialsTxt = path.resolve(_files, 'cli_with_partials.txt');
var moduleVersion = require('../package').version;
-var exec = require('child_process').exec;
+function changeForOS (command) {
+ var requireFlag = !isLegacyNodeVersion ? '--require esm' : '';
+ command = command.replace('bin/mustache', 'node ' + requireFlag + ' bin/mustache');
-describe('Mustache CLI', function () {
+ if (process.platform === 'win32') {
+ return command
+ .replace(/\bcat\b/g, 'type')
+ .replace(/\//g, '\\');
+ }
- var expectedOutput;
+ return command;
+}
- before(function(done) {
- fs.readFile(cliTxt, function onFsEnd(err, data) {
- if (err) return done(err);
+function exec () {
+ arguments[0] = changeForOS(arguments[0]);
+ return child_process.exec.apply(child_process, arguments);
+}
- expectedOutput = data.toString();
- done();
- });
- });
+describe('Mustache CLI', function () {
+
+ var expectedOutput;
- it('writes syntax hints into stderr when runned with wrong number of arguments', function(done) {
- exec('bin/mustache', function(err, stdout, stderr) {
+ it('writes syntax hints into stderr when runned with wrong number of arguments', function (done) {
+ exec('bin/mustache', function (err, stdout, stderr) {
assert.notEqual(stderr.indexOf('Syntax'), -1);
done();
});
});
- it('writes hints about JSON parsing errors when given invalid JSON', function(done) {
- exec('echo {name:"lebron"} | bin/mustache - test/_files/cli.mustache', function(err, stdout, stderr) {
+ it('writes hints about JSON parsing errors when given invalid JSON', function (done) {
+ exec('echo {name:"lebron"} | bin/mustache - test/_files/cli.mustache', function (err, stdout, stderr) {
assert.notEqual(stderr.indexOf('Shooot, could not parse view as JSON'), -1);
done();
});
});
- it('writes module version into stdout when runned with --version', function(done){
- exec('bin/mustache --version', function(err, stdout, stderr) {
+ it('writes module version into stdout when runned with --version', function (done){
+ exec('bin/mustache --version', function (err, stdout, stderr) {
assert.notEqual(stdout.indexOf(moduleVersion), -1);
done();
});
});
- it('writes module version into stdout when runned with -v', function(done){
- exec('bin/mustache -v', function(err, stdout, stderr) {
+ it('writes module version into stdout when runned with -v', function (done){
+ exec('bin/mustache -v', function (err, stdout, stderr) {
assert.notEqual(stdout.indexOf(moduleVersion), -1);
done();
});
});
- it('writes rendered template into stdout when successfull', function(done) {
- exec('bin/mustache test/_files/cli.json test/_files/cli.mustache', function(err, stdout, stderr) {
- assert.equal(err, null);
- assert.equal(stderr, '');
- assert.equal(stdout, expectedOutput);
- done();
+ describe('without partials', function (){
+ before(function (done) {
+ fs.readFile(cliTxt, function onFsEnd (err, data) {
+ if (err) return done(err);
+
+ expectedOutput = data.toString();
+ done();
+ });
});
- });
- it('reads view data from stdin when first argument equals "-"', function(done){
- exec('cat test/_files/cli.json | bin/mustache - test/_files/cli.mustache', function(err, stdout, stderr) {
- assert.equal(err, null);
- assert.equal(stderr, '');
- assert.equal(stdout, expectedOutput);
- done();
+ it('writes rendered template into stdout when successfull', function (done) {
+ exec('bin/mustache test/_files/cli.json test/_files/cli.mustache', function (err, stdout, stderr) {
+ assert.equal(err, null);
+ assert.equal(stderr, '');
+ assert.equal(stdout, expectedOutput);
+ done();
+ });
});
- });
- it('writes it couldnt find template into stderr when second argument doesnt resolve to a file', function(done) {
- exec('bin/mustache test/_files/cli.json test/_files/non-existing-template.mustache', function(err, stdout, stderr) {
- assert.notEqual(stderr.indexOf('Could not find file: test/_files/non-existing-template.mustache'), -1);
- done();
+ it('can handle view written in JavaScript with .js suffix', function (done) {
+ exec('bin/mustache test/_files/cli.js test/_files/cli.mustache', function (err, stdout, stderr) {
+ assert.equal(err, null);
+ assert.equal(stderr, '');
+ assert.equal(stdout, expectedOutput);
+ done();
+ });
});
- });
- it('writes it couldnt find view into stderr when first argument doesnt resolve to a file', function(done) {
- exec('bin/mustache test/_files/non-existing-view.json test/_files/cli.mustache', function(err, stdout, stderr) {
- assert.notEqual(stderr.indexOf('Could not find file: test/_files/non-existing-view.json'), -1);
- done();
+ it('can handle view written in JavaScript with .cjs suffix', function (done) {
+ exec('bin/mustache test/_files/cli.cjs test/_files/cli.mustache', function (err, stdout, stderr) {
+ assert.equal(err, null);
+ assert.equal(stderr, '');
+ assert.equal(stdout, expectedOutput);
+ done();
+ });
+ });
+
+ it('writes rendered template into the file specified by the third argument', function (done) {
+ var outputFile = 'test/_files/cli_output.txt';
+ exec('bin/mustache test/_files/cli.json test/_files/cli.mustache ' + outputFile, function (err, stdout, stderr) {
+ assert.equal(err, null);
+ assert.equal(stderr, '');
+ assert.equal(stdout, '');
+ assert.equal(fs.readFileSync(outputFile), expectedOutput);
+ fs.unlinkSync('test/_files/cli_output.txt');
+ done();
+ });
+ });
+
+ it('reads view data from stdin when first argument equals "-"', function (done){
+ exec('cat test/_files/cli.json | bin/mustache - test/_files/cli.mustache', function (err, stdout, stderr) {
+ assert.equal(err, null);
+ assert.equal(stderr, '');
+ assert.equal(stdout, expectedOutput);
+ done();
+ });
+ });
+
+ it('writes it couldnt find template into stderr when second argument doesnt resolve to a file', function (done) {
+ exec('bin/mustache test/_files/cli.json test/_files/non-existing-template.mustache', function (err, stdout, stderr) {
+ assert.isOk(/Could not find file: .+non-existing-template\.mustache/.test(stderr));
+ done();
+ });
+ });
+
+ it('writes it couldnt find view into stderr when first argument doesnt resolve to a file', function (done) {
+ exec('bin/mustache test/_files/non-existing-view.json test/_files/cli.mustache', function (err, stdout, stderr) {
+ assert.isOk(/Could not find file: .+non-existing-view\.json/.test(stderr));
+ done();
+ });
});
});
+
+ describe('with partials', function (){
+ before(function (done) {
+ fs.readFile(cliPartialsTxt, function onFsEnd (err, data) {
+ if (err) return done(err);
+
+ expectedOutput = data.toString();
+ done();
+ });
+ });
+
+ it('writes rendered template with partials into stdout', function (done) {
+ exec('bin/mustache test/_files/cli_with_partials.json test/_files/cli_with_partials.mustache -p test/_files/cli.mustache -p test/_files/comments.mustache', function (err, stdout, stderr) {
+ assert.equal(err, null);
+ assert.equal(stderr, '');
+ assert.equal(stdout, expectedOutput);
+ done();
+ });
+ });
+
+ it('writes rendered template with partials when partials args before required args', function (done) {
+ exec('bin/mustache -p test/_files/cli.mustache -p test/_files/comments.mustache test/_files/cli_with_partials.json test/_files/cli_with_partials.mustache', function (err, stdout, stderr) {
+ assert.equal(err, null);
+ assert.equal(stderr, '');
+ assert.equal(stdout, expectedOutput);
+ done();
+ });
+ });
+ });
});
diff --git a/test/helper.js b/test/helper.js
index 298876621..aa9f83dd3 100644
--- a/test/helper.js
+++ b/test/helper.js
@@ -1,4 +1,18 @@
var chai = require('chai');
+var isRunningInNode = process !== undefined && process.versions.node !== undefined;
+
+if (isRunningInNode) {
+ var nodejsMajorVersion = Number(process.versions.node.split('.')[0]);
+ isLegacyNodeVersion = !(nodejsMajorVersion >= 10);
+
+ if (!isLegacyNodeVersion) {
+ // The `zuul` package we use to run tests in browsers via Saucelabs eagerly loads all
+ // packages it sees being used via `require()`. Because we don't want the `esm` package
+ // to be loaded when running browser tests, we refer to `require()` via `module.require()`
+ // because that avoid the mentioned eager loading
+ module.require = module.require('esm')(module);
+ }
+}
assert = chai.assert;
chai.should();
Mustache = require('../mustache');
diff --git a/test/module-systems/.eslintrc b/test/module-systems/.eslintrc
new file mode 100644
index 000000000..6a3e37c78
--- /dev/null
+++ b/test/module-systems/.eslintrc
@@ -0,0 +1,6 @@
+{
+ "extends": "../.eslintrc",
+ "parserOptions": {
+ "ecmaVersion": 2017
+ }
+}
diff --git a/test/module-systems/_fixtures/amd.html b/test/module-systems/_fixtures/amd.html
new file mode 100644
index 000000000..5a5b268e9
--- /dev/null
+++ b/test/module-systems/_fixtures/amd.html
@@ -0,0 +1,26 @@
+
+
+
+
+
+
+Text content to be overwritten
+
diff --git a/test/module-systems/_fixtures/global-scope.html b/test/module-systems/_fixtures/global-scope.html
new file mode 100644
index 000000000..eeb241486
--- /dev/null
+++ b/test/module-systems/_fixtures/global-scope.html
@@ -0,0 +1,15 @@
+
+
+
+
+
+Text content to be overwritten
+
+
diff --git a/test/module-systems/browser-test.js b/test/module-systems/browser-test.js
new file mode 100644
index 000000000..c58c231f0
--- /dev/null
+++ b/test/module-systems/browser-test.js
@@ -0,0 +1,49 @@
+const fs = require('fs');
+const path = require('path');
+const puppeteer = require('puppeteer');
+const chai = require('chai');
+
+const mustache = fs.readFileSync(path.join(__dirname, '../../mustache.js'), 'utf8');
+
+describe('Browser usage', () => {
+
+ let browser;
+ let page;
+
+ before(async function () {
+ this.timeout(10 * 1000);
+
+ // Awkward .launch() options below are needed to avoid hitting timeouts
+ // when tests are run in GitHub Actions for some weird reason
+ // https://github.com/GoogleChrome/puppeteer/issues/4617
+ browser = await puppeteer.launch({ignoreDefaultArgs: ['--disable-extensions']});
+
+ page = await browser.newPage();
+ page.on('console', msg => console.log('PAGE LOG:', msg.text()));
+ page.on('pageerror', err => console.error('PAGE ERROR:', err));
+ });
+
+ after(() => browser.close());
+
+ it('is exposed on the global scope as window.Mustache', async () => {
+ await page.goto(`file://${path.join(__dirname, '_fixtures/global-scope.html')}`);
+
+ const bodyElement = await page.$('body');
+ const textContentProperty = await bodyElement.getProperty('textContent');
+ const value = await textContentProperty.jsonValue();
+
+ chai.assert.equal(value.trim(), 'Joe spends 6');
+ });
+
+ it('is exposed as AMD and consumable via RequireJS', async function () {
+ this.timeout(10 * 1000);
+
+ await page.goto(`file://${path.join(__dirname, '_fixtures/amd.html')}`, { waitUntil: 'networkidle0' });
+
+ const bodyElement = await page.$('body');
+ const textContentProperty = await bodyElement.getProperty('textContent');
+ const value = await textContentProperty.jsonValue();
+
+ chai.assert.equal(value, 'Joe spends 6');
+ });
+});
diff --git a/test/module-systems/commonjs-test.js b/test/module-systems/commonjs-test.js
new file mode 100644
index 000000000..357c569bd
--- /dev/null
+++ b/test/module-systems/commonjs-test.js
@@ -0,0 +1,12 @@
+const assert = require('assert');
+const mustache = require('mustache');
+
+const view = {
+ title: 'Joe',
+ calc: () => 2 + 4
+};
+
+assert.strictEqual(
+ mustache.render('{{title}} spends {{calc}}', view),
+ 'Joe spends 6'
+);
diff --git a/test/module-systems/deno-test.ts b/test/module-systems/deno-test.ts
new file mode 100644
index 000000000..cd991b485
--- /dev/null
+++ b/test/module-systems/deno-test.ts
@@ -0,0 +1,16 @@
+import { assertEquals } from "https://deno.land/std@0.51.0/testing/asserts.ts";
+import mustache from "../../mustache.mjs";
+
+const view = {
+ title: "Joe",
+ calc: function() {
+ return 2 + 4;
+ }
+};
+
+Deno.test("can use mustache", () => {
+ assertEquals(
+ mustache.render("{{title}} spends {{calc}}", view),
+ "Joe spends 6"
+ );
+});
diff --git a/test/module-systems/esm-test-exports.mjs b/test/module-systems/esm-test-exports.mjs
new file mode 100644
index 000000000..d79feb629
--- /dev/null
+++ b/test/module-systems/esm-test-exports.mjs
@@ -0,0 +1,12 @@
+import assert from 'assert';
+import mustache from 'mustache';
+
+const view = {
+ title: 'Joe',
+ calc: () => 2 + 4
+};
+
+assert.strictEqual(
+ mustache.render('{{title}} spends {{calc}}', view),
+ 'Joe spends 6'
+);
diff --git a/test/module-systems/esm-test.mjs b/test/module-systems/esm-test.mjs
new file mode 100644
index 000000000..050e4c04b
--- /dev/null
+++ b/test/module-systems/esm-test.mjs
@@ -0,0 +1,12 @@
+import assert from 'assert';
+import mustache from 'mustache/mustache.mjs';
+
+const view = {
+ title: 'Joe',
+ calc: () => 2 + 4
+};
+
+assert.strictEqual(
+ mustache.render('{{title}} spends {{calc}}', view),
+ 'Joe spends 6'
+);
diff --git a/test/mustache-spec-test.js b/test/mustache-spec-test.js
index 0c6e537ac..0e5001899 100644
--- a/test/mustache-spec-test.js
+++ b/test/mustache-spec-test.js
@@ -16,8 +16,7 @@ var skipTests = {
],
partials: [
'Standalone Without Previous Line',
- 'Standalone Without Newline',
- 'Standalone Indentation'
+ 'Standalone Without Newline'
],
sections: [
'Standalone Without Newline'
@@ -33,7 +32,7 @@ var skipTests = {
]
};
-// You can run the skiped tests by setting the NOSKIP environment variable to
+// You can run the skipped tests by setting the NOSKIP environment variable to
// true (e.g. NOSKIP=true mocha test/mustache-spec-test.js)
var noSkip = process.env.NOSKIP;
@@ -42,7 +41,7 @@ var noSkip = process.env.NOSKIP;
var fileToRun = process.env.TEST;
// Mustache should work on node 0.6 that doesn't have fs.existsSync
-function existsDir(path) {
+function existsDir (path) {
try {
return fs.statSync(path).isDirectory();
} catch (x) {
@@ -63,21 +62,21 @@ if (fileToRun) {
specFiles = [];
}
-function getSpecs(specArea) {
+function getSpecs (specArea) {
return JSON.parse(fs.readFileSync(path.join(specsDir, specArea + '.' + 'json'), 'utf8'));
}
-describe('Mustache spec compliance', function() {
+describe('Mustache spec compliance', function () {
beforeEach(function () {
Mustache.clearCache();
});
- specFiles.forEach(function(specArea) {
- describe('- ' + specArea + ':', function() {
+ specFiles.forEach(function (specArea) {
+ describe('- ' + specArea + ':', function () {
var specs = getSpecs(specArea);
- specs.tests.forEach(function(test) {
+ specs.tests.forEach(function (test) {
var it_ = (!noSkip && skipTests[specArea] && skipTests[specArea].indexOf(test.name) >= 0) ? it.skip : it;
- it_(test.name + ' - ' + test.desc, function() {
+ it_(test.name + ' - ' + test.desc, function () {
if (test.data.lambda && test.data.lambda.__tag__ === 'code')
test.data.lambda = eval('(function() { return ' + test.data.lambda.js + '; })');
var output = Mustache.render(test.template, test.data, test.partials);
diff --git a/test/parse-test.js b/test/parse-test.js
index 97c26db94..1fb2cabe4 100644
--- a/test/parse-test.js
+++ b/test/parse-test.js
@@ -40,9 +40,12 @@ var expectations = {
'a\n{{#a}}\n{{#b}}\n{{/b}}\n{{/a}}\nb' : [ [ 'text', 'a\n', 0, 2 ], [ '#', 'a', 2, 8, [ [ '#', 'b', 9, 15, [], 16 ] ], 23 ], [ 'text', 'b', 30, 31 ] ],
'a\n {{#a}}\n{{#b}}\n{{/b}}\n{{/a}}\nb' : [ [ 'text', 'a\n', 0, 2 ], [ '#', 'a', 3, 9, [ [ '#', 'b', 10, 16, [], 17 ] ], 24 ], [ 'text', 'b', 31, 32 ] ],
'a\n {{#a}}\n{{#b}}\n{{/b}}\n{{/a}} \nb' : [ [ 'text', 'a\n', 0, 2 ], [ '#', 'a', 3, 9, [ [ '#', 'b', 10, 16, [], 17 ] ], 24 ], [ 'text', 'b', 32, 33 ] ],
- '{{>abc}}' : [ [ '>', 'abc', 0, 8 ] ],
- '{{> abc }}' : [ [ '>', 'abc', 0, 10 ] ],
- '{{ > abc }}' : [ [ '>', 'abc', 0, 11 ] ],
+ '{{>abc}}' : [ [ '>', 'abc', 0, 8, '', 0, false ] ],
+ '{{> abc }}' : [ [ '>', 'abc', 0, 10, '', 0, false ] ],
+ '{{ > abc }}' : [ [ '>', 'abc', 0, 11, '', 0, false ] ],
+ ' {{> abc }}\n' : [ [ '>', 'abc', 2, 12, ' ', 0, false ] ],
+ ' {{> abc }} {{> abc }}\n' : [ [ '>', 'abc', 2, 12, ' ', 0, false ], [ '>', 'abc', 13, 23, ' ', 1, false ] ],
+ '{{ > abc }}' : [ [ '>', 'abc', 0, 11, '', 0, false ] ],
'{{=<% %>=}}' : [ [ '=', '<% %>', 0, 11 ] ],
'{{= <% %> =}}' : [ [ '=', '<% %>', 0, 13 ] ],
'{{=<% %>=}}<%={{ }}=%>' : [ [ '=', '<% %>', 0, 11 ], [ '=', '{{ }}', 11, 22 ] ],
@@ -53,6 +56,16 @@ var expectations = {
: [ [ '#', 'foo', 0, 8, [ [ '#', 'a', 11, 17, [ [ 'text', ' ', 18, 22 ], [ 'name', 'b', 22, 27 ], [ 'text', '\n', 27, 28 ] ], 30 ] ], 37 ] ]
};
+var originalTemplateCache;
+before(function () {
+ originalTemplateCache = Mustache.templateCache;
+});
+
+beforeEach(function (){
+ Mustache.clearCache();
+ Mustache.templateCache = originalTemplateCache;
+});
+
describe('Mustache.parse', function () {
for (var template in expectations) {
@@ -103,4 +116,90 @@ describe('Mustache.parse', function () {
});
});
+ describe('when parsing a template without tags specified followed by the same template with tags specified', function () {
+ it('returns different tokens for the latter parse', function () {
+ var template = '{{foo}}[bar]';
+ var parsedWithBraces = Mustache.parse(template);
+ var parsedWithBrackets = Mustache.parse(template, ['[', ']']);
+ assert.notDeepEqual(parsedWithBrackets, parsedWithBraces);
+ });
+ });
+
+ describe('when parsing a template with tags specified followed by the same template with different tags specified', function () {
+ it('returns different tokens for the latter parse', function () {
+ var template = '(foo)[bar]';
+ var parsedWithParens = Mustache.parse(template, ['(', ')']);
+ var parsedWithBrackets = Mustache.parse(template, ['[', ']']);
+ assert.notDeepEqual(parsedWithBrackets, parsedWithParens);
+ });
+ });
+
+ describe('when parsing a template after already having parsed that template with a different Mustache.tags', function () {
+ it('returns different tokens for the latter parse', function () {
+ var template = '{{foo}}[bar]';
+ var parsedWithBraces = Mustache.parse(template);
+
+ var oldTags = Mustache.tags;
+ Mustache.tags = ['[', ']'];
+ var parsedWithBrackets = Mustache.parse(template);
+ Mustache.tags = oldTags;
+
+ assert.notDeepEqual(parsedWithBrackets, parsedWithBraces);
+ });
+ });
+
+ describe('when parsing a template with the same tags second time, return the cached tokens', function () {
+ it('returns the same tokens for the latter parse', function () {
+ var template = '{{foo}}[bar]';
+ var parsedResult1 = Mustache.parse(template);
+ var parsedResult2 = Mustache.parse(template);
+
+ assert.deepEqual(parsedResult1, parsedResult2);
+ assert.ok(parsedResult1 === parsedResult2);
+ });
+ });
+
+ describe('when parsing a template with caching disabled and the same tags second time, do not return the cached tokens', function () {
+ it('returns different tokens for the latter parse', function () {
+ Mustache.templateCache = undefined;
+ var template = '{{foo}}[bar]';
+ var parsedResult1 = Mustache.parse(template);
+ var parsedResult2 = Mustache.parse(template);
+
+ assert.deepEqual(parsedResult1, parsedResult2);
+ assert.ok(parsedResult1 !== parsedResult2);
+ });
+ });
+
+ describe('when parsing a template with custom caching and the same tags second time, do not return the cached tokens', function () {
+ it('returns the same tokens for the latter parse', function () {
+ Mustache.templateCache = {
+ _cache: [],
+ set: function set (key, value) {
+ this._cache.push([key, value]);
+ },
+ get: function get (key) {
+ var cacheLength = this._cache.length;
+ for (var i = 0; i < cacheLength; i++) {
+ var entry = this._cache[i];
+ if (entry[0] === key) {
+ return entry[1];
+ }
+ }
+ return undefined;
+ },
+ clear: function clear () {
+ this._cache = [];
+ }
+ };
+
+ var template = '{{foo}}[bar]';
+ var parsedResult1 = Mustache.parse(template);
+ var parsedResult2 = Mustache.parse(template);
+
+ assert.deepEqual(parsedResult1, parsedResult2);
+ assert.ok(parsedResult1 === parsedResult2);
+ });
+ });
+
});
diff --git a/test/partial-test.js b/test/partial-test.js
new file mode 100644
index 000000000..54d62b581
--- /dev/null
+++ b/test/partial-test.js
@@ -0,0 +1,175 @@
+/* eslint-disable func-names */
+require('./helper');
+
+describe('Partials spec', function () {
+ beforeEach(function () {
+ Mustache.clearCache();
+ });
+
+
+ it('The greater-than operator should expand to the named partial.', function () {
+ var template = '"{{>text}}"';
+ var data = {};
+ var partials = {'text':'from partial'};
+ var expected = '"from partial"';
+ var renderResult = Mustache.render(template, data, partials);
+ assert.equal(renderResult, expected);
+ });
+ it('The empty string should be used when the named partial is not found.', function () {
+ var template = '"{{>text}}"';
+ var data = {};
+ var partials = {};
+ var expected = '""';
+ var renderResult = Mustache.render(template, data, partials);
+ assert.equal(renderResult, expected);
+ });
+ it('The greater-than operator should operate within the current context.', function () {
+ var template = '"{{>partial}}"';
+ var data = {'text':'content'};
+ var partials = {'partial':'*{{text}}*'};
+ var expected = '"*content*"';
+ var renderResult = Mustache.render(template, data, partials);
+ assert.equal(renderResult, expected);
+ });
+ it('Inline partials should not be indented', function () {
+ var template = ' {{> partial}}';
+ var data = {};
+ var partials = {'partial':'This is a partial.'};
+ var expected = ' This is a partial.';
+ var renderResult = Mustache.render(template, data, partials);
+ assert.equal(renderResult, expected);
+ });
+
+ it('Inline partials should not be indented (multiline)', function () {
+ var template = ' {{> partial}}';
+ var data = {};
+ var partials = {'partial':'This is a\npartial.'};
+ var expected = ' This is a\n partial.';
+ var renderResult = Mustache.render(template, data, partials);
+ assert.equal(renderResult, expected);
+ });
+
+ it('The greater-than operator should properly recurse.', function () {
+ var template = '{{>node}}';
+ var data = {'content':'X','nodes':[{'content':'Y','nodes':[]}]};
+ var partials = {'node':'{{content}}<{{#nodes}}{{>node}}{{/nodes}}>'};
+ var expected = 'X>';
+ var renderResult = Mustache.render(template, data, partials);
+ assert.equal(renderResult, expected);
+ });
+ it('The greater-than operator should not alter surrounding whitespace.', function () {
+ var template = '| {{>partial}} |';
+ var data = {};
+ var partials = {'partial':'\t|\t'};
+ var expected = '| \t|\t |';
+ var renderResult = Mustache.render(template, data, partials);
+ assert.equal(renderResult, expected);
+ });
+ it('"\r\n" should be considered a newline for standalone tags.', function () {
+ var template = '|\r\n{{>partial}}\r\n|';
+ var data = {};
+ var partials = {'partial':'>'};
+ var expected = '|\r\n>|';
+ var renderResult = Mustache.render(template, data, partials);
+ assert.equal(renderResult, expected);
+ });
+ it('Standalone tags should not require a newline to precede them.', function () {
+ var template = ' {{>partial}}\n>';
+ var data = {};
+ var partials = {'partial':'>\n>'};
+ var expected = ' >\n >>';
+ var renderResult = Mustache.render(template, data, partials);
+ assert.equal(renderResult, expected);
+ });
+ it('Superfluous in-tag whitespace should be ignored.', function () {
+ var template = '|{{> partial }}|';
+ var data = {'boolean':true};
+ var partials = {'partial':'[]'};
+ var expected = '|[]|';
+ var renderResult = Mustache.render(template, data, partials);
+ assert.equal(renderResult, expected);
+ });
+ it('Each line of the partial should be indented before rendering.', function () {
+ var template = '\\\n {{>partial}}\n/\n';
+ var data = {
+ 'content': '<\n->'
+ };
+ var partials = {
+ 'partial': '|\n{{{content}}}\n|\n'
+ };
+ var expected = '\\\n |\n <\n->\n |\n/\n';
+ var renderResult = Mustache.render(template, data, partials);
+ assert.equal(renderResult, expected);
+ });
+
+ it('Standalone tags should not require a newline to follow them.', function () {
+ var template = '>\n {{>partial}}';
+ var data = {
+
+ };
+ var partials = {
+ 'partial': '>\n>'
+ };
+ var expected = '>\n >\n >';
+ var renderResult = Mustache.render(template, data, partials);
+ assert.equal(renderResult, expected);
+ });
+
+ it('Whitespace should be left untouched.', function () {
+ var template = ' {{data}} {{> partial}}\n';
+ var data = {
+ 'data': '|'
+ };
+ var partials = {
+ 'partial': '>\n>'
+ };
+ var expected = ' | >\n>\n';
+ var renderResult = Mustache.render(template, data, partials);
+ assert.equal(renderResult, expected);
+ });
+
+ it('Partial without indentation should inherit functions.', function () {
+ var template = '{{> partial }}';
+ var data = {
+ toUpperCase: function () {
+ return function (label) {
+ return label.toUpperCase();
+ };
+ }
+ };
+ var partials = {partial: 'aA-{{ #toUpperCase }}Input{{ /toUpperCase }}-Aa'};
+ var expected = 'aA-INPUT-Aa';
+ var renderResult = Mustache.render(template, data, partials);
+ assert.equal(renderResult, expected);
+ });
+
+ it('Partial with indentation should inherit functions.', function () {
+ var template = ' {{> partial }}';
+ var data = {
+ toUpperCase: function () {
+ return function (label) {
+ return label.toUpperCase();
+ };
+ }
+ };
+ var partials = {partial: 'aA-{{ #toUpperCase }}Input{{ /toUpperCase }}-Aa'};
+ var expected = ' aA-INPUT-Aa';
+ var renderResult = Mustache.render(template, data, partials);
+ assert.equal(renderResult, expected);
+ });
+
+ it('Nested partials should support custom delimiters.', function () {
+ var tags = ['[[', ']]'];
+ var template = '[[> level1 ]]';
+ var partials = {
+ level1: 'partial 1\n[[> level2]]',
+ level2: 'partial 2\n[[> level3]]',
+ level3: 'partial 3\n[[> level4]]',
+ level4: 'partial 4\n[[> level5]]',
+ level5: 'partial 5',
+ };
+ var expected = 'partial 1\npartial 2\npartial 3\npartial 4\npartial 5';
+ var renderResult = Mustache.render(template, {}, partials, tags);
+ assert.equal(renderResult, expected);
+ });
+});
diff --git a/test/render-helper.js b/test/render-helper.js
index 11e73c9f7..1f25dcf1e 100644
--- a/test/render-helper.js
+++ b/test/render-helper.js
@@ -3,7 +3,7 @@ var path = require('path');
var _files = path.join(__dirname, '_files');
-function getContents(testName, ext) {
+function getContents (testName, ext) {
try {
return fs.readFileSync(path.join(_files, testName + '.' + ext), 'utf8');
} catch (ex) {
@@ -11,13 +11,14 @@ function getContents(testName, ext) {
}
}
-function getView(testName) {
+function getView (testName) {
var view = getContents(testName, 'js');
+ if (!view) view = getContents(testName, 'cjs');
if (!view) throw new Error('Cannot find view for test "' + testName + '"');
return view;
}
-function getPartial(testName) {
+function getPartial (testName) {
try {
return getContents(testName, 'partial');
} catch (error) {
@@ -34,13 +35,13 @@ if (testToRun) {
testNames = testToRun.split(',');
} else {
testNames = fs.readdirSync(_files).filter(function (file) {
- return (/\.js$/).test(file);
+ return (/\.c?js$/).test(file);
}).map(function (file) {
- return path.basename(file).replace(/\.js$/, '');
+ return path.basename(file).replace(/\.c?js$/, '');
});
}
-function getTest(testName) {
+function getTest (testName) {
return {
name: testName,
view: getView(testName),
@@ -50,6 +51,6 @@ function getTest(testName) {
};
}
-exports.getTests = function getTests() {
+exports.getTests = function getTests () {
return testNames.map(getTest);
};
\ No newline at end of file
diff --git a/test/render-test-browser-tmpl.mustache b/test/render-test-browser-tmpl.mustache
index 808389121..b9b14ae45 100644
--- a/test/render-test-browser-tmpl.mustache
+++ b/test/render-test-browser-tmpl.mustache
@@ -1,3 +1,4 @@
+/* eslint-disable */
require('./helper');
describe('Mustache.render', function () {
diff --git a/test/render-test.js b/test/render-test.js
index e9d61a9da..d05552314 100644
--- a/test/render-test.js
+++ b/test/render-test.js
@@ -17,6 +17,216 @@ describe('Mustache.render', function () {
'for mustache#render(template, view, partials)');
});
+ describe('custom tags', function () {
+ it('uses tags argument instead of Mustache.tags when given', function () {
+ var template = '<>bar{{placeholder}}';
+
+ Mustache.tags = ['{{', '}}'];
+ assert.equal(Mustache.render(template, { placeholder: 'foo' }, {}, ['<<', '>>']), 'foobar{{placeholder}}');
+ });
+
+ it('uses config.tags argument instead of Mustache.tags when given', function () {
+ var template = '<>bar{{placeholder}}';
+
+ Mustache.tags = ['{{', '}}'];
+ assert.equal(Mustache.render(template, { placeholder: 'foo' }, {}, { tags: ['<<', '>>']}), 'foobar{{placeholder}}');
+ });
+
+ it('uses tags argument instead of Mustache.tags when given, even when it previously rendered the template using Mustache.tags', function () {
+ var template = '((placeholder))bar{{placeholder}}';
+
+ Mustache.tags = ['{{', '}}'];
+ Mustache.render(template, { placeholder: 'foo' });
+ assert.equal(Mustache.render(template, { placeholder: 'foo' }, {}, ['((', '))']), 'foobar{{placeholder}}');
+ });
+
+ it('uses config.tags argument instead of Mustache.tags when given, even when it previously rendered the template using Mustache.tags', function () {
+ var template = '((placeholder))bar{{placeholder}}';
+
+ Mustache.tags = ['{{', '}}'];
+ Mustache.render(template, { placeholder: 'foo' });
+ assert.equal(Mustache.render(template, { placeholder: 'foo' }, {}, { tags: ['((', '))'] }), 'foobar{{placeholder}}');
+ });
+
+ it('uses tags argument instead of Mustache.tags when given, even when it previously rendered the template using different tags', function () {
+ var template = '[[placeholder]]bar<>';
+
+ Mustache.render(template, { placeholder: 'foo' }, {}, ['<<', '>>']);
+ assert.equal(Mustache.render(template, { placeholder: 'foo' }, {}, ['[[', ']]']), 'foobar<>');
+ });
+
+ it('uses config.tags argument instead of Mustache.tags when given, even when it previously rendered the template using different tags', function () {
+ var template = '[[placeholder]]bar<>';
+
+ Mustache.render(template, { placeholder: 'foo' }, {}, ['<<', '>>']);
+ assert.equal(Mustache.render(template, { placeholder: 'foo' }, {}, { tags: ['[[', ']]'] }), 'foobar<>');
+ });
+
+ it('does not mutate Mustache.tags when given tags argument', function () {
+ var correctMustacheTags = ['{{', '}}'];
+ Mustache.tags = correctMustacheTags;
+
+ Mustache.render('((placeholder))', { placeholder: 'foo' }, {}, ['((', '))']);
+
+ assert.equal(Mustache.tags, correctMustacheTags);
+ assert.deepEqual(Mustache.tags, ['{{', '}}']);
+ });
+
+ it('does not mutate Mustache.tags when given config.tags argument', function () {
+ var correctMustacheTags = ['{{', '}}'];
+ Mustache.tags = correctMustacheTags;
+
+ Mustache.render('((placeholder))', { placeholder: 'foo' }, {}, { tags: ['((', '))'] });
+
+ assert.equal(Mustache.tags, correctMustacheTags);
+ assert.deepEqual(Mustache.tags, ['{{', '}}']);
+ });
+
+ it('uses provided tags when rendering partials', function () {
+ var output = Mustache.render('<%> partial %>', { name: 'Santa Claus' }, {
+ partial: '<% name %>'
+ }, ['<%', '%>']);
+
+ assert.equal(output, 'Santa Claus');
+ });
+
+ it('uses provided config.tags when rendering partials', function () {
+ var output = Mustache.render('<%> partial %>', { name: 'Santa Claus' }, {
+ partial: '<% name %>'
+ }, { tags: ['<%', '%>'] });
+
+ assert.equal(output, 'Santa Claus');
+ });
+
+ it('uses config.escape argument instead of Mustache.escape when given', function () {
+ var template = 'Hello, {{placeholder}}';
+
+ function escapeBang (text) {
+ return text + '!';
+ }
+ assert.equal(Mustache.render(template, { placeholder: 'world' }, {}, { escape: escapeBang }), 'Hello, world!');
+ });
+
+ it('uses config.escape argument instead of Mustache.escape when given, even when it previously rendered the template using Mustache.escape', function () {
+ var template = 'Hello, {{placeholder}}';
+
+ function escapeQuestion (text) {
+ return text + '?';
+ }
+ Mustache.render(template, { placeholder: 'world' });
+ assert.equal(Mustache.render(template, { placeholder: 'world' }, {}, { escape: escapeQuestion }), 'Hello, world?');
+ });
+
+ it('uses config.escape argument instead of Mustache.escape when given, even when it previously rendered the template using a different escape function', function () {
+ var template = 'Hello, {{placeholder}}';
+
+ function escapeQuestion (text) {
+ return text + '?';
+ }
+ function escapeBang (text) {
+ return text + '!';
+ }
+ Mustache.render(template, { placeholder: 'foo' }, {}, { escape: escapeQuestion });
+ assert.equal(Mustache.render(template, { placeholder: 'foo' }, {}, { escape: escapeBang }), 'Hello, foo!');
+ });
+
+ it('does not mutate Mustache.escape when given config.escape argument', function () {
+ var correctMustacheEscape = Mustache.escape;
+
+ function escapeNone (text) {
+ return text;
+ }
+ Mustache.render('((placeholder))', { placeholder: 'foo' }, {}, { escape: escapeNone });
+
+ assert.equal(Mustache.escape, correctMustacheEscape);
+ assert.equal(Mustache.escape('>&'), '>&');
+ });
+
+ it('uses provided config.escape when rendering partials', function () {
+ function escapeDoubleAmpersand (text) {
+ return text.replace('&', '&&');
+ }
+ var output = Mustache.render('{{> partial }}', { name: 'Ampersand &' }, {
+ partial: '{{ name }}'
+ }, { escape: escapeDoubleAmpersand });
+
+ assert.equal(output, 'Ampersand &&');
+ });
+
+ it('uses config.tags and config.escape arguments instead of Mustache.tags and Mustache.escape when given', function () {
+ var template = 'Hello, {{placeholder}} [[placeholder]]';
+
+ function escapeTwoBangs (text) {
+ return text + '!!';
+ }
+ var config = {
+ tags: ['[[', ']]'],
+ escape: escapeTwoBangs,
+ };
+ assert.equal(Mustache.render(template, { placeholder: 'world' }, {}, config), 'Hello, {{placeholder}} world!!');
+ });
+
+ it('uses provided config.tags and config.escape when rendering partials', function () {
+ function escapeDoubleAmpersand (text) {
+ return text.replace('&', '&&');
+ }
+ var config = {
+ tags: ['[[', ']]'],
+ escape: escapeDoubleAmpersand
+ };
+ var output = Mustache.render('[[> partial ]]', { name: 'Ampersand &' }, {
+ partial: '[[ name ]]'
+ }, config);
+
+ assert.equal(output, 'Ampersand &&');
+ });
+
+ it('uses provided config.tags and config.escape when rendering sections', function () {
+ var template = (
+ '<[[&value-raw]]: ' +
+ '[[#test-1]][[value-1]][[/test-1]]' +
+ '[[^test-2]][[value-2]][[/test-2]], ' +
+ '[[#test-lambda]][[value-lambda]][[/test-lambda]]' +
+ '>'
+ );
+
+ function escapeQuotes (text) {
+ return '"' + text + '"';
+ }
+ var config = {
+ tags: ['[[', ']]'],
+ escape: escapeQuotes
+ };
+ var viewTestTrue = {
+ 'value-raw': 'foo',
+ 'test-1': true,
+ 'value-1': 'abc',
+ 'test-2': true,
+ 'value-2': '123',
+ 'test-lambda': function () {
+ return function (text, render) { return 'lambda: ' + render(text); };
+ },
+ 'value-lambda': 'bar'
+ };
+ var viewTestFalse = {
+ 'value-raw': 'foo',
+ 'test-1': false,
+ 'value-1': 'abc',
+ 'test-2': false,
+ 'value-2': '123',
+ 'test-lambda': function () {
+ return function (text, render) { return 'lambda: ' + render(text); };
+ },
+ 'value-lambda': 'bar'
+ };
+ var outputTrue = Mustache.render(template, viewTestTrue, {}, config);
+ var outputFalse = Mustache.render(template, viewTestFalse, {}, config);
+
+ assert.equal(outputTrue, '');
+ assert.equal(outputFalse, '');
+ });
+ });
+
tests.forEach(function (test) {
var view = eval(test.view);