Replace Swig tests with nunjucks

hexojs · Jan 17, 2020 · 56dea0b · 56dea0b
1 parent ac9fa60
commit 56dea0b
Show file tree

Hide file tree

Showing 11 changed files with 103 additions and 100 deletions.
diff --git a/test/scripts/console/generate.js b/test/scripts/console/generate.js
@@ -183,14 +183,14 @@ describe('generate', () => {
  // Add some source files
  writeFile(join(hexo.theme_dir, 'source', 'a.txt'), 'a'),
  writeFile(join(hexo.theme_dir, 'source', 'b.txt'), 'b'),
- writeFile(join(hexo.theme_dir, 'source', 'c.swig'), 'c')
+ writeFile(join(hexo.theme_dir, 'source', 'c.njk'), 'c')
  ]);
  await generate();
 
  // Update source file
  await Promise.all([
  writeFile(join(hexo.theme_dir, 'source', 'b.txt'), 'bb'),
- writeFile(join(hexo.theme_dir, 'source', 'c.swig'), 'cc')
+ writeFile(join(hexo.theme_dir, 'source', 'c.njk'), 'cc')
  ]);
 
  // Generate again

diff --git a/test/scripts/extend/renderer.js b/test/scripts/extend/renderer.js
@@ -108,11 +108,11 @@ describe('Renderer', () => {
 
  r.isRenderableSync('yaml').should.be.false;
 
- r.register('swig', 'html', () => {}, true);
+ r.register('njk', 'html', () => {}, true);
 
- r.isRenderableSync('swig').should.be.true;
- r.isRenderableSync('.swig').should.be.true;
- r.isRenderableSync('layout.swig').should.be.true;
+ r.isRenderableSync('njk').should.be.true;
+ r.isRenderableSync('.njk').should.be.true;
+ r.isRenderableSync('layout.njk').should.be.true;
  r.isRenderableSync('foo.html').should.be.false;
  });
 

