<%= foo %>
', {client: true}); str = fn.toString(); if (!process.env.running_under_istanbul) { @@ -116,9 +117,9 @@ suite('ejs.compile(str, options)', function () { }); test('support client mode without locals', function () { - var fn - , str - , preFn; + var fn; + var str; + var preFn; fn = ejs.compile('<%= "foo" %>
', {client: true}); str = fn.toString(); if (!process.env.running_under_istanbul) { @@ -129,16 +130,16 @@ suite('ejs.compile(str, options)', function () { test('not include rethrow() in client mode if compileDebug is false', function () { var fn = ejs.compile('<%= "foo" %>
', { - client: true - , compileDebug: false - }); + client: true, + compileDebug: false + }); // There could be a `rethrow` in the function declaration assert((fn.toString().match(/rethrow/g) || []).length <= 1); }); test('support custom escape function', function () { - var customEscape - , fn; + var customEscape; + var fn; customEscape = function customEscape(str) { return !str ? '' : str.toUpperCase(); }; @@ -147,9 +148,9 @@ suite('ejs.compile(str, options)', function () { }); test('support custom escape function in client mode', function () { - var customEscape - , fn - , str; + var customEscape; + var fn; + var str; customEscape = function customEscape(str) { return !str ? '' : str.toUpperCase(); }; @@ -157,7 +158,7 @@ suite('ejs.compile(str, options)', function () { str = fn.toString(); if (!process.env.running_under_istanbul) { eval('var preFn = ' + str); - assert.equal(preFn({name: 'world'}), 'HELLO WORLD'); + assert.equal(preFn({name: 'world'}), 'HELLO WORLD'); // eslint-disable-line no-undef } }); @@ -228,10 +229,10 @@ suite('ejs.render(str, data, opts)', function () { }); test('support caching', function () { - var file = __dirname + '/tmp/render.ejs' - , options = {cache: true, filename: file} - , out = ejs.render('Old
', {}, options) - , expected = 'Old
'; + var file = __dirname + '/tmp/render.ejs'; + var options = {cache: true, filename: file}; + var out = ejs.render('Old
', {}, options); + var expected = 'Old
'; assert.equal(out, expected); // Assert no change, still in cache out = ejs.render('New
', {}, options); @@ -239,11 +240,11 @@ suite('ejs.render(str, data, opts)', function () { }); test('support LRU caching', function () { - var oldCache = ejs.cache - , file = __dirname + '/tmp/render.ejs' - , options = {cache: true, filename: file} - , out - , expected = 'Old
'; + var oldCache = ejs.cache; + var file = __dirname + '/tmp/render.ejs'; + var options = {cache: true, filename: file}; + var out; + var expected = 'Old
'; // Switch to LRU ejs.cache = LRU(); @@ -259,8 +260,8 @@ suite('ejs.render(str, data, opts)', function () { }); test('opts.context', function () { - var ctxt = {foo: 'FOO'} - , out = ejs.render('<%= this.foo %>', {}, {context: ctxt}); + var ctxt = {foo: 'FOO'}; + var out = ejs.render('<%= this.foo %>', {}, {context: ctxt}); assert.equal(out, ctxt.foo); }); }); @@ -277,8 +278,8 @@ suite('ejs.renderFile(path, [data], [options], fn)', function () { }); test('accept locals', function(done) { - var data = {name: 'fonebone'} - , options = {delimiter: '$'}; + var data = {name: 'fonebone'}; + var options = {delimiter: '$'}; ejs.renderFile('test/fixtures/user.ejs', data, options, function(err, html) { if (err) { return done(err); @@ -289,11 +290,10 @@ suite('ejs.renderFile(path, [data], [options], fn)', function () { }); test('accept locals without using with() {}', function(done) { - var data = {name: 'fonebone'} - , options = {delimiter: '$', _with: false} - , doneCount = 0; - ejs.renderFile('test/fixtures/user-no-with.ejs', data, options, - function(err, html) { + var data = {name: 'fonebone'}; + var options = {delimiter: '$', _with: false}; + var doneCount = 0; + ejs.renderFile('test/fixtures/user-no-with.ejs', data, options, function(err, html) { if (err) { if (doneCount === 2) { return; @@ -323,9 +323,9 @@ suite('ejs.renderFile(path, [data], [options], fn)', function () { }); test('not catch err thrown by callback', function(done) { - var data = {name: 'fonebone'} - , options = {delimiter: '$'} - , counter = 0; + var data = {name: 'fonebone'}; + var options = {delimiter: '$'}; + var counter = 0; var d = require('domain').create(); d.on('error', function (err) { @@ -340,8 +340,7 @@ suite('ejs.renderFile(path, [data], [options], fn)', function () { // domains. Have to make it async. Ticket closed because: "domains are // deprecated :D" process.nextTick(function () { - ejs.renderFile('test/fixtures/user.ejs', data, options, - function(err) { + ejs.renderFile('test/fixtures/user.ejs', data, options, function(err) { counter++; if (err) { assert.notEqual(err.message, 'Exception in callback'); @@ -354,9 +353,9 @@ suite('ejs.renderFile(path, [data], [options], fn)', function () { }); test('support caching', function (done) { - var expected = 'Old
' - , file = __dirname + '/tmp/renderFile.ejs' - , options = {cache: true}; + var expected = 'Old
'; + var file = __dirname + '/tmp/renderFile.ejs'; + var options = {cache: true}; fs.writeFileSync(file, 'Old
'); ejs.renderFile(file, {}, options, function (err, out) { @@ -379,8 +378,7 @@ suite('ejs.renderFile(path, [data], [options], fn)', function () { test('opts.context', function (done) { var ctxt = {foo: 'FOO'}; - ejs.renderFile('test/fixtures/with-context.ejs', {}, - {context: ctxt}, function(err, html) { + ejs.renderFile('test/fixtures/with-context.ejs', {}, {context: ctxt}, function(err, html) { if (err) { return done(err); } @@ -393,10 +391,10 @@ suite('ejs.renderFile(path, [data], [options], fn)', function () { suite('cache specific', function () { test('`clearCache` work properly', function () { - var expected = 'Old
' - , file = __dirname + '/tmp/clearCache.ejs' - , options = {cache: true, filename: file} - , out = ejs.render('Old
', {}, options); + var expected = 'Old
'; + var file = __dirname + '/tmp/clearCache.ejs'; + var options = {cache: true, filename: file}; + var out = ejs.render('Old
', {}, options); assert.equal(out, expected); ejs.clearCache(); @@ -407,11 +405,11 @@ suite('cache specific', function () { }); test('`clearCache` work properly, LRU', function () { - var expected = 'Old
' - , oldCache = ejs.cache - , file = __dirname + '/tmp/clearCache.ejs' - , options = {cache: true, filename: file} - , out; + var expected = 'Old
'; + var oldCache = ejs.cache; + var file = __dirname + '/tmp/clearCache.ejs'; + var options = {cache: true, filename: file}; + var out; ejs.cache = LRU(); @@ -426,11 +424,11 @@ suite('cache specific', function () { }); test('LRU with cache-size 1', function () { - var oldCache = ejs.cache - , options - , out - , expected - , file; + var oldCache = ejs.cache; + var options; + var out; + var expected; + var file; ejs.cache = LRU(1); @@ -555,13 +553,13 @@ suite('-%>', function () { }); test('works with unix style', function () { - var content = "Old
'); - var file = 'test/fixtures/include_cache.ejs' - , options = {filename: file} - , out = ejs.compile(fixture('include_cache.ejs'), options); + var file = 'test/fixtures/include_cache.ejs'; + var options = {filename: file}; + var out = ejs.compile(fixture('include_cache.ejs'), options); assert.equal(out(), 'Old
\n'); fs.writeFileSync(__dirname + '/tmp/include.ejs', 'New
'); @@ -800,10 +798,10 @@ suite('include()', function () { test('support caching', function () { fs.writeFileSync(__dirname + '/tmp/include.ejs', 'Old
'); - var file = 'test/fixtures/include_cache.ejs' - , options = {cache: true, filename: file} - , out = ejs.render(fixture('include_cache.ejs'), {}, options) - , expected = fixture('include_cache.html'); + var file = 'test/fixtures/include_cache.ejs'; + var options = {cache: true, filename: file}; + var out = ejs.render(fixture('include_cache.ejs'), {}, options); + var expected = fixture('include_cache.html'); assert.equal(out, expected); out = ejs.render(fixture('include_cache.ejs'), {}, options); // No change, still in cache @@ -851,8 +849,8 @@ suite('preprocessor include', function () { }); test('tracks dependency correctly', function () { - var file = 'test/fixtures/menu_preprocessor.ejs' - , fn = ejs.compile(fixture('menu_preprocessor.ejs'), {filename: file}); + var file = 'test/fixtures/menu_preprocessor.ejs'; + var fn = ejs.compile(fixture('menu_preprocessor.ejs'), {filename: file}); assert(fn.dependencies.length); }); @@ -863,12 +861,12 @@ suite('preprocessor include', function () { }); test('pass compileDebug to include', function () { - var file = 'test/fixtures/include_preprocessor.ejs' - , fn; + var file = 'test/fixtures/include_preprocessor.ejs'; + var fn; fn = ejs.compile(fixture('include_preprocessor.ejs'), { - filename: file - , delimiter: '@' - , compileDebug: false + filename: file, + delimiter: '@', + compileDebug: false }); try { // Render without a required variable reference @@ -884,9 +882,9 @@ suite('preprocessor include', function () { test('is static', function () { fs.writeFileSync(__dirname + '/tmp/include_preprocessor.ejs', 'Old
'); - var file = 'test/fixtures/include_preprocessor_cache.ejs' - , options = {filename: file} - , out = ejs.compile(fixture('include_preprocessor_cache.ejs'), options); + var file = 'test/fixtures/include_preprocessor_cache.ejs'; + var options = {filename: file}; + var out = ejs.compile(fixture('include_preprocessor_cache.ejs'), options); assert.equal(out(), 'Old
\n'); fs.writeFileSync(__dirname + '/tmp/include_preprocessor.ejs', 'New
'); @@ -895,10 +893,10 @@ suite('preprocessor include', function () { test('support caching', function () { fs.writeFileSync(__dirname + '/tmp/include_preprocessor.ejs', 'Old
'); - var file = 'test/fixtures/include_preprocessor_cache.ejs' - , options = {cache: true, filename: file} - , out = ejs.render(fixture('include_preprocessor_cache.ejs'), {}, options) - , expected = fixture('include_preprocessor_cache.html'); + var file = 'test/fixtures/include_preprocessor_cache.ejs'; + var options = {cache: true, filename: file}; + var out = ejs.render(fixture('include_preprocessor_cache.ejs'), {}, options); + var expected = fixture('include_preprocessor_cache.html'); assert.equal(out, expected); fs.writeFileSync(__dirname + '/tmp/include_preprocessor.ejs', 'New
'); out = ejs.render(fixture('include_preprocessor_cache.ejs'), {}, options); @@ -906,13 +904,13 @@ suite('preprocessor include', function () { }); test('whitespace slurp and rmWhitespace work', function() { - var file = 'test/fixtures/include_preprocessor_line_slurp.ejs' - , template = fixture('include_preprocessor_line_slurp.ejs') - , expected = fixture('include_preprocessor_line_slurp.html') - , options = {rmWhitespace: true, filename: file}; + var file = 'test/fixtures/include_preprocessor_line_slurp.ejs'; + var template = fixture('include_preprocessor_line_slurp.ejs'); + var expected = fixture('include_preprocessor_line_slurp.html'); + var options = {rmWhitespace: true, filename: file}; assert.equal(ejs.render(template, options), expected); - }) + }); }); @@ -927,12 +925,12 @@ suite('require', function () { // Only works with inline/preprocessor includes test('allow ejs templates to be required as node modules', function () { - var file = 'test/fixtures/include_preprocessor.ejs' - , template = require(__dirname + '/fixtures/menu_preprocessor.ejs'); - if (!process.env.running_under_istanbul) { - assert.equal(template({filename: file, pets: users}), + var file = 'test/fixtures/include_preprocessor.ejs'; + var template = require(__dirname + '/fixtures/menu_preprocessor.ejs'); + if (!process.env.running_under_istanbul) { + assert.equal(template({filename: file, pets: users}), fixture('menu_preprocessor.html')); - } + } }); }); @@ -944,8 +942,8 @@ suite('examples', function () { } suite(f, function () { test('doesn\'t throw any errors', function () { - var stderr = hook_stdio(process.stderr, noop) - , stdout = hook_stdio(process.stdout, noop); + var stderr = hook_stdio(process.stderr, noop); + var stdout = hook_stdio(process.stdout, noop); try { require('../examples/' + f); }