re structure tests and jest config.

thomas-anu · Feb 27, 2020 · 28ba9eb · 28ba9eb
1 parent da5d5f0
commit 28ba9eb
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 11 deletions.
diff --git a/jest.config.js b/jest.config.js
@@ -1,9 +1,9 @@
 module.exports = {
-  roots: ['<rootDir>/src'],
   transform: {
-    '^.+\\.ts?$': 'ts-jest',
+      "^.+\\.tsx?$": "ts-jest",
   },
-  testRegex: '(/__tests__/.*|(\\.|/)(test|spec))\\.ts?$',
-  moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'json', 'node']
-};
-
+  testRegex: "(/__tests__/.*|(\\.|/)(test|spec))\\.(jsx?|tsx?)$",
+  testPathIgnorePatterns: ["/lib/", "/node_modules/"],
+  moduleFileExtensions: ["ts", "tsx", "js", "jsx", "json", "node"],
+  // collectCoverage: true,
+};
diff --git a/src/__tests__/mocks/connectionsResponse.json → src/test/mocks/connectionsResponse.json b/src/__tests__/mocks/connectionsResponse.json → src/test/mocks/connectionsResponse.json
diff --git a/...ests__/mocks/getOrganisationResponse.json → src/test/mocks/getOrganisationResponse.json b/...ests__/mocks/getOrganisationResponse.json → src/test/mocks/getOrganisationResponse.json
diff --git a/src/__tests__/mocks/tokenSet.json → src/test/mocks/tokenSet.json b/src/__tests__/mocks/tokenSet.json → src/test/mocks/tokenSet.json
diff --git a/src/__tests__/xeroClient.test.ts → src/test/xeroClient.spec.ts b/src/__tests__/xeroClient.test.ts → src/test/xeroClient.spec.ts
diff --git a/src/xeroClient.ts b/src/xeroClient.ts
@@ -82,16 +82,16 @@ export class XeroClient {
     return url;
   }
 
-  async apiCallback(url: string): Promise<TokenSet> {
-    const params = this.openIdClient.callbackParams(url)
+  async apiCallback(callbackUrl: string): Promise<TokenSet> {
+    const params = this.openIdClient.callbackParams(callbackUrl)
     const check = {...params}
     this.tokenSet = await this.openIdClient.callback(this.config.redirectUris[0], params, check);
     this.setAccessToken();
     return this.tokenSet
   }
 
-  async disconnect(tenantId: string): Promise<TokenSet> {
-    await this.queryApi('DELETE', `https://api.xero.com/connections/${tenantId}`)
+  async disconnect(connectionId: string): Promise<TokenSet> {
+    await this.queryApi('DELETE', `https://api.xero.com/connections/${connectionId}`)
     this.setAccessToken();
     return this.tokenSet
   }

diff --git a/tsconfig.json b/tsconfig.json
@@ -14,6 +14,6 @@
   "exclude": [
     "node_modules",
     "dist",
-    "**/*.test.ts"
+    "src/test/"
   ]
 }