Merge pull request #69 from jaredwray/migrating-legacy-helper-tests-t…

…o-helpers-directory migrating legacy helper tests to helpers directory
jaredwray · Nov 1, 2024 · 9eea766 · 9eea766
2 parents 10021e3 + 34b84fa
commit 9eea766
Show file tree

Hide file tree

Showing 47 changed files with 66 additions and 163 deletions.
diff --git a/.c8rc b/.c8rc
@@ -1,9 +1,13 @@
 {
     "exclude": [
+        "helpers/test/**",
         "test/**",
         "dist/**",
         "**/*.test.js",
         "**/*.spec.ts",
         "node_modules/**"
+    ],
+    "include": [
+        "helpers/**/*.js"
     ]
 }
diff --git a/.mocharc.json b/.mocharc.json
@@ -0,0 +1,8 @@
+{
+    "extension": ["js"],        
+    "spec": "helpers/test/**/*.js",      
+    "reporter": "list",               
+    "timeout": 5000,                  
+    "recursive": true                
+  }
+
diff --git a/helpers/lib/index.js b/helpers/lib/index.js
@@ -21,4 +21,4 @@ module.exports = {
   regex: require('./regex'),
   string: require('./string'),
   url: require('./url')
-};
+};
diff --git a/test/array.js → helpers/test/array.js b/test/array.js → helpers/test/array.js
@@ -3,7 +3,7 @@
 require('mocha');
 var assert = require('assert');
 var hbs = require('handlebars').create();
-var helpers = require('../helpers/helpers.js');
+var helpers = require('../helpers.js');
 helpers.array({handlebars: hbs});
 helpers.string({handlebars: hbs});
 

diff --git a/test/code.js → helpers/test/code.js b/test/code.js → helpers/test/code.js
@@ -3,13 +3,13 @@
 require('mocha');
 var assert = require('assert');
 var hbs = require('handlebars').create();
