convoyinc · monotkate · Oct 20, 2018 · Oct 20, 2018 · Oct 20, 2018 · Oct 20, 2018
diff --git a/package.json b/package.json
@@ -33,8 +33,6 @@
     "test-unit-coverage": "./scripts/test-unit-coverage.sh"
   },
   "devDependencies": {
-    "@types/chai": "^4.0.10",
-    "@types/chai-as-promised": "^7.1.0",
     "@types/deep-freeze-strict": "^1.1.0",
     "@types/graphql": "^0.12.4",
     "@types/lodash": "^4.14.102",
@@ -43,9 +41,6 @@
     "@types/lodash.isequal": "^4.3.3",
     "@types/lodash.set": "^4.3.3",
     "@types/node": "^8.9.4",
-    "chai": "^4.1.2",
-    "chai-as-promised": "^7.1.1",
-    "chai-jest-diff": "nevir/chai-jest-diff#built-member-assertions",
     "codecov": "^3.0.0",
     "eslint": "^5.0.0",
     "eslint-plugin-eslint-comments": "^3.0.0",

diff --git a/test/env/base.ts b/test/env/base.ts
@@ -1,25 +0,0 @@
-import * as chai from 'chai';
-import * as chaiAsPromised from 'chai-as-promised';
-import chaiJestDiff from 'chai-jest-diff';
-
-// Chai
-
-// We are transitioning to using Jasmine for our test expects.  During the
-// transition, Jasmine and chai will be run in parallel using jestExpect for
-// Jasmine, and the default expect for chai.  Once complete, Jasmine will
-// replace the chai global.expect.
-global.jestExpect = global.expect;
-// We prefer Chai's `expect` interface.
-global.expect = chai.expect;
-
-// Give us all the info!
-chai.config.truncateThreshold = 0;
-
-// Pretty expectation output for Chai assertions
-chai.use(chaiJestDiff());
-
-// Promise-aware chai assertions (that return promises themselves):
-//
-//   await expect(promise).to.be.rejectedWith(/error/i);
-//
-chai.use(chaiAsPromised);

diff --git a/test/unit/Apollo/addTypeNameBeforeWrite.ts b/test/unit/Apollo/addTypeNameBeforeWrite.ts
@@ -34,7 +34,7 @@ describe(`transform document before write`, () => {
   });
 
   it(`correctly write with __typename`, () => {
-    jestExpect(hermes.readQuery({
+    expect(hermes.readQuery({
       query: gql(`
         query getViewer {
           viewer {

diff --git a/test/unit/Apollo/addTypeNameBeforeWriteFragment.ts b/test/unit/Apollo/addTypeNameBeforeWriteFragment.ts
@@ -69,7 +69,7 @@ describe(`transform document before writeFragmetn`, () => {
   });
 
   it(`correctly writeFragment with __typename`, () => {
-    jestExpect(hermes.readQuery({
+    expect(hermes.readQuery({
       query: gql(`
       query getViewer {
         viewer(count: 2) {

diff --git a/test/unit/Apollo/addTypeNameBeforeWriteQuery.ts b/test/unit/Apollo/addTypeNameBeforeWriteQuery.ts
@@ -32,7 +32,7 @@ describe(`transform document before writeQuery`, () => {
   });
 
   it(`correctly writeQuery with __typename`, () => {
-    jestExpect(hermes.readQuery({
+    expect(hermes.readQuery({
       query: gql(`
         query getViewer {
           viewer {

diff --git a/test/unit/Apollo/persistenceRoundTrip.ts b/test/unit/Apollo/persistenceRoundTrip.ts
@@ -68,7 +68,7 @@ describe(`extract/restore roundtrip`, () => {
       addTypename: true,
     });
 
-    jestExpect(() => {
+    expect(() => {
       hermes.restore(JSON.parse(persisted), undefined, {
         query: gql(baseResourcesV2),
         optimistic: false,
@@ -82,7 +82,7 @@ describe(`extract/restore roundtrip`, () => {
       addTypename: true,
     });
 
-    jestExpect(() => {
+    expect(() => {
       hermes.restore(JSON.parse(persisted), {
         _entities: {
           Viewer: {
@@ -95,7 +95,7 @@ describe(`extract/restore roundtrip`, () => {
       });
     }).not.toThrow();
 
-    jestExpect(() => {
+    expect(() => {
       hermes.readQuery({
         query: gql(`
           query getViewer {
@@ -116,7 +116,7 @@ describe(`extract/restore roundtrip`, () => {
       addTypename: true,
     });
 
-    jestExpect(() => {
+    expect(() => {
       hermes.restore(JSON.parse(persisted), {
         _entities: {
           Viewer: {
@@ -129,7 +129,7 @@ describe(`extract/restore roundtrip`, () => {
       });
     }).not.toThrow();
 
-    jestExpect(hermes.readQuery({
+    expect(hermes.readQuery({
       query: gql(baseResourcesV2),
     })).toEqual({
       viewer: {

diff --git a/test/unit/Apollo/readFragment/aliasReference.ts b/test/unit/Apollo/readFragment/aliasReference.ts
@@ -58,7 +58,7 @@ describe(`readFragment with alias references`, () => {
   });
 
   it(`correctly read a fragment with parameterized reference`, () => {
-    jestExpect(hermes.readFragment({
+    expect(hermes.readFragment({
       id: '123',
       fragment: gql(`
         fragment viewer on Viewer {

diff --git a/test/unit/Apollo/readFragment/basicOneFragment.ts b/test/unit/Apollo/readFragment/basicOneFragment.ts
@@ -29,7 +29,7 @@ describe(`readFragment with one fragment`, () => {
   });
 
   it(`correctly read a fragment`, () => {
-    jestExpect(hermes.readFragment({
+    expect(hermes.readFragment({
       id: '123',
       fragment: gql(`
         fragment viewer on Viewer {

diff --git a/test/unit/Apollo/readFragment/dataNotFound.ts b/test/unit/Apollo/readFragment/dataNotFound.ts
@@ -12,7 +12,7 @@ describe(`readFragment with no matching data`, () => {
   });
 
   it(`correctly returns undefined`, () => {
-    jestExpect(hermes.readFragment({
+    expect(hermes.readFragment({
       id: '123',
       fragment: gql(`
         fragment viewer on Viewer {

diff --git a/test/unit/Apollo/readFragment/errorMultipleFragmentsWithoutFragmentName.ts b/test/unit/Apollo/readFragment/errorMultipleFragmentsWithoutFragmentName.ts
@@ -29,7 +29,7 @@ describe(`readFragment with ambiguous fragments`, () => {
   });
 
   it(`throws an error`, () => {
-    jestExpect(() => {
+    expect(() => {
       hermes.readFragment({
         id: '123',
         fragment: gql(`

diff --git a/test/unit/Apollo/readFragment/errorNoFragment.ts b/test/unit/Apollo/readFragment/errorNoFragment.ts
@@ -29,7 +29,7 @@ describe(`readFragment when no fragment is provided`, () => {
   });
 
   it(`throws an error`, () => {
-    jestExpect(() => {
+    expect(() => {
       hermes.readFragment({
         id: '123',
         fragment: gql(`

diff --git a/test/unit/Apollo/readFragment/incompleteCacheData.ts b/test/unit/Apollo/readFragment/incompleteCacheData.ts
@@ -29,7 +29,7 @@ describe(`readFragment with incomplete cache`, () => {
   });
 
   it(`returns the partial result`, () => {
-    jestExpect(hermes.readFragment({
+    expect(hermes.readFragment({
       id: '123',
       fragment: gql(`
         fragment viewer on Viewer {

diff --git a/test/unit/Apollo/readFragment/multipleFragments.ts b/test/unit/Apollo/readFragment/multipleFragments.ts
@@ -39,7 +39,7 @@ describe(`readFragment with multiple fragments`, () => {
   });
 
   it(`returns a value following the named fragment ('viewer')`, () => {
-    jestExpect(hermes.readFragment({
+    expect(hermes.readFragment({
       id: '123',
       fragmentName: 'viewer',
       fragment: gql(`
@@ -68,7 +68,7 @@ describe(`readFragment with multiple fragments`, () => {
   });
 
   it(`returns a value following the named fragment ('shipment')`, () => {
-    jestExpect(hermes.readFragment({
+    expect(hermes.readFragment({
       id: 'shipment0',
       fragmentName: 'shipment',
       fragment: gql(`

diff --git a/test/unit/Apollo/readFragment/parameterizedReference.ts b/test/unit/Apollo/readFragment/parameterizedReference.ts
@@ -58,7 +58,7 @@ describe(`readFragment with parameterized references`, () => {
   });
 
   it(`returns parameterized data`, () => {
-    jestExpect(hermes.readFragment({
+    expect(hermes.readFragment({
       id: '123',
       fragment: gql(`
         fragment viewer on Viewer {

diff --git a/test/unit/Apollo/readFragment/parameterizedReferenceInArray.ts b/test/unit/Apollo/readFragment/parameterizedReferenceInArray.ts
@@ -72,7 +72,7 @@ describe(`writeFragment with parameterized references within arrays`, () => {
   });
 
   it(`returns parameterized data`, () => {
-    jestExpect(hermes.readFragment({
+    expect(hermes.readFragment({
       id: '123',
       fragment: gql(`
       fragment viewer on Viewer {

diff --git a/test/unit/Apollo/readFragment/parameterizedValue.ts b/test/unit/Apollo/readFragment/parameterizedValue.ts
@@ -51,7 +51,7 @@ describe(`readFragment with parameterized values`, () => {
   });
 
   it(`returns parameterized data`, () => {
-    jestExpect(hermes.readFragment({
+    expect(hermes.readFragment({
       id: '123',
       fragment: gql(`
         fragment viewer on Viewer {

diff --git a/test/unit/Apollo/writeFragment/addReference.ts b/test/unit/Apollo/writeFragment/addReference.ts
@@ -57,7 +57,7 @@ describe(`writeFragment`, () => {
   });
 
   it(`adds references`, () => {
-    jestExpect(hermes.getCurrentCacheSnapshot().baseline.getNodeData('shipment0')).toEqual({
+    expect(hermes.getCurrentCacheSnapshot().baseline.getNodeData('shipment0')).toEqual({
       id: 'shipment0',
       city: 'Seattle',
       __typename: 'Shipment',
@@ -66,7 +66,7 @@ describe(`writeFragment`, () => {
 
   it(`inlines referenced data into referencing entities`, () => {
     const baseline = hermes.getCurrentCacheSnapshot().baseline;
-    jestExpect(baseline.getNodeSnapshot('123')).toEqual(
+    expect(baseline.getNodeSnapshot('123')).toEqual(
       new EntitySnapshot(
         {
           id: 123,
@@ -83,7 +83,7 @@ describe(`writeFragment`, () => {
       )
     );
 
-    jestExpect(baseline.getNodeData('123')!['shipment']).toBe(baseline.getNodeData('shipment0'));
+    expect(baseline.getNodeData('123')!['shipment']).toBe(baseline.getNodeData('shipment0'));
   });
 
 });
diff --git a/test/unit/Apollo/writeFragment/errorConvertListToNonList.ts b/test/unit/Apollo/writeFragment/errorConvertListToNonList.ts
@@ -40,7 +40,7 @@ describe(`writeFragment`, () => {
   });
 
   it(`throws an error when trying to convert from list to non-list`, () => {
-    jestExpect(() => {
+    expect(() => {
       hermes.writeFragment({
         id: '123',
         fragment: gql(`

diff --git a/test/unit/Apollo/writeFragment/errorConvertNonListToList.ts b/test/unit/Apollo/writeFragment/errorConvertNonListToList.ts
@@ -38,7 +38,7 @@ describe(`writeFragment`, () => {
   });
 
   it(`throws an error when trying to convert from list to non-list`, () => {
-    jestExpect(() => {
+    expect(() => {
       hermes.writeFragment({
         id: '123',
         fragment: gql(`

diff --git a/test/unit/Apollo/writeFragment/errorMultipleFragmentsWithoutFragmentName.ts b/test/unit/Apollo/writeFragment/errorMultipleFragmentsWithoutFragmentName.ts
@@ -12,7 +12,7 @@ describe(`writeFragment when using multiple fragments without fragmentName`, ()
   });
 
   it(`throws an error`, () => {
-    jestExpect(() => {
+    expect(() => {
       hermes.writeFragment({
         id: '123',
         fragment: gql(`

diff --git a/test/unit/Apollo/writeFragment/errorNoFragment.ts b/test/unit/Apollo/writeFragment/errorNoFragment.ts
@@ -12,7 +12,7 @@ describe(`writeFragment with no fragment`, () => {
   });
 
   it(`throws an error`, () => {
-    jestExpect(() => {
+    expect(() => {
       hermes.writeFragment({
         id: '123',
         fragment: gql(`

diff --git a/test/unit/Apollo/writeFragment/modifyAliasParameterizedReference.ts b/test/unit/Apollo/writeFragment/modifyAliasParameterizedReference.ts
@@ -84,7 +84,7 @@ describe(`writeFragment with alias paramterized references`, () => {
   });
 
   it(`correctly modify data`, () => {
-    jestExpect(baseline.getNodeData('shipment0')).toEqual({
+    expect(baseline.getNodeData('shipment0')).toEqual({
       complete: true,
       truckType: 'flatbed',
       id: 'shipment0',
@@ -93,7 +93,7 @@ describe(`writeFragment with alias paramterized references`, () => {
   });
 
   it(`correctly references a parameterized reference`, () => {
-    jestExpect(baseline.getNodeSnapshot(parameterizedId)).toEqual({
+    expect(baseline.getNodeSnapshot(parameterizedId)).toEqual({
       outbound: [{ id: 'shipment0', path: [] }],
       inbound: [{ id: '123', path: ['shipment'] }],
       data: {
@@ -103,7 +103,7 @@ describe(`writeFragment with alias paramterized references`, () => {
         destination: 'Seattle',
       },
     });
-    jestExpect(baseline.getNodeData(parameterizedId)).toBe(baseline.getNodeData('shipment0'));
+    expect(baseline.getNodeData(parameterizedId)).toBe(baseline.getNodeData('shipment0'));
   });
 
 });
diff --git a/test/unit/Apollo/writeFragment/modifyNestedParameterizeValue.ts b/test/unit/Apollo/writeFragment/modifyNestedParameterizeValue.ts
@@ -81,7 +81,7 @@ describe(`writeFragment with nested paramterized value`, () => {
       { number: 2 }
     );
 
-    jestExpect(hermes.getCurrentCacheSnapshot().baseline.getNodeSnapshot('123')).toEqual(
+    expect(hermes.getCurrentCacheSnapshot().baseline.getNodeSnapshot('123')).toEqual(
       new EntitySnapshot(
         {
           id: 123,
@@ -93,7 +93,7 @@ describe(`writeFragment with nested paramterized value`, () => {
       )
     );
 
-    jestExpect(hermes.getCurrentCacheSnapshot().baseline.getNodeSnapshot(parameterizedTruckId)).toEqual(
+    expect(hermes.getCurrentCacheSnapshot().baseline.getNodeSnapshot(parameterizedTruckId)).toEqual(
       new ParameterizedValueSnapshot(
         [
           {
@@ -143,7 +143,7 @@ describe(`writeFragment with nested paramterized value`, () => {
       { number: 2 }
     );
 
-    jestExpect(hermes.getCurrentCacheSnapshot().baseline.getNodeSnapshot('123')).toEqual(
+    expect(hermes.getCurrentCacheSnapshot().baseline.getNodeSnapshot('123')).toEqual(
       new EntitySnapshot(
         {
           id: 123,
@@ -155,7 +155,7 @@ describe(`writeFragment with nested paramterized value`, () => {
       )
     );
 
-    jestExpect(hermes.getCurrentCacheSnapshot().baseline.getNodeSnapshot(parameterizedTruckId)).toEqual(
+    expect(hermes.getCurrentCacheSnapshot().baseline.getNodeSnapshot(parameterizedTruckId)).toEqual(
       new ParameterizedValueSnapshot(
         [
           {

diff --git a/test/unit/Apollo/writeFragment/modifyParameterizedReference.ts b/test/unit/Apollo/writeFragment/modifyParameterizedReference.ts
@@ -84,7 +84,7 @@ describe(`writeFragment with parameterized references`, () => {
   });
 
   it(`correctly modify data`, () => {
-    jestExpect(baseline.getNodeData('shipment0')).toEqual({
+    expect(baseline.getNodeData('shipment0')).toEqual({
       complete: true,
       truckType: 'flatbed',
       id: 'shipment0',
@@ -93,7 +93,7 @@ describe(`writeFragment with parameterized references`, () => {
   });
 
   it(`correctly references a parameterized reference`, () => {
-    jestExpect(baseline.getNodeSnapshot(parameterizedId)).toEqual({
+    expect(baseline.getNodeSnapshot(parameterizedId)).toEqual({
       outbound: [{ id: 'shipment0', path: [] }],
       inbound: [{ id: '123', path: ['shipment'] }],
       data: {
@@ -103,7 +103,7 @@ describe(`writeFragment with parameterized references`, () => {
         destination: 'Seattle',
       },
     });
-    jestExpect(baseline.getNodeData(parameterizedId)).toBe(baseline.getNodeData('shipment0'));
+    expect(baseline.getNodeData(parameterizedId)).toBe(baseline.getNodeData('shipment0'));
   });
 
 });