yarn-support

.gitignore

@@ -26,4 +26,6 @@ src/components/base-component-handlebars/_package
 src/components/base-component-jade/_package
 
 test/fixtures/test.tar.gz
-test/fixtures/targz-test
+test/fixtures/targz-test
+
+coverage

__tests__/src/utils/__snapshots__/require-template.test.js.snap

@@ -0,0 +1,23 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`requireTemplate not valid lodash 1`] = `"Error requiring oc-template: \\"lodash\\" is not a valid oc-template"`;
+
+exports[`requireTemplate not valid oc-invalid-template 1`] = `"Error requiring oc-template: \\"oc-invalid-template\\" not found"`;
+
+exports[`requireTemplate valid oc-template-handlebars 1`] = `
+Object {
+  "compile": [Function],
+  "getCompiledTemplate": [Function],
+  "getInfo": [Function],
+  "render": [Function],
+}
+`;
+
+exports[`requireTemplate valid oc-template-jade 1`] = `
+Object {
+  "compile": [Function],
+  "getCompiledTemplate": [Function],
+  "getInfo": [Function],
+  "render": [Function],
+}
+`;

__tests__/src/utils/require-template.test.js

@@ -0,0 +1,44 @@
+const requireTemplate = require('../../../src/utils/require-template');
+
+describe('requireTemplate', () => {
+  test('expect type of `requireTemplate` to be function', () => {
+    expect(typeof requireTemplate).toBe('function');
+  });
+
+  describe('valid', () => {
+    const scenarios = [
+      { name: 'oc-template-handlebars' },
+      { name: 'oc-template-jade' }
+    ];
+
+    scenarios.forEach(({ name }) => {
+      test(name, () => {
+        const template = requireTemplate(name);
+
+        ['compile', 'getCompiledTemplate', 'getInfo', 'render']
+          .forEach((method) => {
+            expect(template).toHaveProperty(method);
+          });
+        expect(template).toMatchSnapshot();
+      });
+    });
+  });
+
+  describe('not valid', () => {
+    const scenarios = [
+      { name: 'lodash' },
+      { name: 'oc-invalid-template' }
+    ];
+
+    scenarios.forEach(({ name }) => {
+      test(name, () => {
+        const sut = () => {
+          requireTemplate(name);
+        };
+
+        expect(sut).toThrow();
+        expect(sut).toThrowErrorMatchingSnapshot();
+      });
+    });
+  });
+});

package.json

@@ -44,6 +44,7 @@
     "husky": "^0.13.4",
     "injectr": "0.5.1",
     "jasmine-core": "^2.5.1",
+    "jest": "^20.0.3",
     "karma": "^1.3.0",
     "karma-jasmine": "^1.0.2",
     "karma-phantomjs-launcher": "^1.0.2",

src/utils/require-template.js

@@ -17,7 +17,14 @@ function isValidTemplate(template) {
   );
 }
 
-module.exports = function(template) {
+const getOcTemplate = (path) => {
+  if (require.cache && !!require.cache[path]) {
+    delete require.cache[path];
+  }
+  return require(path);
+};
+
+module.exports = function (template) {
   let ocTemplate;
   const localTemplate = path.join(
     __dirname,
@@ -28,23 +35,21 @@ module.exports = function(template) {
   const relativeTemplate = path.resolve('.', 'node_modules', template);
 
   try {
-    if (require.cache && !!require.cache[localTemplate]) {
-      delete require.cache[localTemplate];
-    }
-    ocTemplate = require(localTemplate);
+    ocTemplate = getOcTemplate(template);
   } catch (err) {
     try {
-      if (require.cache && !!require.cache[relativeTemplate]) {
-        delete require.cache[relativeTemplate];
-      }
-      ocTemplate = require(relativeTemplate);
+      ocTemplate = getOcTemplate(localTemplate);
     } catch (err) {
-      throw format(templateNotFound, template);
+      try {
+        ocTemplate = getOcTemplate(relativeTemplate);
+      } catch (err) {
+        throw new Error(format(templateNotFound, template));
+      }
     }
   }
 
   if (!isValidTemplate(ocTemplate)) {
-    throw format(templateNotValid, template);
+    throw new Error(format(templateNotValid, template));
   }
 
   return ocTemplate;

test/unit/cli-domain-package-template.js

@@ -91,7 +91,7 @@ describe('cli : domain : package-template', () => {
         });
 
         it('should show error', () => {
-          expect(error).to.equal('template.wha compilation failed - Error requiring oc-template: "whazaaa" not found');
+          expect(error).to.equal('template.wha compilation failed - Error: Error requiring oc-template: "whazaaa" not found');
         });
       });
     });

test/unit/registry-domain-repository.js

@@ -134,7 +134,7 @@ describe('registry : domain : repository', () => {
           try {
             Repository(conf);
           } catch (err) {
-            expect(err).to.equal('Error requiring oc-template: "oc-template-react" not found');
+            expect(err.message).to.equal('Error requiring oc-template: "oc-template-react" not found');
           }
         });
       });

test/unit/utils-require-templates.js

@@ -46,7 +46,7 @@ describe('utils : require-template', () => {
     try {
       requireTemplate('handlebars');
     } catch (e) {
-      expect(e).to.equal('Error requiring oc-template: "handlebars" is not a valid oc-template');
+      expect(e.message).to.equal('Error requiring oc-template: "handlebars" is not a valid oc-template');
     }
   });
 });