Merge pull request #369 from intercom/fix-test-infra

colmdoyle · web-flow · commit 794c44384ec5 · 2023-07-10T12:05:29.000+01:00
Fix test infra
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -2,7 +2,7 @@ version: 2
 jobs:
     build:
         docker:
-            - image: circleci/node:14-browsers
+            - image: cimg/node:20.4.0
         working_directory: ~/intercom-node
         steps:
             - checkout
@@ -25,7 +25,7 @@ jobs:
                       - dist
     unit_test:
         docker:
-            - image: circleci/node:14-browsers
+            - image: cimg/node:20.4.0
         working_directory: ~/intercom-node
         steps:
             - checkout
@@ -34,7 +34,7 @@ jobs:
             - run: yarn test:unit
     integration_test:
         docker:
-            - image: circleci/node:14-browsers
+            - image: cimg/node:20.4.0
               environment:
                   API_TOKEN: $API_TOKEN
         working_directory: ~/intercom-node
diff --git a/package.json b/package.json
@@ -49,13 +49,13 @@
         "compile_ts": "tsc",
         "move_compiled_to_dist": "mv dist/lib/* dist && rmdir dist/lib",
         "prepublish": "yarn clean && yarn static && yarn compile_ts && yarn move_compiled_to_dist",
-        "test:unit": "mocha -r ts-node/register test/unit/*.test.ts --reporter=nyan",
-        "test:integration": "mocha -r ts-node/register test/integration/**/*.test.ts --timeout=30000",
+        "test:unit": "yarn compile_ts && mocha -r ts-node/register test/unit/*.test.ts --reporter=nyan",
+        "test:integration": "yarn compile_ts && mocha -r ts-node/register test/integration/**/*.test.ts --timeout=30000",
         "coverage": "nyc yarn test"
     },
     "engines": {
         "node": ">= v8.0.0"
     },
     "license": "Apache-2.0",
     "packageManager": "yarn@3.1.1"
-}
+}
diff --git a/test/integration/admins.test.ts b/test/integration/admins.test.ts
@@ -1,5 +1,5 @@
 import { token } from './utils/config';