-var helpers = require('../helpers/helpers.js');
+var helpers = require('../helpers.js');
 helpers.code({handlebars: hbs});
 
 describe('code', function() {
   describe('embed', function() {
     it('should embed markdown:', function() {
-      assert.equal(hbs.compile('{{{embed "test/fixtures/simple.md"}}}')(), [
+      assert.equal(hbs.compile('{{{embed "helpers/test/fixtures/simple.md"}}}')(), [
         '```markdown',
         '## Some Markdown\n',
         ' - one',
@@ -21,7 +21,7 @@ describe('code', function() {
     });
 
     it('should determine the language from the file extension', function() {
-      assert.equal(hbs.compile('{{{embed "test/fixtures/embedded.md"}}}')(), [
+      assert.equal(hbs.compile('{{{embed "helpers/test/fixtures/embedded.md"}}}')(), [
         '```markdown',
         '## Markdown',
         '',
@@ -40,7 +40,7 @@ describe('code', function() {
     });
 
     it('should use the language defined in the last argument', function() {
-      var template = hbs.compile('{{{embed "test/fixtures/index.html" "hbs"}}}');
+      var template = hbs.compile('{{{embed "helpers/test/fixtures/index.html" "hbs"}}}');
       assert.equal(template(), [
         '```hbs',
         '<!DOCTYPE html>',

diff --git a/test/collection.js → helpers/test/collection.js b/test/collection.js → helpers/test/collection.js
@@ -3,7 +3,7 @@
 require('mocha');
 var assert = require('assert');
 var hbs = require('handlebars').create();
-var helpers = require('../helpers/helpers.js');
+var helpers = require('../helpers.js');
 helpers.array({handlebars: hbs});
 helpers.collection({handlebars: hbs});
 helpers.string({handlebars: hbs});

diff --git a/test/comparison.js → helpers/test/comparison.js b/test/comparison.js → helpers/test/comparison.js
@@ -3,7 +3,7 @@
 require('mocha');
 var assert = require('assert');
 var hbs = require('handlebars').create();
-var helpers = require('../helpers/helpers.js');
+var helpers = require('../helpers.js');
 helpers.comparison({handlebars: hbs});
 
 describe('comparison', function() {

diff --git a/test/es6.mjs → helpers/test/es6.mjs b/test/es6.mjs → helpers/test/es6.mjs
diff --git a/test/expected/object/extend.txt → helpers/test/expected/object/extend.txt b/test/expected/object/extend.txt → helpers/test/expected/object/extend.txt
diff --git a/test/expected/simple.html → helpers/test/expected/simple.html b/test/expected/simple.html → helpers/test/expected/simple.html
diff --git a/test/fixtures/a.md → helpers/test/fixtures/a.md b/test/fixtures/a.md → helpers/test/fixtures/a.md
diff --git a/test/fixtures/assets/js/one.js → helpers/test/fixtures/assets/js/one.js b/test/fixtures/assets/js/one.js → helpers/test/fixtures/assets/js/one.js
diff --git a/test/fixtures/assets/js/two.js → helpers/test/fixtures/assets/js/two.js b/test/fixtures/assets/js/two.js → helpers/test/fixtures/assets/js/two.js
diff --git a/test/fixtures/assets/styles/one.css → helpers/test/fixtures/assets/styles/one.css b/test/fixtures/assets/styles/one.css → helpers/test/fixtures/assets/styles/one.css
diff --git a/test/fixtures/assets/styles/two.css → helpers/test/fixtures/assets/styles/two.css b/test/fixtures/assets/styles/two.css → helpers/test/fixtures/assets/styles/two.css
diff --git a/test/fixtures/b.md → helpers/test/fixtures/b.md b/test/fixtures/b.md → helpers/test/fixtures/b.md
diff --git a/test/fixtures/c.md → helpers/test/fixtures/c.md b/test/fixtures/c.md → helpers/test/fixtures/c.md
diff --git a/test/fixtures/d.md → helpers/test/fixtures/d.md b/test/fixtures/d.md → helpers/test/fixtures/d.md
diff --git a/test/fixtures/e.md → helpers/test/fixtures/e.md b/test/fixtures/e.md → helpers/test/fixtures/e.md
diff --git a/test/fixtures/embedded.md → helpers/test/fixtures/embedded.md b/test/fixtures/embedded.md → helpers/test/fixtures/embedded.md
diff --git a/test/fixtures/index.html → helpers/test/fixtures/index.html b/test/fixtures/index.html → helpers/test/fixtures/index.html
diff --git a/test/fixtures/object/merge.hbs → helpers/test/fixtures/object/merge.hbs b/test/fixtures/object/merge.hbs → helpers/test/fixtures/object/merge.hbs
diff --git a/test/fixtures/object/pick.hbs → helpers/test/fixtures/object/pick.hbs b/test/fixtures/object/pick.hbs → helpers/test/fixtures/object/pick.hbs
diff --git a/test/fixtures/read/a.txt → helpers/test/fixtures/read/a.txt b/test/fixtures/read/a.txt → helpers/test/fixtures/read/a.txt
diff --git a/test/fixtures/simple.md → helpers/test/fixtures/simple.md b/test/fixtures/simple.md → helpers/test/fixtures/simple.md
diff --git a/test/fs.js → helpers/test/fs.js b/test/fs.js → helpers/test/fs.js
@@ -5,9 +5,9 @@ var fs = require('fs');
 var path = require('path');
 var assert = require('assert');
 var hbs = require('handlebars').create();
-require('../helpers/helpers.js')({handlebars: hbs});
+require('../helpers.js')({handlebars: hbs});
 
-var libFiles = fs.readdirSync(path.join(__dirname, '../helpers/lib'))
+var libFiles = fs.readdirSync(path.join(__dirname, '../lib'))
   .map(function(fp) {
     return path.join('helpers/lib', fp);
   });
@@ -16,7 +16,7 @@ describe('fs', function() {
   describe('read', function() {
     it('should read a file from the file system', function() {
       var fn = hbs.compile('{{read filepath}}');
-      assert.equal(fn({filepath: 'test/fixtures/read/a.txt'}), 'abc');
+      assert.equal(fn({filepath: 'helpers/test/fixtures/read/a.txt'}), 'abc');
     });
   });
 

diff --git a/test/helpers.js → helpers/test/helpers.js b/test/helpers.js → helpers/test/helpers.js
@@ -3,7 +3,7 @@
 require('mocha');
 var assert = require('assert');
 var hbs = require('handlebars');
-var helpers = require('../helpers/helpers.js');
+var helpers = require('../helpers.js');
 
 describe('helpers', function() {
   it('should should return all helpers:', function() {

diff --git a/test/html.js → helpers/test/html.js b/test/html.js → helpers/test/html.js
@@ -3,7 +3,7 @@
 require('mocha');
 var assert = require('assert');
 var hbs = require('handlebars').create();
-var helpers = require('../helpers/helpers.js');
+var helpers = require('../helpers.js');
 helpers.html({handlebars: hbs});
 
 var locals = {data: [{aaa: 'AAA', bbb: 'BBB'}, {aaa: 'CCC', bbb: 'DDD'}]};

diff --git a/test/i18n.js → helpers/test/i18n.js b/test/i18n.js → helpers/test/i18n.js
@@ -3,7 +3,7 @@
 require('mocha');
 var assert = require('assert');
 var hbs = require('handlebars').create();
-var helpers = require('../helpers/helpers.js');
+var helpers = require('../helpers.js');
 helpers.i18n({handlebars: hbs});
 
 var context = {language: 'en', en: {key: 'value', a: {b: 'c'}}, fr: {key: 'valeur'}};

diff --git a/test/index.js → helpers/test/index.js b/test/index.js → helpers/test/index.js
@@ -1,7 +1,7 @@
 var assert = require('assert');
 const chai = require('chai');
 const expect = chai.expect;
-const {createHandlebars, fumanchu} = require('../dist/index.js');
+const {createHandlebars, fumanchu} = require('../../dist/index.js');
 
 describe('Fumanchu Template Test', function() {
     it('should render name correctly', async function() {
@@ -24,7 +24,7 @@ describe('Fumanchu Template Test', function() {
     });
 
     it('should have the helper class exported', function() {
-        var helpers = require('../dist/index.js').helpers;
+        var helpers = require('../../dist/index.js').helpers;
         const HandlebarsLib = require('handlebars');
         const handlebars = HandlebarsLib.create();
         helpers({ handlebars: handlebars });
@@ -33,7 +33,7 @@ describe('Fumanchu Template Test', function() {
     });
 
     it('should have the handlebars object exported', function() {
-        var {handlebars, helpers} = require('../dist/index.js');
+        var {handlebars, helpers} = require('../../dist/index.js');
         helpers({ handlebars: handlebars });
         var fn = handlebars.compile('{{add value 5}}');
         assert.equal(fn({value: 5}), '10');

diff --git a/test/inflection.js → helpers/test/inflection.js b/test/inflection.js → helpers/test/inflection.js
@@ -3,7 +3,7 @@
 require('mocha');
 var assert = require('assert');
 var hbs = require('handlebars').create();
-var helpers = require('../helpers/helpers.js');
+var helpers = require('../helpers.js');
 helpers.inflection({handlebars: hbs});
 
 describe('inflection', function() {

diff --git a/test/markdown.js → helpers/test/markdown.js b/test/markdown.js → helpers/test/markdown.js
@@ -4,8 +4,8 @@ require('mocha');
 var assert = require('assert');
 var fs = require('fs');
 var hbs = require('handlebars').create();
-var helpers = require('../helpers/helpers.js');
-var markdownHelper = require('../helpers/lib/markdown.js');
+var helpers = require('../helpers.js');
+var markdownHelper = require('../lib/markdown.js');
 helpers.markdown({handlebars: hbs});
 
 describe('markdown', function() {
@@ -50,9 +50,9 @@ describe('markdown', function() {
 
   describe('md', function() {
     it('should render markdown from a file using the {{md}} inline helper', function() {
-      var expected = fs.readFileSync('test/expected/simple.html', 'utf8');
+      var expected = fs.readFileSync('helpers/test/expected/simple.html', 'utf8');
       var template = hbs.compile('{{{md fp}}}');
-      var actual = template({fp: 'test/fixtures/simple.md'});
+      var actual = template({fp: 'helpers/test/fixtures/simple.md'});
       assert.equal(actual, expected);
     });
   });

diff --git a/test/match.js → helpers/test/match.js b/test/match.js → helpers/test/match.js
@@ -4,23 +4,23 @@ var fs = require('fs');
 var path = require('path');
 var assert = require('assert');
 var hbs = require('handlebars').create();
-var helpers = require('../helpers/helpers.js');
-helpers.match({handlebars: hbs});
+var helpers = require('../helpers.js');
+helpers({handlebars: hbs});
 
-var testFiles = fs.readdirSync(__dirname);
-var rootFiles = fs.readdirSync(path.join(__dirname, '..'));
+var testFiles = fs.readdirSync(path.join(__dirname, '../lib'));
+var rootFiles = fs.readdirSync(path.join(__dirname, '../../'));
 
 describe('matching', function() {
   describe('match', function() {
     it('should use the main micromatch function to filter an array', function() {
       var fn = hbs.compile('{{match files "(a|u)*.js"}}');
-      assert.equal(fn({files: testFiles}), 'array.js,url.js,utils.js');
+      assert.equal(fn({files: testFiles}), 'array.js,url.js');
     });
 
     it('should take an array of patterns', function() {
       var ctx = {files: testFiles, patterns: ['(a|u)*.js', 'f*.js']};
       var fn = hbs.compile('{{match files patterns}}');
-      assert.equal(fn(ctx), 'array.js,url.js,utils.js,fs.js');
+      assert.equal(fn(ctx), 'array.js,url.js,fs.js');
     });
 
     it('should take options from the "options[helper name]" object', function() {
@@ -37,7 +37,7 @@ describe('matching', function() {
 
     it('should use return matching items', function() {
       var fn = hbs.compile('{{match files "(a|u)*.js"}}');
-      assert.equal(fn({files: testFiles}), 'array.js,url.js,utils.js');
+      assert.equal(fn({files: testFiles}), 'array.js,url.js');
     });
 
     it('should take options from the "options[helper name]" object', function() {

diff --git a/test/math.js → helpers/test/math.js b/test/math.js → helpers/test/math.js
@@ -3,7 +3,7 @@
 require('mocha');
 var assert = require('assert');
 var hbs = require('handlebars').create();
-var helpers = require('../helpers/helpers.js');
+var helpers = require('../helpers.js');
 helpers.math({handlebars: hbs});
 
 describe('math', function() {

diff --git a/test/md.js → helpers/test/md.js b/test/md.js → helpers/test/md.js
@@ -12,7 +12,7 @@ var assert = require('assert');
 var handlebars = require('handlebars');
 var Templates = require('templates');
 var hljs = require('highlight.js');
-var md = require('../helpers/lib/md.js');
+var md = require('../lib/md.js');
 var _ = require('lodash');
 var app;
 
@@ -43,19 +43,19 @@ describe('sync', function() {
   });
 
   it('should support rendering markdown from a file:', function() {
-    assert.equal(md.sync('test/fixtures/a.md'), '<h1>AAA</h1>\n<blockquote>\n<p>this is aaa</p>\n</blockquote>\n');
+    assert.equal(md.sync('helpers/test/fixtures/a.md'), '<h1>AAA</h1>\n<blockquote>\n<p>this is aaa</p>\n</blockquote>\n');
   });
 
   describe('handlebars:', function() {
     it('should support rendering markdown from a file:', function() {
       handlebars.registerHelper('md', md.sync);
-      assert.equal(handlebars.compile('{{{md "test/fixtures/a.md"}}}')(), '<h1>AAA</h1>\n<blockquote>\n<p>this is aaa</p>\n</blockquote>\n');
+      assert.equal(handlebars.compile('{{{md "helpers/test/fixtures/a.md"}}}')(), '<h1>AAA</h1>\n<blockquote>\n<p>this is aaa</p>\n</blockquote>\n');
     });
 
     it('should use the `render` function passed on the locals to render templates in partials :', function() {
       handlebars.registerHelper('md', md.sync);
       var locals = {name: 'CCC', compile: handlebars.compile};
-      assert.equal(handlebars.compile('{{{md "test/fixtures/c.md"}}}')(locals), '<h1>CCC</h1>\n<p>This is CCC</p>\n');
+      assert.equal(handlebars.compile('{{{md "helpers/test/fixtures/c.md"}}}')(locals), '<h1>CCC</h1>\n<p>This is CCC</p>\n');
     });
   });
 });
@@ -87,7 +87,7 @@ describe('async', function() {
   });
 
   it('should support rendering from a file', function(cb) {
-    app.page('home.md', {content: '<%= md("test/fixtures/d.md") %>'});
+    app.page('home.md', {content: '<%= md("helpers/test/fixtures/d.md") %>'});
 
     app.render('home.md', {name: 'DDD'}, function(err, view) {
       if (err) return cb(err);
@@ -111,22 +111,22 @@ describe('async', function() {
 describe('lodash:', function() {
   it('should work as a lodash mixin:', function() {
     _.mixin({md: md.sync});
-    assert.equal(_.template('<%= _.md("test/fixtures/a.md") %>', {})(), '<h1>AAA</h1>\n<blockquote>\n<p>this is aaa</p>\n</blockquote>\n');
+    assert.equal(_.template('<%= _.md("helpers/test/fixtures/a.md") %>', {})(), '<h1>AAA</h1>\n<blockquote>\n<p>this is aaa</p>\n</blockquote>\n');
   });
 
   it('should work when passed to lodash on the locals:', function() {
-    assert.equal(_.template('<%= _.md("test/fixtures/a.md") %>')({md: md.sync}), '<h1>AAA</h1>\n<blockquote>\n<p>this is aaa</p>\n</blockquote>\n');
+    assert.equal(_.template('<%= _.md("helpers/test/fixtures/a.md") %>')({md: md.sync}), '<h1>AAA</h1>\n<blockquote>\n<p>this is aaa</p>\n</blockquote>\n');
   });
 
   it('should work as a lodash import:', function() {
     var settings = {imports: {md: md.sync}};
-    assert.equal(_.template('<%= _.md("test/fixtures/a.md") %>', {}, settings)(), '<h1>AAA</h1>\n<blockquote>\n<p>this is aaa</p>\n</blockquote>\n');
+    assert.equal(_.template('<%= _.md("helpers/test/fixtures/a.md") %>', {}, settings)(), '<h1>AAA</h1>\n<blockquote>\n<p>this is aaa</p>\n</blockquote>\n');
   });
 });
 
 describe('highlight:', function(argument) {
   it('should support syntax highlighting', function() {
-    var actual = md.sync('test/fixtures/e.md', {
+    var actual = md.sync('helpers/test/fixtures/e.md', {
       highlight: function(code, lang) {
         try {
           try {

diff --git a/test/misc.js → helpers/test/misc.js b/test/misc.js → helpers/test/misc.js
@@ -3,7 +3,7 @@
 require('mocha');
 var assert = require('assert');
 var hbs = require('handlebars').create();
-var helpers = require('../helpers/helpers.js');
+var helpers = require('../helpers.js');
 
 describe('misc', function() {
   beforeEach(function() {

diff --git a/test/number.js → helpers/test/number.js b/test/number.js → helpers/test/number.js
@@ -3,7 +3,7 @@
 require('mocha');
 var assert = require('assert');
 var hbs = require('handlebars').create();
-var helpers = require('../helpers/helpers.js');
+var helpers = require('../helpers.js');
 helpers.number({handlebars: hbs});
 
 describe('number', function() {

diff --git a/test/object.js → helpers/test/object.js b/test/object.js → helpers/test/object.js
@@ -4,7 +4,7 @@ require('mocha');
 var assert = require('assert');
 var support = require('./support');
 var expected = support.expected('object');
-var helpers = require('../helpers/helpers.js');
+var helpers = require('../helpers.js');
 var hbs = require('handlebars').create();
 helpers.math({handlebars: hbs});
 helpers.object({handlebars: hbs});

diff --git a/test/path.js → helpers/test/path.js b/test/path.js → helpers/test/path.js
@@ -6,7 +6,7 @@ var assert = require('assert');
 var path = require('path');
 var hbs = require('handlebars').create();
 var gm = require('global-modules');
-var helpers = require('../helpers/helpers.js');
+var helpers = require('../helpers.js');
 helpers.path({handlebars: hbs});
 
 describe('assemble', function() {

diff --git a/test/regex.js → helpers/test/regex.js b/test/regex.js → helpers/test/regex.js
@@ -3,7 +3,7 @@
 require('mocha');
 var assert = require('assert');
 var hbs = require('handlebars').create();
-var helpers = require('../helpers/helpers.js');
+var helpers = require('../helpers.js');
 helpers.regex({handlebars: hbs});
 
 describe('regex', function() {

diff --git a/test/string.js → helpers/test/string.js b/test/string.js → helpers/test/string.js
@@ -3,7 +3,7 @@
 require('mocha');
 var assert = require('assert');
 var hbs = require('handlebars').create();
-var helpers = require('../helpers/helpers.js');
+var helpers = require('../helpers.js');
 helpers.string({handlebars: hbs});
 
 describe('string', function() {

diff --git a/test/subexpressions.js → helpers/test/subexpressions.js b/test/subexpressions.js → helpers/test/subexpressions.js
@@ -3,7 +3,7 @@
 require('mocha');
 var assert = require('assert');
 var hbs = require('handlebars').create();
-var helpers = require('../helpers/helpers.js');
+var helpers = require('../helpers.js');
 helpers.array({handlebars: hbs});
 helpers.string({handlebars: hbs});
 

diff --git a/test/support/index.js → helpers/test/support/index.js b/test/support/index.js → helpers/test/support/index.js
@@ -30,7 +30,7 @@ utils.read = function(fp) {
 
 utils.fixture = function(type) {
   return function(fp) {
-    return utils.read('test/fixtures/' + type + '/' + fp);
+    return utils.read('helpers/test/fixtures/' + type + '/' + fp);
   };
 };
 
@@ -45,6 +45,6 @@ utils.fixture = function(type) {
 
 utils.expected = function(type) {
   return function(fp) {
-    return utils.read('test/expected/' + type + '/' + fp);
+    return utils.read('helpers/test/expected/' + type + '/' + fp);
   };
 };