diff --git a/test/scripts/helpers/partial.js b/test/scripts/helpers/partial.js
@@ -10,7 +10,7 @@ describe('partial', () => {
  const hexo = new Hexo(pathFn.join(__dirname, 'partial_test'), {silent: true});
  const themeDir = pathFn.join(hexo.base_dir, 'themes', 'test');
  const viewDir = pathFn.join(themeDir, 'layout') + pathFn.sep;
- const viewName = 'article.swig';
+ const viewName = 'article.njk';
 
  const ctx = {
  site: hexo.locals,
@@ -33,7 +33,7 @@ describe('partial', () => {
  fs.writeFile(hexo.config_path, 'theme: test')
  ]);
  await hexo.init();
- hexo.theme.setView('widget/tag.swig', 'tag widget');
+ hexo.theme.setView('widget/tag.njk', 'tag widget');
  });
 
  after(() => fs.rmdir(hexo.base_dir));
@@ -57,28 +57,28 @@ describe('partial', () => {
  });
 
  it('locals', () => {
- hexo.theme.setView('test.swig', '{{ foo }}');
+ hexo.theme.setView('test.njk', '{{ foo }}');
 
  partial('test', {foo: 'bar'}).should.eql('bar');
  });
 
  it('cache', () => {
- hexo.theme.setView('test.swig', '{{ foo }}');
+ hexo.theme.setView('test.njk', '{{ foo }}');
 
  partial('test', {foo: 'bar'}, {cache: true}).should.eql('bar');
  partial('test', {}, {cache: true}).should.eql('bar');
  });
 
  it('only', () => {
- hexo.theme.setView('test.swig', '{{ foo }}{{ bar }}');
+ hexo.theme.setView('test.njk', '{{ foo }}{{ bar }}');
 
  partial('test', {bar: 'bar'}, {only: true}).should.eql('bar');
  });
 
  it('a partial in another partial', () => {
- hexo.theme.setView('partial/a.swig', '{{ partial("b") }}');
- hexo.theme.setView('partial/b.swig', '{{ partial("c") }}');
- hexo.theme.setView('partial/c.swig', 'c');
+ hexo.theme.setView('partial/a.njk', '{{ partial("b") }}');
+ hexo.theme.setView('partial/b.njk', '{{ partial("c") }}');
+ hexo.theme.setView('partial/c.njk', 'c');
 
  partial('partial/a').should.eql('c');
  });

diff --git a/test/scripts/hexo/hexo.js b/test/scripts/hexo/hexo.js
@@ -354,7 +354,7 @@ describe('Hexo', () => {
  });
 
  it('_generate() - layout', () => {
- hexo.theme.setView('test.swig', [
+ hexo.theme.setView('test.njk', [
  '{{ config.title }}',
  '{{ page.foo }}',
  '{{ layout }}',
@@ -381,7 +381,7 @@ describe('Hexo', () => {
  });
 
  it('_generate() - layout array', () => {
- hexo.theme.setView('baz.swig', 'baz');
+ hexo.theme.setView('baz.njk', 'baz');
 
  hexo.extend.generator.register('test', () => ({
  path: 'test',
@@ -421,7 +421,7 @@ describe('Hexo', () => {
  it('_generate() - after_route_render filter', () => {
  const hook = sinon.spy(result => result.replace('foo', 'bar'));
  hexo.extend.filter.register('after_route_render', hook);
- hexo.theme.setView('test.swig', 'foo');
+ hexo.theme.setView('test.njk', 'foo');
  hexo.extend.generator.register('test', () => ({
  path: 'test',
  layout: 'test'
@@ -445,7 +445,7 @@ describe('Hexo', () => {
  });
 
  it('_generate() - validate locals', () => {
- hexo.theme.setView('test.swig', [
+ hexo.theme.setView('test.njk', [
  '{{ path }}',
  '{{ url }}',
  '{{ view_dir }}'
@@ -467,7 +467,7 @@ describe('Hexo', () => {
  const path = 'bár';
  hexo.config.url = 'http://fôo.com';
 
- hexo.theme.setView('test.swig', '{{ url }}');
+ hexo.theme.setView('test.njk', '{{ url }}');
 
  hexo.extend.generator.register('test', () => ({
  path,
@@ -491,7 +491,7 @@ describe('Hexo', () => {
  it('_generate() - reset cache for new route', () => {
  let count = 0;
 
- hexo.theme.setView('test.swig', '{{ page.count() }}');
+ hexo.theme.setView('test.njk', '{{ page.count() }}');
 
  hexo.extend.generator.register('test', () => ({
  path: 'test',
@@ -511,7 +511,7 @@ describe('Hexo', () => {
  it('_generate() - cache disabled and use new route', () => {
  let count = 0;
 
- hexo.theme.setView('test.swig', '{{ page.count() }}');
+ hexo.theme.setView('test.njk', '{{ page.count() }}');
 
  hexo.extend.generator.register('test', () => ({
  path: 'test',
@@ -529,7 +529,7 @@ describe('Hexo', () => {
  });
 
  it('_generate() - cache disabled & update template', () => {
- hexo.theme.setView('test.swig', '0');
+ hexo.theme.setView('test.njk', '0');
 
  hexo.extend.generator.register('test', () => ({
  path: 'test',
@@ -538,12 +538,12 @@ describe('Hexo', () => {
 
  return hexo._generate({cache: false})
  .then(() => checkStream(route.get('test'), '0'))
- .then(() => hexo.theme.setView('test.swig', '1'))
+ .then(() => hexo.theme.setView('test.njk', '1'))
  .then(() => checkStream(route.get('test'), '1'));
  });
 
  it('_generate() - cache enabled & update template', () => {
- hexo.theme.setView('test.swig', '0');
+ hexo.theme.setView('test.njk', '0');
 
  hexo.extend.generator.register('test', () => ({
  path: 'test',
@@ -552,7 +552,7 @@ describe('Hexo', () => {
 
  return hexo._generate({cache: true})
  .then(() => checkStream(route.get('test'), '0'))
- .then(() => hexo.theme.setView('test.swig', '1'))
+ .then(() => hexo.theme.setView('test.njk', '1'))
  .then(() => checkStream(route.get('test'), '0')); // should return cached result
  });
 

diff --git a/test/scripts/hexo/post.js b/test/scripts/hexo/post.js
@@ -600,7 +600,7 @@ describe('Post', () => {
  });
  });
 
- it('render() - skip render phase if it\'s swig file', () => {
+ it('render() - skip render phase if it\'s nunjucks file', () => {
  const content = [
  '{% quote Hello World %}',
  'quote content',
@@ -609,7 +609,7 @@ describe('Post', () => {
 
  return post.render(null, {
  content,
- engine: 'swig'
+ engine: 'njk'
  }).then(data => {
  data.content.trim().should.eql([
  '<blockquote><p>quote content</p>\n',
@@ -618,7 +618,7 @@ describe('Post', () => {
  });
  });
 
- it('render() - escaping swig blocks with similar names', () => {
+ it('render() - escaping nunjucks blocks with similar names', () => {
  const code = 'alert("Hello world")';
  const highlighted = util.highlight(code);
 
@@ -643,7 +643,7 @@ describe('Post', () => {
  });
  });
 
- it('render() - recover escaped swig blocks which is html escaped', () => {
+ it('render() - recover escaped nunjucks blocks which is html escaped', () => {
  const content = '`{% raw %}{{ test }}{% endraw %}`';
 
  return post.render(null, {
@@ -654,7 +654,7 @@ describe('Post', () => {
  });
  });
 
- it('render() - recover escaped swig blocks which is html escaped before post_render', () => {
+ it('render() - recover escaped nunjucks blocks which is html escaped before post_render', () => {
  const content = '`{% raw %}{{ test }}{% endraw %}`';
 
  const filter = sinon.spy(result => {

diff --git a/test/scripts/hexo/render.js b/test/scripts/hexo/render.js
@@ -38,7 +38,8 @@ describe('Render', () => {
  hexo.render.isRenderable('test.html').should.be.true;
 
  // swig
- hexo.render.isRenderable('test.swig').should.be.true;
+ hexo.render.isRenderable('test.swig').should.be.false;
+ hexo.render.isRenderable('test.njk').should.be.true;
 
  // yaml
  hexo.render.isRenderable('test.yml').should.be.true;
@@ -53,7 +54,8 @@ describe('Render', () => {
  hexo.render.isRenderableSync('test.html').should.be.true;
 
  // swig
- hexo.render.isRenderableSync('test.swig').should.be.true;
+ hexo.render.isRenderableSync('test.swig').should.be.false;
+ hexo.render.isRenderableSync('test.njk').should.be.true;
 
  // yaml
  hexo.render.isRenderableSync('test.yml').should.be.true;
@@ -68,7 +70,7 @@ describe('Render', () => {
  hexo.render.getOutput('test.html').should.eql('html');
 
  // swig
- hexo.render.getOutput('test.swig').should.eql('html');
+ hexo.render.getOutput('test.njk').should.eql('html');
 
  // yaml
  hexo.render.getOutput('test.yml').should.eql('json');
@@ -102,7 +104,7 @@ describe('Render', () => {
  '<title>{{ title }}</title>',
  '<body>{{ content }}</body>'
  ].join('\n'),
- engine: 'swig'
+ engine: 'njk'
  }, {
  title: 'Hello world',
  content: 'foobar'
@@ -134,7 +136,7 @@ describe('Render', () => {
  it('render() - after_render filter', () => {
  const data = {
  text: ' <strong>123456</strong> ',
- engine: 'swig'
+ engine: 'njk'
  };
 
  const filter = sinon.spy((result, obj) => {
@@ -226,7 +228,7 @@ describe('Render', () => {
  '<title>{{ title }}</title>',
  '<body>{{ content }}</body>'
  ].join('\n'),
- engine: 'swig'
+ engine: 'njk'
  }, {
  title: 'Hello world',
  content: 'foobar'
@@ -263,7 +265,7 @@ describe('Render', () => {
  it('renderSync() - after_render filter', () => {
  const data = {
  text: ' <strong>123456</strong> ',
- engine: 'swig'
+ engine: 'njk'
  };
 
  const filter = sinon.spy((result, obj) => {

diff --git a/test/scripts/processors/asset.js b/test/scripts/processors/asset.js
@@ -185,7 +185,7 @@ describe('asset', () => {
  ].join('\n');
 
  const file = newFile({
- path: 'hello.swig',
+ path: 'hello.njk',
  type: 'create',
  renderable: true
  });
@@ -216,7 +216,7 @@ describe('asset', () => {
  ].join('\n');
 
  const file = newFile({
- path: 'hello.swig',
+ path: 'hello.njk',
  type: 'update',
  renderable: true
  });
@@ -244,7 +244,7 @@ describe('asset', () => {
 
  it('page - type: delete', () => {
  const file = newFile({
- path: 'hello.swig',
+ path: 'hello.njk',
  type: 'delete',
  renderable: true
  });
@@ -259,7 +259,7 @@ describe('asset', () => {
 
  it('page - use the status of the source file if date not set', () => {
  const file = newFile({
- path: 'hello.swig',
+ path: 'hello.njk',
  type: 'create',
  renderable: true
  });
@@ -282,7 +282,7 @@ describe('asset', () => {
 
  it('page - use the date for updated if use_date_for_updated is set', () => {
  const file = newFile({
- path: 'hello.swig',
+ path: 'hello.njk',
  type: 'create',
  renderable: true
  });
@@ -315,7 +315,7 @@ describe('asset', () => {
  ].join('\n');
 
  const file = newFile({
- path: 'hello.swig',
+ path: 'hello.njk',
  type: 'create',
  renderable: true
  });
@@ -340,7 +340,7 @@ describe('asset', () => {
  ].join('\n');
 
  const file = newFile({
- path: 'hello.swig',
+ path: 'hello.njk',
  type: 'create',
  renderable: true
  });
@@ -365,7 +365,7 @@ describe('asset', () => {
  ].join('\n');
 
  const file = newFile({
- path: 'hello.swig',
+ path: 'hello.njk',
  type: 'create',
  renderable: true
  });
@@ -437,7 +437,7 @@ describe('asset', () => {
  ].join('\n');
 
  const file = newFile({
- path: 'hello.swig',
+ path: 'hello.njk',
  type: 'create',
  renderable: true
  });
@@ -464,7 +464,7 @@ describe('asset', () => {
  ].join('\n');
 
  const file = newFile({
- path: 'hello.swig',
+ path: 'hello.njk',
  type: 'create',
  renderable: true
  });
@@ -515,7 +515,7 @@ describe('asset', () => {
  ].join('\n');
 
  const file = newFile({
- path: 'hello.swig',
+ path: 'hello.njk',
  type: 'create',
  renderable: true
  });