See #58. Fix bug in NodeDependency error message

Unibeautify · Apr 7, 2018 · e2220b0 · e2220b0
1 parent e5f7973
commit e2220b0
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/src/DependencyManager/NodeDependency.ts b/src/DependencyManager/NodeDependency.ts
@@ -23,17 +23,17 @@ export class NodeDependency extends Dependency {
 
   // tslint:disable-next-line:no-reserved-keywords
   private require(id?: string): any {
-    const modulePath = this.resolve(id);
+    const path = this.fullPath(id);
+    const modulePath = this.resolve(path);
     if (modulePath) {
       // tslint:disable-next-line:no-require-imports non-literal-require
       return require(modulePath);
     } else {
-      throw new Error(`Cannot find module ${id}`);
+      throw new Error(`Cannot find module ${path}`);
     }
   }
 
-  private resolve(file?: string): string | undefined {
-    const path = this.fullPath(file);
+  private resolve(path: string): string | undefined {
     return this.resolveLocal(path) || this.resolveGlobal(path);
   }
 

diff --git a/test/DependencyManager/DependencyManager.spec.ts b/test/DependencyManager/DependencyManager.spec.ts
@@ -18,7 +18,7 @@ test("should fail to load dependencies", async () => {
     expect(error.message).toMatch(
       'Dependency "NotFound" is required and not installed.'
     );
-    expect(error.message).toMatch("Cannot find module package.json");
+    expect(error.message).toMatch("Cannot find module notfound/package.json");
   });
 });
 

diff --git a/test/DependencyManager/NodeDependency.spec.ts b/test/DependencyManager/NodeDependency.spec.ts
@@ -8,7 +8,7 @@ test("should fail to load Node dependency", async () => {
   expect.assertions(5);
   const options: DependencyOptions = {
     name: "NotFound",
-    package: "NotFound",
+    package: "notfound",
     type: DependencyType.Node,
   };
   const dependency = new NodeDependency(options);
@@ -17,12 +17,12 @@ test("should fail to load Node dependency", async () => {
     expect(error.message).toMatch(
       'Dependency "NotFound" is required and not installed.'
     );
-    expect(error.message).toMatch("Cannot find module package.json");
+    expect(error.message).toMatch("Cannot find module notfound/package.json");
     expect(dependency.isInstalled).toBe(false);
     expect(dependency.errors).toHaveLength(1);
     expect(error.message).toMatch(
       'Dependency "NotFound" is required and not installed.\n' +
-        "  - Cannot find module package.json"
+        "  - Cannot find module notfound/package.json"
     );
   });
 });