@@ -22,8 +22,10 @@ import {
2222 GraphQLNonNull
2323} from '../../type' ;
2424
25- var resolve = Promise . resolve . bind ( Promise ) ;
26- var reject = Promise . reject . bind ( Promise ) ;
25+ // resolved() is shorthand for Promise.resolve()
26+ var resolved = Promise . resolve . bind ( Promise ) ;
27+ // rejected() is shorthand for Promise.reject()
28+ var rejected = Promise . reject . bind ( Promise ) ;
2729
2830function check ( testType , testData , expected ) {
2931 return function ( ) {
@@ -72,23 +74,23 @@ describe('Execute: Handles list nullability', () => {
7274 describe ( 'Promise<Array<T>>' , ( ) => {
7375
7476 it ( 'Contains values' , check ( type ,
75- resolve ( [ 1 , 2 ] ) ,
77+ resolved ( [ 1 , 2 ] ) ,
7678 { data : { nest : { test : [ 1 , 2 ] } } }
7779 ) ) ;
7880
7981 it ( 'Contains null' , check ( type ,
80- resolve ( [ 1 , null , 2 ] ) ,
82+ resolved ( [ 1 , null , 2 ] ) ,
8183 { data : { nest : { test : [ 1 , null , 2 ] } } }
8284 ) ) ;
8385
8486
8587 it ( 'Returns null' , check ( type ,
86- resolve ( null ) ,
88+ resolved ( null ) ,
8789 { data : { nest : { test : null } } }
8890 ) ) ;
8991
9092 it ( 'Rejected' , check ( type ,
91- reject ( new Error ( 'bad' ) ) ,
93+ rejected ( new Error ( 'bad' ) ) ,
9294 { data : { nest : { test : null } } ,
9395 errors : [
9496 { message : 'bad' ,
@@ -101,17 +103,17 @@ describe('Execute: Handles list nullability', () => {
101103 describe ( 'Array<Promise<T>>' , ( ) => {
102104
103105 it ( 'Contains values' , check ( type ,
104- [ resolve ( 1 ) , resolve ( 2 ) ] ,
106+ [ resolved ( 1 ) , resolved ( 2 ) ] ,
105107 { data : { nest : { test : [ 1 , 2 ] } } }
106108 ) ) ;
107109
108110 it ( 'Contains null' , check ( type ,
109- [ resolve ( 1 ) , resolve ( null ) , resolve ( 2 ) ] ,
111+ [ resolved ( 1 ) , resolved ( null ) , resolved ( 2 ) ] ,
110112 { data : { nest : { test : [ 1 , null , 2 ] } } }
111113 ) ) ;
112114
113115 it ( 'Contains reject' , check ( type ,
114- [ resolve ( 1 ) , reject ( new Error ( 'bad' ) ) , resolve ( 2 ) ] ,
116+ [ resolved ( 1 ) , rejected ( new Error ( 'bad' ) ) , resolved ( 2 ) ] ,
115117 { data : { nest : { test : [ 1 , null , 2 ] } } ,
116118 errors : [
117119 { message : 'bad' ,
@@ -152,17 +154,17 @@ describe('Execute: Handles list nullability', () => {
152154 describe ( 'Promise<Array<T>>' , ( ) => {
153155
154156 it ( 'Contains values' , check ( type ,
155- resolve ( [ 1 , 2 ] ) ,
157+ resolved ( [ 1 , 2 ] ) ,
156158 { data : { nest : { test : [ 1 , 2 ] } } }
157159 ) ) ;
158160
159161 it ( 'Contains null' , check ( type ,
160- resolve ( [ 1 , null , 2 ] ) ,
162+ resolved ( [ 1 , null , 2 ] ) ,
161163 { data : { nest : { test : [ 1 , null , 2 ] } } }
162164 ) ) ;
163165
164166 it ( 'Returns null' , check ( type ,
165- resolve ( null ) ,
167+ resolved ( null ) ,
166168 { data : { nest : null } ,
167169 errors : [
168170 { message : 'Cannot return null for non-nullable type.' ,
@@ -171,7 +173,7 @@ describe('Execute: Handles list nullability', () => {
171173 ) ) ;
172174
173175 it ( 'Rejected' , check ( type ,
174- reject ( new Error ( 'bad' ) ) ,
176+ rejected ( new Error ( 'bad' ) ) ,
175177 { data : { nest : null } ,
176178 errors : [
177179 { message : 'bad' ,
@@ -184,17 +186,17 @@ describe('Execute: Handles list nullability', () => {
184186 describe ( 'Array<Promise<T>>' , ( ) => {
185187
186188 it ( 'Contains values' , check ( type ,
187- [ resolve ( 1 ) , resolve ( 2 ) ] ,
189+ [ resolved ( 1 ) , resolved ( 2 ) ] ,
188190 { data : { nest : { test : [ 1 , 2 ] } } }
189191 ) ) ;
190192
191193 it ( 'Contains null' , check ( type ,
192- [ resolve ( 1 ) , resolve ( null ) , resolve ( 2 ) ] ,
194+ [ resolved ( 1 ) , resolved ( null ) , resolved ( 2 ) ] ,
193195 { data : { nest : { test : [ 1 , null , 2 ] } } }
194196 ) ) ;
195197
196198 it ( 'Contains reject' , check ( type ,
197- [ resolve ( 1 ) , reject ( new Error ( 'bad' ) ) , resolve ( 2 ) ] ,
199+ [ resolved ( 1 ) , rejected ( new Error ( 'bad' ) ) , resolved ( 2 ) ] ,
198200 { data : { nest : { test : [ 1 , null , 2 ] } } ,
199201 errors : [
200202 { message : 'bad' ,
@@ -235,12 +237,12 @@ describe('Execute: Handles list nullability', () => {
235237 describe ( 'Promise<Array<T>>' , ( ) => {
236238
237239 it ( 'Contains values' , check ( type ,
238- resolve ( [ 1 , 2 ] ) ,
240+ resolved ( [ 1 , 2 ] ) ,
239241 { data : { nest : { test : [ 1 , 2 ] } } }
240242 ) ) ;
241243
242244 it ( 'Contains null' , check ( type ,
243- resolve ( [ 1 , null , 2 ] ) ,
245+ resolved ( [ 1 , null , 2 ] ) ,
244246 { data : { nest : { test : null } } ,
245247 errors : [
246248 { message : 'Cannot return null for non-nullable type.' ,
@@ -249,12 +251,12 @@ describe('Execute: Handles list nullability', () => {
249251 ) ) ;
250252
251253 it ( 'Returns null' , check ( type ,
252- resolve ( null ) ,
254+ resolved ( null ) ,
253255 { data : { nest : { test : null } } }
254256 ) ) ;
255257
256258 it ( 'Rejected' , check ( type ,
257- reject ( new Error ( 'bad' ) ) ,
259+ rejected ( new Error ( 'bad' ) ) ,
258260 { data : { nest : { test : null } } ,
259261 errors : [
260262 { message : 'bad' ,
@@ -267,12 +269,12 @@ describe('Execute: Handles list nullability', () => {
267269 describe ( 'Array<Promise<T>>' , ( ) => {
268270
269271 it ( 'Contains values' , check ( type ,
270- [ resolve ( 1 ) , resolve ( 2 ) ] ,
272+ [ resolved ( 1 ) , resolved ( 2 ) ] ,
271273 { data : { nest : { test : [ 1 , 2 ] } } }
272274 ) ) ;
273275
274276 it ( 'Contains null' , check ( type ,
275- [ resolve ( 1 ) , resolve ( null ) , resolve ( 2 ) ] ,
277+ [ resolved ( 1 ) , resolved ( null ) , resolved ( 2 ) ] ,
276278 { data : { nest : { test : null } } ,
277279 errors : [
278280 { message : 'Cannot return null for non-nullable type.' ,
@@ -281,7 +283,7 @@ describe('Execute: Handles list nullability', () => {
281283 ) ) ;
282284
283285 it ( 'Contains reject' , check ( type ,
284- [ resolve ( 1 ) , reject ( new Error ( 'bad' ) ) , resolve ( 2 ) ] ,
286+ [ resolved ( 1 ) , rejected ( new Error ( 'bad' ) ) , resolved ( 2 ) ] ,
285287 { data : { nest : { test : null } } ,
286288 errors : [
287289 { message : 'bad' ,
@@ -328,12 +330,12 @@ describe('Execute: Handles list nullability', () => {
328330 describe ( 'Promise<Array<T>>' , ( ) => {
329331
330332 it ( 'Contains values' , check ( type ,
331- resolve ( [ 1 , 2 ] ) ,
333+ resolved ( [ 1 , 2 ] ) ,
332334 { data : { nest : { test : [ 1 , 2 ] } } }
333335 ) ) ;
334336
335337 it ( 'Contains null' , check ( type ,
336- resolve ( [ 1 , null , 2 ] ) ,
338+ resolved ( [ 1 , null , 2 ] ) ,
337339 { data : { nest : null } ,
338340 errors : [
339341 { message : 'Cannot return null for non-nullable type.' ,
@@ -342,7 +344,7 @@ describe('Execute: Handles list nullability', () => {
342344 ) ) ;
343345
344346 it ( 'Returns null' , check ( type ,
345- resolve ( null ) ,
347+ resolved ( null ) ,
346348 { data : { nest : null } ,
347349 errors : [
348350 { message : 'Cannot return null for non-nullable type.' ,
@@ -351,7 +353,7 @@ describe('Execute: Handles list nullability', () => {
351353 ) ) ;
352354
353355 it ( 'Rejected' , check ( type ,
354- reject ( new Error ( 'bad' ) ) ,
356+ rejected ( new Error ( 'bad' ) ) ,
355357 { data : { nest : null } ,
356358 errors : [
357359 { message : 'bad' ,
@@ -364,12 +366,12 @@ describe('Execute: Handles list nullability', () => {
364366 describe ( 'Array<Promise<T>>' , ( ) => {
365367
366368 it ( 'Contains values' , check ( type ,
367- [ resolve ( 1 ) , resolve ( 2 ) ] ,
369+ [ resolved ( 1 ) , resolved ( 2 ) ] ,
368370 { data : { nest : { test : [ 1 , 2 ] } } }
369371 ) ) ;
370372
371373 it ( 'Contains null' , check ( type ,
372- [ resolve ( 1 ) , resolve ( null ) , resolve ( 2 ) ] ,
374+ [ resolved ( 1 ) , resolved ( null ) , resolved ( 2 ) ] ,
373375 { data : { nest : null } ,
374376 errors : [
375377 { message : 'Cannot return null for non-nullable type.' ,
@@ -378,7 +380,7 @@ describe('Execute: Handles list nullability', () => {
378380 ) ) ;
379381
380382 it ( 'Contains reject' , check ( type ,
381- [ resolve ( 1 ) , reject ( new Error ( 'bad' ) ) , resolve ( 2 ) ] ,
383+ [ resolved ( 1 ) , rejected ( new Error ( 'bad' ) ) , resolved ( 2 ) ] ,
382384 { data : { nest : null } ,
383385 errors : [
384386 { message : 'bad' ,
0 commit comments