Skip to content

Commit 323f2d2

Browse files
IvanGoncharovleebyron
authored andcommitted
Tests: Remove excessive dependencies and async/await (#1269)
1 parent a62eea8 commit 323f2d2

File tree

10 files changed

+438
-464
lines changed

10 files changed

+438
-464
lines changed

resources/mocha-bootload.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
*/
77

88
var chai = require('chai');
9-
chai.use(require('chai-json-equal'));
10-
chai.use(require('chai-spies-next'));
119
chai.use(require('chai-subset'));
1210

1311
process.on('unhandledRejection', function (error) {

src/execution/__tests__/abstract-promise-test.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,7 @@ describe('Execute: Handles execution of abstract types with promises', () => {
332332

333333
const result = await graphql(schema, query);
334334

335-
expect(result).to.jsonEqual({
335+
expect(result).to.deep.equal({
336336
data: {
337337
pets: [
338338
{
@@ -428,7 +428,7 @@ describe('Execute: Handles execution of abstract types with promises', () => {
428428

429429
const result = await graphql(schema, query);
430430

431-
expect(result).to.jsonEqual({
431+
expect(result).to.deep.equal({
432432
data: {
433433
pets: [
434434
{
@@ -513,7 +513,7 @@ describe('Execute: Handles execution of abstract types with promises', () => {
513513

514514
const result = await graphql(schema, query);
515515

516-
expect(result).to.jsonEqual({
516+
expect(result).to.deep.equal({
517517
data: {
518518
pets: [
519519
{
@@ -585,7 +585,7 @@ describe('Execute: Handles execution of abstract types with promises', () => {
585585

586586
const result = await graphql(schema, query);
587587

588-
expect(result).to.jsonEqual({
588+
expect(result).to.deep.equal({
589589
data: {
590590
pets: [null, null],
591591
},

src/execution/__tests__/abstract-test.js

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import { expect } from 'chai';
99
import { describe, it } from 'mocha';
1010
import {
11-
graphql,
11+
graphqlSync,
1212
GraphQLSchema,
1313
GraphQLObjectType,
1414
GraphQLInterfaceType,
@@ -39,7 +39,7 @@ class Human {
3939
}
4040

4141
describe('Execute: Handles execution of abstract types', () => {
42-
it('isTypeOf used to resolve runtime type for Interface', async () => {
42+
it('isTypeOf used to resolve runtime type for Interface', () => {
4343
const PetType = new GraphQLInterfaceType({
4444
name: 'Pet',
4545
fields: {
@@ -94,7 +94,7 @@ describe('Execute: Handles execution of abstract types', () => {
9494
}
9595
}`;
9696

97-
const result = await graphql(schema, query);
97+
const result = graphqlSync(schema, query);
9898

9999
expect(result).to.deep.equal({
100100
data: {
@@ -112,7 +112,7 @@ describe('Execute: Handles execution of abstract types', () => {
112112
});
113113
});
114114

115-
it('isTypeOf used to resolve runtime type for Union', async () => {
115+
it('isTypeOf used to resolve runtime type for Union', () => {
116116
const DogType = new GraphQLObjectType({
117117
name: 'Dog',
118118
isTypeOf: obj => obj instanceof Dog,
@@ -163,7 +163,7 @@ describe('Execute: Handles execution of abstract types', () => {
163163
}
164164
}`;
165165

166-
const result = await graphql(schema, query);
166+
const result = graphqlSync(schema, query);
167167

168168
expect(result).to.deep.equal({
169169
data: {
@@ -181,7 +181,7 @@ describe('Execute: Handles execution of abstract types', () => {
181181
});
182182
});
183183

184-
it('resolveType on Interface yields useful error', async () => {
184+
it('resolveType on Interface yields useful error', () => {
185185
const PetType = new GraphQLInterfaceType({
186186
name: 'Pet',
187187
resolveType(obj) {
@@ -252,9 +252,9 @@ describe('Execute: Handles execution of abstract types', () => {
252252
}
253253
}`;
254254

255-
const result = await graphql(schema, query);
255+
const result = graphqlSync(schema, query);
256256

257-
expect(result).to.jsonEqual({
257+
expect(result).to.deep.equal({
258258
data: {
259259
pets: [
260260
{
@@ -279,7 +279,7 @@ describe('Execute: Handles execution of abstract types', () => {
279279
});
280280
});
281281

282-
it('resolveType on Union yields useful error', async () => {
282+
it('resolveType on Union yields useful error', () => {
283283
const HumanType = new GraphQLObjectType({
284284
name: 'Human',
285285
fields: {
@@ -346,9 +346,9 @@ describe('Execute: Handles execution of abstract types', () => {
346346
}
347347
}`;
348348

349-
const result = await graphql(schema, query);
349+
const result = graphqlSync(schema, query);
350350

351-
expect(result).to.jsonEqual({
351+
expect(result).to.deep.equal({
352352
data: {
353353
pets: [
354354
{
@@ -373,7 +373,7 @@ describe('Execute: Handles execution of abstract types', () => {
373373
});
374374
});
375375

376-
it('resolveType allows resolving with type name', async () => {
376+
it('resolveType allows resolving with type name', () => {
377377
const PetType = new GraphQLInterfaceType({
378378
name: 'Pet',
379379
resolveType(obj) {
@@ -429,9 +429,9 @@ describe('Execute: Handles execution of abstract types', () => {
429429
}
430430
}`;
431431

432-
const result = await graphql(schema, query);
432+
const result = graphqlSync(schema, query);
433433

434-
expect(result).to.jsonEqual({
434+
expect(result).to.deep.equal({
435435
data: {
436436
pets: [
437437
{

0 commit comments

Comments
 (0)