-import { Client } from '../../dist';
+import { Client } from '../../lib';
 import assert from 'assert';
 
 describe('Admins', () => {
@@ -23,6 +23,7 @@ describe('Admins', () => {
     it('listAllActivityLogs', async () => {
         const response = await client.admins.listAllActivityLogs({
             after: new Date('2021-12-12'),
+            before: new Date('2022-01-01'),
         });
 
         assert.notEqual(response, undefined);
diff --git a/test/integration/articles.test.ts b/test/integration/articles.test.ts
@@ -1,4 +1,4 @@
-import { Client } from '../../dist';
+import { Client } from '../../lib';
 import assert from 'assert';
 import { token } from './utils/config';
 import { randomString } from './utils/random';
diff --git a/test/integration/companies.test.ts b/test/integration/companies.test.ts
@@ -1,4 +1,4 @@
-import { Client, CompanyObject, Order } from '../../dist';
+import { Client, CompanyObject, Order } from '../../lib';
 import assert from 'assert';
 import { token } from './utils/config';
 import { dateToUnixTimestamp } from '../../lib/util/time';
@@ -69,7 +69,7 @@ describe('Companies', () => {
             page: 1,
             perPage: 35,
             order: Order.DESC,
-            tagId: '2084335',
+            tagId: '7882526',
         });
 
         assert.notEqual(response, undefined);
diff --git a/test/integration/contacts.test.ts b/test/integration/contacts.test.ts
@@ -1,4 +1,4 @@
-import { Client, ContactObject } from '../../dist';
+import { Client, ContactObject } from '../../lib';
 import assert from 'assert';
 import { token } from './utils/config';
 import { randomString } from './utils/random';
diff --git a/test/integration/conversations.test.ts b/test/integration/conversations.test.ts
@@ -7,7 +7,7 @@ import {
     ContactObject,
     ConversationObject,
     MessageObject,
-} from '../../dist';
+} from '../../lib';
 import assert from 'assert';
 import { token } from './utils/config';
 import { randomString } from './utils/random';
diff --git a/test/integration/counts.test.ts b/test/integration/counts.test.ts
@@ -1,4 +1,4 @@
-import { Client } from '../../dist';
+import { Client } from '../../lib';
 import assert from 'assert';
 import { token } from './utils/config';
 
diff --git a/test/integration/dataAttributes.test.ts b/test/integration/dataAttributes.test.ts
@@ -1,4 +1,4 @@
-import { Client, DataAttributeObject, DataType, ModelType } from '../../dist';
+import { Client, DataAttributeObject, DataType, ModelType } from '../../lib';
 import assert from 'assert';
 import { token } from './utils/config';
 import { randomInt } from './utils/random';
diff --git a/test/integration/dataExport.test.ts b/test/integration/dataExport.test.ts
@@ -1,4 +1,4 @@
-import { Client } from '../../dist';
+import { Client } from '../../lib';
 import assert from 'assert';
 import { token } from './utils/config';
 
diff --git a/test/integration/events.test.ts b/test/integration/events.test.ts
@@ -1,5 +1,5 @@
-import { Client, Operators, Role } from '../../dist';
-import { dateToUnixTimestamp } from '../../dist/util/time';
+import { Client, Operators, Role } from '../../lib';
+import { dateToUnixTimestamp } from '../../lib/util/time';
 import assert from 'assert';
 import { token } from './utils/config';
 
diff --git a/test/integration/helpCenter/collections.test.ts b/test/integration/helpCenter/collections.test.ts
@@ -1,4 +1,4 @@
-import { Client, CollectionObject } from '../../../dist';
+import { Client, CollectionObject } from '../../../lib';
 import assert from 'assert';
 import { token } from '../utils/config';
 
diff --git a/test/integration/helpCenter/sections.test.ts b/test/integration/helpCenter/sections.test.ts
@@ -1,4 +1,4 @@
-import { Client, SectionObject } from '../../../dist';
+import { Client, SectionObject } from '../../../lib';
 import assert from 'assert';
 import { token } from '../utils/config';
 import { randomString } from '../utils/random';
diff --git a/test/integration/integration.test.ts b/test/integration/integration.test.ts
@@ -1,4 +1,4 @@
-import { Client, ContactObject, MessageObject } from '../../dist';
+import { Client, ContactObject, MessageObject } from '../../lib';
 import assert from 'assert';
 import { token } from './utils/config';
 import { randomInt } from 'crypto';
diff --git a/test/integration/messages.test.ts b/test/integration/messages.test.ts
@@ -1,5 +1,5 @@
 import { token } from './utils/config';
-import { Client, Operators } from '../../dist';
+import { Client, Operators } from '../../lib';
 import { randomString } from './utils/random';
 import { MessageType } from '../../lib/message/message.types';
 import { RecipientType } from '../../lib/message';
diff --git a/test/integration/notes.test.ts b/test/integration/notes.test.ts
@@ -1,4 +1,4 @@
-import { Client, NoteObject } from '../../dist';
+import { Client, NoteObject } from '../../lib';
 import assert from 'assert';
 import { token } from './utils/config';
 import { randomString } from './utils/random';
diff --git a/test/integration/phoneCallRedirect.test.ts b/test/integration/phoneCallRedirect.test.ts
@@ -1,13 +1,13 @@
-import { Client} from '../../dist';
+import { Client } from '../../lib';
 import assert from 'assert';
 import { token } from './utils/config';
 
 describe('phoneCallRedirect', () => {
     const client = new Client({ tokenAuth: { token } });
 
-    it('create', async () => {
-        const response = await client.phoneCallRedirect.create({
-          phone: '+353871234567'
+    it('create', () => {
+        const response = client.phoneCallRedirect.create({
+            phone: '+353871234567',
         });
 
         assert.notEqual(response, undefined);
diff --git a/test/integration/segments.test.ts b/test/integration/segments.test.ts
@@ -1,4 +1,4 @@
-import { Client } from '../../dist';
+import { Client } from '../../lib';
 import assert from 'assert';
 import { token } from './utils/config';
 
diff --git a/test/integration/subscriptions.test.ts b/test/integration/subscriptions.test.ts
@@ -1,4 +1,4 @@
-import { Client } from '../../dist';
+import { Client } from '../../lib';
 import assert from 'assert';
 import { token } from './utils/config';
 
diff --git a/test/integration/tags.test.ts b/test/integration/tags.test.ts
@@ -1,4 +1,4 @@
-import { Client, TagObject } from '../../dist';
+import { Client, TagObject } from '../../lib';
 import assert from 'assert';
 import { token } from './utils/config';
 
diff --git a/test/integration/teams.test.ts b/test/integration/teams.test.ts
@@ -1,4 +1,4 @@
-import { Client } from '../../dist';
+import { Client } from '../../lib';
 import assert from 'assert';
 import { token } from './utils/config';
 
diff --git a/test/integration/visitors.test.ts b/test/integration/visitors.test.ts
@@ -1,4 +1,4 @@
-import { Client, Role } from '../../dist';
+import { Client, Role } from '../../lib';
 import assert from 'assert';
 import { token } from './utils/config';
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { Client } from '../../dist';`
	`1`	`+import { Client } from '../../lib';`
`2`	`2`	`import assert from 'assert';`
`3`	`3`	`import { token } from './utils/config';`
`4`	`4`	`import { randomString } from './utils/random';`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { Client, ContactObject } from '../../dist';`
	`1`	`+import { Client, ContactObject } from '../../lib';`
`2`	`2`	`import assert from 'assert';`
`3`	`3`	`import { token } from './utils/config';`
`4`	`4`	`import { randomString } from './utils/random';`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { Client, DataAttributeObject, DataType, ModelType } from '../../dist';`
	`1`	`+import { Client, DataAttributeObject, DataType, ModelType } from '../../lib';`
`2`	`2`	`import assert from 'assert';`
`3`	`3`	`import { token } from './utils/config';`
`4`	`4`	`import { randomInt } from './utils/random';`