Adds tests and replaces var with let

Author: Nikhil-Vats

__tests__/app.js

@@ -63,18 +63,54 @@ describe("generator-biojs-webcomponents:app - Make a new Web Component", () => {
         ]);
       });
   });
-  it("throws an error if user enters an empty string as toolNameHuman", async () => {
+  it("passes if toolNameComputer is correctly formatted", async () => {
     assert.equal(
-      await validators.toolNameHuman(""),
-      chalk.red("This is a mandatory field, please answer.")
+      await validators.toolNameComputer("tool-name-computer-1"),
+      true
     );
   });
+  it("passes if toolNameHuman is correctly formatted", async () => {
+    assert.equal(await validators.toolNameHuman("Tool Name Human"), true);
+  });
+  it("throws an error if toolNameComputer is wrongly formatted", async () => {
+    let err1 = await validators.toolNameComputer("-tool-name");
+    let err2 = await validators.toolNameComputer("tool-name-");
+    let err3 = await validators.toolNameComputer("toolName-computer");
+    let err4 = await validators.toolNameComputer("*toolname-comp");
+    let err5 = await validators.toolNameComputer("tool name");
+    if (
+      err1 !== true &&
+      err2 !== true &&
+      err3 !== true &&
+      err4 !== true &&
+      err5 !== true
+    ) {
+      assert.ok(true);
+    } else {
+      assert.fail();
+    }
+  });
+  it("throws an error if toolNameHuman is wrongly formatted", async () => {
+    let err1 = await validators.toolNameHuman("tool-name");
+    let err2 = await validators.toolNameHuman("toolname1");
+    if (err1 !== true && err2 !== true) {
+      assert.ok(true);
+    } else {
+      assert.fail();
+    }
+  });
   it("throws an error if user enters an empty string as toolNameComputer", async () => {
     assert.equal(
       await validators.toolNameComputer(""),
       chalk.red("This is a mandatory field, please answer.")
     );
   });
+  it("throws an error if user enters an empty string as toolNameHuman", async () => {
+    assert.equal(
+      await validators.toolNameHuman(""),
+      chalk.red("This is a mandatory field, please answer.")
+    );
+  });
 });
 
 describe("generator-biojs-webcomponents:app - Upgrade an existing component by importing build file locally", () => {
@@ -83,6 +119,10 @@ describe("generator-biojs-webcomponents:app - Upgrade an existing component by i
       assert.file("test-component");
     });
   });
+  it("does not throw an error if user enters path of a project directory which already exists", async () => {
+    let res = await validators.storeArg("test-component");
+    assert.equal(res, true);
+  });
   it("makes a new directory named - component-dist", async () => {
     await validators
       .directoryName("component-dist")
@@ -97,6 +137,18 @@ describe("generator-biojs-webcomponents:app - Upgrade an existing component by i
         assert.file(["test-component/component-dist/validator.js"]);
       });
   });
+  it("overwrites the directory content if user enters o or O", async () => {
+    await validators
+      .directoryName("o")
+      .then(() =>
+        assert.noFile(["test-component/component-dist/validator.js"])
+      );
+  });
+  it("makes a new directory if user enters a new name", async () => {
+    await validators.directoryName("new-build-dir").then(() => {
+      assert.file("test-component/new-build-dir");
+    });
+  });
   it("throws an error if user enters an empty string as path of build file", async () => {
     assert.equal(
       await validators.importBuildFileFromNPM(""),

generators/app/index.js

@@ -477,9 +477,9 @@ module.exports = class extends Generator {
  * @return {aString}, but with spaces removed and camelCased.
  **/
 function toCamelCase(aString) {
-  var tokens = aString.split(" ");
+  let tokens = aString.split(" ");
 
-  var camelString = "";
+  let camelString = "";
   tokens.map(function(token, index) {
     if (token.trim() !== "") {
       // Remove extra space between the words

generators/app/validator.js

@@ -13,10 +13,10 @@ validators.storeArg = async function(props) {
     return true;
   }
 
-  var res = await executeCommand("mkdir " + projectDirectory)
+  let res = await executeCommand("mkdir " + projectDirectory)
     .then(() => true)
     .catch(async () => {
-      var tryAgain = await executeCommand(
+      let tryAgain = await executeCommand(
         "ls " + projectDirectory,
         "checkDirExistence"
       )
@@ -70,7 +70,7 @@ validators.packageName = async function(props) {
 validators.version = async function(props, answers) {
   if (props) {
     let command = "npm view " + answers.packageName + "@" + props;
-    var res = await executeCommand(command, "version")
+    let res = await executeCommand(command, "version")
       .then(() => {
         return true;
       })
@@ -97,9 +97,9 @@ validators.checkVersionAndInstallComponent = async function(props, answers) {
   if (props) {
     let command =
       "npm view " + answers.packageNameToInstallComponent + "@" + props;
-    var res = await executeCommand(command, "version")
+    let res = await executeCommand(command, "version")
       .then(async () => {
-        var res = await executeCommand(
+        let res = await executeCommand(
           "cd " +
             projectDirectory +
             " && npm i " +
@@ -139,7 +139,7 @@ validators.checkVersionAndInstallComponent = async function(props, answers) {
 };
 
 validators.directoryName = async props => {
-  var res;
+  let res;
   if (props.trim() === "o" || props.trim() === "O") {
     res = await executeCommand(`rm -rf ${projectDirectory}/${buildDirectory}/*`)
       .then(() => true)
@@ -173,7 +173,7 @@ validators.directoryName = async props => {
 
 validators.importBuildFileFromNPM = async function(props) {
   if (props) {
-    var res = await executeCommand(
+    let res = await executeCommand(
       "cd " + projectDirectory + "/" + buildDirectory + " && curl -O " + props,
       "importBuildFileFromNPM"
     )
@@ -205,7 +205,7 @@ validators.importBuildFileFromNPM = async function(props) {
 
 validators.importBuildFileLocally = async props => {
   if (props) {
-    var res = await executeCommand(
+    let res = await executeCommand(
       "cp " + props + " " + projectDirectory + "/" + buildDirectory,
       "importBuildFileLocally"
     )