@@ -6,7 +6,7 @@ import { marbles } from "rxjs-marbles/jest";
66import { makeExecutableSchema } from "graphql-tools" ;
77import gql from "graphql-tag" ;
88
9- import graphqlObservable from "../" ;
9+ import { graphql } from "../" ;
1010
1111const typeDefs = `
1212 type Shuttle {
@@ -196,7 +196,7 @@ describe("graphqlObservable", function() {
196196 a : { data : { launched : expectedData } }
197197 } ) ;
198198
199- const result = graphqlObservable ( query , schema , { query : dataSource } ) ;
199+ const result = graphql ( query , schema , { query : dataSource } ) ;
200200
201201 m . expect ( result . pipe ( take ( 1 ) ) ) . toBeObservable ( expected ) ;
202202 } ) ;
@@ -218,11 +218,16 @@ describe("graphqlObservable", function() {
218218 } ) ;
219219
220220 const nameFilter = of ( "apollo11" ) ;
221- const result = graphqlObservable ( query , schema , {
222- query : dataSource
223- } , {
224- nameFilter
225- } ) ;
221+ const result = graphql (
222+ query ,
223+ schema ,
224+ {
225+ query : dataSource
226+ } ,
227+ {
228+ nameFilter
229+ }
230+ ) ;
226231
227232 m . expect ( result . pipe ( take ( 1 ) ) ) . toBeObservable ( expected ) ;
228233 } ) ;
@@ -243,7 +248,7 @@ describe("graphqlObservable", function() {
243248 a : { data : { launched : [ expectedData [ 0 ] ] } }
244249 } ) ;
245250
246- const result = graphqlObservable ( query , schema , {
251+ const result = graphql ( query , schema , {
247252 query : dataSource
248253 } ) ;
249254
@@ -265,7 +270,7 @@ describe("graphqlObservable", function() {
265270 a : { data : { launched : [ { name : "discovery" } ] } }
266271 } ) ;
267272
268- const result = graphqlObservable ( query , schema , {
273+ const result = graphql ( query , schema , {
269274 query : dataSource
270275 } ) ;
271276
@@ -287,7 +292,7 @@ describe("graphqlObservable", function() {
287292 a : { data : { launched : [ { title : "challenger" } ] } }
288293 } ) ;
289294
290- const result = graphqlObservable ( query , schema , {
295+ const result = graphql ( query , schema , {
291296 query : dataSource
292297 } ) ;
293298
@@ -307,7 +312,7 @@ describe("graphqlObservable", function() {
307312 const expected = m . cold ( "(a|)" , {
308313 a : { data : { plain : { noFieldResolver : "Yes" } } }
309314 } ) ;
310- const result = graphqlObservable ( query , fieldResolverSchema , { } ) ;
315+ const result = graphql ( query , fieldResolverSchema , { } ) ;
311316 m . expect ( result . pipe ( take ( 1 ) ) ) . toBeObservable ( expected ) ;
312317 } ) ;
313318
@@ -322,7 +327,7 @@ describe("graphqlObservable", function() {
322327 const expected = m . cold ( "(a|)" , {
323328 a : { data : { plain : { fieldResolver : "I am a field resolver" } } }
324329 } ) ;
325- const result = graphqlObservable ( query , fieldResolverSchema , { } ) ;
330+ const result = graphql ( query , fieldResolverSchema , { } ) ;
326331 m . expect ( result . pipe ( take ( 1 ) ) ) . toBeObservable ( expected ) ;
327332 } ) ;
328333
@@ -345,7 +350,7 @@ describe("graphqlObservable", function() {
345350 }
346351 }
347352 } ) ;
348- const result = graphqlObservable ( query , fieldResolverSchema , { } ) ;
353+ const result = graphql ( query , fieldResolverSchema , { } ) ;
349354 m . expect ( result . pipe ( take ( 1 ) ) ) . toBeObservable ( expected ) ;
350355 } ) ;
351356
@@ -368,7 +373,7 @@ describe("graphqlObservable", function() {
368373 }
369374 }
370375 } ) ;
371- const result = graphqlObservable ( query , fieldResolverSchema , { } ) ;
376+ const result = graphql ( query , fieldResolverSchema , { } ) ;
372377 m . expect ( result . pipe ( take ( 1 ) ) ) . toBeObservable ( expected ) ;
373378 } ) ;
374379
@@ -389,7 +394,7 @@ describe("graphqlObservable", function() {
389394 }
390395 }
391396 } ) ;
392- const result = graphqlObservable ( query , fieldResolverSchema , { } ) ;
397+ const result = graphql ( query , fieldResolverSchema , { } ) ;
393398 m . expect ( result . pipe ( take ( 1 ) ) ) . toBeObservable ( expected ) ;
394399 } ) ;
395400 } ) ;
@@ -414,7 +419,7 @@ describe("graphqlObservable", function() {
414419 }
415420 }
416421 } ) ;
417- const result = graphqlObservable ( query , fieldResolverSchema , { } ) ;
422+ const result = graphql ( query , fieldResolverSchema , { } ) ;
418423 m . expect ( result . pipe ( take ( 1 ) ) ) . toBeObservable ( expected ) ;
419424 } ) ;
420425
@@ -441,7 +446,7 @@ describe("graphqlObservable", function() {
441446 }
442447 }
443448 } ) ;
444- const result = graphqlObservable ( query , fieldResolverSchema , { } ) ;
449+ const result = graphql ( query , fieldResolverSchema , { } ) ;
445450 m . expect ( result . pipe ( take ( 1 ) ) ) . toBeObservable ( expected ) ;
446451 } ) ;
447452
@@ -468,7 +473,7 @@ describe("graphqlObservable", function() {
468473 }
469474 }
470475 } ) ;
471- const result = graphqlObservable ( query , fieldResolverSchema , { } ) ;
476+ const result = graphql ( query , fieldResolverSchema , { } ) ;
472477 m . expect ( result . pipe ( take ( 1 ) ) ) . toBeObservable ( expected ) ;
473478 } ) ;
474479
@@ -491,7 +496,7 @@ describe("graphqlObservable", function() {
491496 }
492497 }
493498 } ) ;
494- const result = graphqlObservable ( query , fieldResolverSchema , { } ) ;
499+ const result = graphql ( query , fieldResolverSchema , { } ) ;
495500 m . expect ( result . pipe ( take ( 1 ) ) ) . toBeObservable ( expected ) ;
496501 } ) ;
497502 } ) ;
@@ -521,7 +526,7 @@ describe("graphqlObservable", function() {
521526 }
522527 }
523528 } ) ;
524- const result = graphqlObservable ( query , fieldResolverSchema , { } ) ;
529+ const result = graphql ( query , fieldResolverSchema , { } ) ;
525530 m . expect ( result . pipe ( take ( 1 ) ) ) . toBeObservable ( expected ) ;
526531 } ) ;
527532 } ) ;
@@ -539,7 +544,7 @@ describe("graphqlObservable", function() {
539544 "reactive-graphql: resolver 'throwingResolver' throws this error: 'Error: my personal error'"
540545 )
541546 ) ;
542- const result = graphqlObservable ( query , fieldResolverSchema , { } ) ;
547+ const result = graphql ( query , fieldResolverSchema , { } ) ;
543548 m . expect ( result . pipe ( take ( 1 ) ) ) . toBeObservable ( expected ) ;
544549 } ) ;
545550
@@ -558,7 +563,7 @@ describe("graphqlObservable", function() {
558563 "reactive-graphql: field 'youDontKnowMe' was not found on type 'Query'. The only fields found in this Object are: plain,item,nested,throwingResolver."
559564 )
560565 ) ;
561- const result = graphqlObservable ( query , fieldResolverSchema , { } ) ;
566+ const result = graphql ( query , fieldResolverSchema , { } ) ;
562567 m . expect ( result . pipe ( take ( 1 ) ) ) . toBeObservable ( expected ) ;
563568 }
564569 ) ;
@@ -577,7 +582,7 @@ describe("graphqlObservable", function() {
577582 const fakeRequest = { name : "RocketShip" } ;
578583 const commandContext = of ( fakeRequest ) ;
579584
580- const result = graphqlObservable ( mutation , schema , {
585+ const result = graphql ( mutation , schema , {
581586 mutation : commandContext
582587 } ) ;
583588
@@ -601,7 +606,7 @@ describe("graphqlObservable", function() {
601606
602607 const commandContext = of ( "a request" ) ;
603608
604- const result = graphqlObservable ( mutation , schema , {
609+ const result = graphql ( mutation , schema , {
605610 mutation : commandContext
606611 } ) ;
607612
@@ -634,9 +639,14 @@ describe("graphqlObservable", function() {
634639 const variables = {
635640 name : "RocketShip"
636641 } ;
637- const result = graphqlObservable ( mutation , schema , {
638- mutation : commandContext ,
639- } , variables ) ;
642+ const result = graphql (
643+ mutation ,
644+ schema ,
645+ {
646+ mutation : commandContext
647+ } ,
648+ variables
649+ ) ;
640650
641651 const expected = m . cold ( "(a|)" , {
642652 a : { data : { shut : { name : "RocketShip" } } }
0 commit comments