WIP: update relative paths in tests directory

MatrixAI · Jun 15, 2020 · 3c1c487 · 3c1c487
1 parent abff662
commit 3c1c487
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 16 deletions.
diff --git a/jest.config.js b/jest.config.js
@@ -1,5 +1,3 @@
-const { pathsToModuleNameMapper } = require('ts-jest/utils');
-
 module.exports = {
   "roots": [
     "<rootDir>/tests"
@@ -10,9 +8,7 @@ module.exports = {
   "transform": {
     "^.+\\.tsx?$": "ts-jest"
   },
-  moduleNameMapper: pathsToModuleNameMapper(
-    compilerOptions.paths,
-    { prefix: "<rootDir>/src/" }
-  )
-
+  moduleNameMapper: {
+    '@polykey/(.*)$': '<rootDir>/src/lib/$1'
+  }
 };
diff --git a/src/lib/RPC/RPCMessage.ts b/src/lib/RPC/RPCMessage.ts
@@ -15,7 +15,7 @@ class RPCMessage {
     // Load root
     const root: Root = new protobuf.Root()
     root.resolvePath = (origin, target) => {
-      return Path.join(__filename, target)
+      return Path.join(Path.dirname(__filename), target)
     }
 
     return root.loadSync(name)

diff --git a/tests/Polykey.test.ts b/tests/Polykey.test.ts
@@ -1,9 +1,9 @@
 // ts imports
 import fs from 'fs'
 import os from 'os'
-import Polykey from '../src/lib/Polykey'
-import { randomString } from '../src/lib/utils'
-import KeyManager from '../src/lib/KeyManager'
+import Polykey from '@polykey/Polykey'
+import { randomString } from '@polykey/utils'
+import KeyManager from '@polykey/KeyManager'
 
 describe('PolyKey class', () => {
 

diff --git a/tests/Vaults.test.ts b/tests/Vaults.test.ts
@@ -1,8 +1,8 @@
 import fs from 'fs'
 import os from 'os'
-import Polykey from "../src/lib/Polykey"
-import { randomString } from '../src/lib/utils'
-import KeyManager from '../src/lib/KeyManager'
+import Polykey from "@polykey/Polykey"
+import { randomString } from '@polykey/utils'
+import KeyManager from '@polykey/KeyManager'
 
 describe('vaults', () => {
   let vaultName: string

diff --git a/tsconfig.json b/tsconfig.json
@@ -9,9 +9,9 @@
     "allowSyntheticDefaultImports": true,
     "module": "CommonJS",
     "target": "ES2018",
-    "baseUrl": "src/lib",
+    "baseUrl": ".",
     "paths": {
-      "@polykey/*": ["*"],
+      "@polykey/*": ["src/lib/*"],
     }
   },
   "include": [