Skip to content

Commit 1e9d352

Browse files
committed
This eliminates all usages of chai-as-promised and replaces it with
async await. It also removes the module as a dependency.
1 parent 91e6109 commit 1e9d352

File tree

11 files changed

+263
-263
lines changed

11 files changed

+263
-263
lines changed

package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@
5151
"babel-core": "5.7.2",
5252
"babel-eslint": "3.1.23",
5353
"chai": "3.0.0",
54-
"chai-as-promised": "5.1.0",
5554
"chai-subset": "1.0.1",
5655
"coveralls": "2.11.2",
5756
"eslint": "0.24.0",

scripts/mocha-bootload.js

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@ var chai = require('chai');
1616
var chaiSubset = require('chai-subset');
1717
chai.use(chaiSubset);
1818

19-
var chaiAsPromised = require('chai-as-promised');
20-
chai.use(chaiAsPromised);
21-
2219
process.on('unhandledRejection', function (error) {
2320
console.error('Unhandled Promise Rejection:');
2421
console.error(error && error.stack || error);

src/executor/__tests__/directives.js

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -33,57 +33,57 @@ var data = {
3333
b() { return 'b'; }
3434
};
3535

36-
function executeTestQuery(doc) {
37-
return execute(schema, data, parse(doc));
36+
async function executeTestQuery(doc) {
37+
return await execute(schema, data, parse(doc));
3838
}
3939

4040
describe('Execute: handles directives', () => {
4141
describe('works without directives', () => {
42-
it('basic query works', () => {
43-
return expect(
44-
executeTestQuery('{ a, b }')
45-
).to.become({
42+
it('basic query works', async () => {
43+
expect(
44+
await executeTestQuery('{ a, b }')
45+
).to.deep.equal({
4646
data: { a: 'a', b: 'b'}
4747
});
4848
});
4949
});
5050

5151
describe('works on scalars', () => {
52-
it('if true includes scalar', () => {
52+
it('if true includes scalar', async () => {
5353
return expect(
54-
executeTestQuery('{ a, b @include(if: true) }')
55-
).to.become({
54+
await executeTestQuery('{ a, b @include(if: true) }')
55+
).to.deep.equal({
5656
data: { a: 'a', b: 'b'}
5757
});
5858
});
5959

60-
it('if false omits on scalar', () => {
60+
it('if false omits on scalar', async () => {
6161
return expect(
62-
executeTestQuery('{ a, b @include(if: false) }')
63-
).to.become({
62+
await executeTestQuery('{ a, b @include(if: false) }')
63+
).to.deep.equal({
6464
data: { a: 'a' }
6565
});
6666
});
6767

68-
it('unless false includes scalar', () => {
68+
it('unless false includes scalar', async () => {
6969
return expect(
70-
executeTestQuery('{ a, b @skip(if: false) }')
71-
).to.become({
70+
await executeTestQuery('{ a, b @skip(if: false) }')
71+
).to.deep.equal({
7272
data: { a: 'a', b: 'b'}
7373
});
7474
});
7575

76-
it('unless true omits scalar', () => {
76+
it('unless true omits scalar', async () => {
7777
return expect(
78-
executeTestQuery('{ a, b @skip(if: true) }')
79-
).to.become({
78+
await executeTestQuery('{ a, b @skip(if: true) }')
79+
).to.deep.equal({
8080
data: { a: 'a' }
8181
});
8282
});
8383
});
8484

8585
describe('works on fragment spreads', () => {
86-
it('if false omits fragment spread', () => {
86+
it('if false omits fragment spread', async () => {
8787
var q = `
8888
query Q {
8989
a
@@ -93,12 +93,12 @@ describe('Execute: handles directives', () => {
9393
b
9494
}
9595
`;
96-
return expect(executeTestQuery(q)).to.become({
96+
return expect(await executeTestQuery(q)).to.deep.equal({
9797
data: { a: 'a' }
9898
});
9999
});
100100

101-
it('if true includes fragment spread', () => {
101+
it('if true includes fragment spread', async () => {
102102
var q = `
103103
query Q {
104104
a
@@ -108,12 +108,12 @@ describe('Execute: handles directives', () => {
108108
b
109109
}
110110
`;
111-
return expect(executeTestQuery(q)).to.become({
111+
return expect(await executeTestQuery(q)).to.deep.equal({
112112
data: { a: 'a', b: 'b' }
113113
});
114114
});
115115

116-
it('unless false includes fragment spread', () => {
116+
it('unless false includes fragment spread', async () => {
117117
var q = `
118118
query Q {
119119
a
@@ -123,12 +123,12 @@ describe('Execute: handles directives', () => {
123123
b
124124
}
125125
`;
126-
return expect(executeTestQuery(q)).to.become({
126+
return expect(await executeTestQuery(q)).to.deep.equal({
127127
data: { a: 'a', b: 'b' }
128128
});
129129
});
130130

131-
it('unless true omits fragment spread', () => {
131+
it('unless true omits fragment spread', async () => {
132132
var q = `
133133
query Q {
134134
a
@@ -138,14 +138,14 @@ describe('Execute: handles directives', () => {
138138
b
139139
}
140140
`;
141-
return expect(executeTestQuery(q)).to.become({
141+
return expect(await executeTestQuery(q)).to.deep.equal({
142142
data: { a: 'a' }
143143
});
144144
});
145145
});
146146

147147
describe('works on inline fragment', () => {
148-
it('if false omits inline fragment', () => {
148+
it('if false omits inline fragment', async () => {
149149
var q = `
150150
query Q {
151151
a
@@ -157,12 +157,12 @@ describe('Execute: handles directives', () => {
157157
b
158158
}
159159
`;
160-
return expect(executeTestQuery(q)).to.become({
160+
return expect(await executeTestQuery(q)).to.deep.equal({
161161
data: { a: 'a' }
162162
});
163163
});
164164

165-
it('if true includes inline fragment', () => {
165+
it('if true includes inline fragment', async () => {
166166
var q = `
167167
query Q {
168168
a
@@ -174,11 +174,11 @@ describe('Execute: handles directives', () => {
174174
b
175175
}
176176
`;
177-
return expect(executeTestQuery(q)).to.become({
177+
return expect(await executeTestQuery(q)).to.deep.equal({
178178
data: { a: 'a', b: 'b' }
179179
});
180180
});
181-
it('unless false includes inline fragment', () => {
181+
it('unless false includes inline fragment', async () => {
182182
var q = `
183183
query Q {
184184
a
@@ -190,11 +190,11 @@ describe('Execute: handles directives', () => {
190190
b
191191
}
192192
`;
193-
return expect(executeTestQuery(q)).to.become({
193+
return expect(await executeTestQuery(q)).to.deep.equal({
194194
data: { a: 'a', b: 'b' }
195195
});
196196
});
197-
it('unless true includes inline fragment', () => {
197+
it('unless true includes inline fragment', async () => {
198198
var q = `
199199
query Q {
200200
a
@@ -206,14 +206,14 @@ describe('Execute: handles directives', () => {
206206
b
207207
}
208208
`;
209-
return expect(executeTestQuery(q)).to.become({
209+
return expect(await executeTestQuery(q)).to.deep.equal({
210210
data: { a: 'a' }
211211
});
212212
});
213213
});
214214

215215
describe('works on fragment', () => {
216-
it('if false omits fragment', () => {
216+
it('if false omits fragment', async () => {
217217
var q = `
218218
query Q {
219219
a
@@ -223,11 +223,11 @@ describe('Execute: handles directives', () => {
223223
b
224224
}
225225
`;
226-
return expect(executeTestQuery(q)).to.become({
226+
return expect(await executeTestQuery(q)).to.deep.equal({
227227
data: { a: 'a' }
228228
});
229229
});
230-
it('if true includes fragment', () => {
230+
it('if true includes fragment', async () => {
231231
var q = `
232232
query Q {
233233
a
@@ -237,11 +237,11 @@ describe('Execute: handles directives', () => {
237237
b
238238
}
239239
`;
240-
return expect(executeTestQuery(q)).to.become({
240+
return expect(await executeTestQuery(q)).to.deep.equal({
241241
data: { a: 'a', b: 'b' }
242242
});
243243
});
244-
it('unless false includes fragment', () => {
244+
it('unless false includes fragment', async () => {
245245
var q = `
246246
query Q {
247247
a
@@ -251,11 +251,11 @@ describe('Execute: handles directives', () => {
251251
b
252252
}
253253
`;
254-
return expect(executeTestQuery(q)).to.become({
254+
return expect(await executeTestQuery(q)).to.deep.equal({
255255
data: { a: 'a', b: 'b' }
256256
});
257257
});
258-
it('unless true omits fragment', () => {
258+
it('unless true omits fragment', async () => {
259259
var q = `
260260
query Q {
261261
a
@@ -265,7 +265,7 @@ describe('Execute: handles directives', () => {
265265
b
266266
}
267267
`;
268-
return expect(executeTestQuery(q)).to.become({
268+
return expect(await executeTestQuery(q)).to.deep.equal({
269269
data: { a: 'a' }
270270
});
271271
});

0 commit comments

Comments
 (0)