diff --git a/packages/api/test/resolvers/subscriptions.test.ts b/packages/api/test/resolvers/subscriptions.test.ts index 22ee107b1..085845eb4 100644 --- a/packages/api/test/resolvers/subscriptions.test.ts +++ b/packages/api/test/resolvers/subscriptions.test.ts @@ -350,17 +350,9 @@ describe('Subscriptions API', () => { }) describe('Subscribe API', () => { - const query = ( - name: string | null, - url: string | null, - subscriptionType: SubscriptionType | null - ) => ` - mutation { - subscribe(input: { - name: ${name ? `"${name}"` : null} - url: ${url ? `"${url}"` : null} - subscriptionType: ${subscriptionType} - }) { + const query = ` + mutation Subscribe($input: SubscribeInput!){ + subscribe(input: $input) { ... on SubscribeSuccess { subscriptions { id @@ -410,8 +402,9 @@ describe('Subscriptions API', () => { it('returns an error', async () => { const res = await graphqlRequest( - query(null, url, subscriptionType), - authToken + query, + authToken, + { input: { url, subscriptionType } }, ).expect(200) expect(res.body.data.subscribe.errorCodes).to.eql([ 'ALREADY_SUBSCRIBED', @@ -421,8 +414,9 @@ describe('Subscriptions API', () => { it('creates a rss subscription', async () => { const res = await graphqlRequest( - query(null, url, subscriptionType), - authToken + query, + authToken, + { input: { url, subscriptionType } }, ).expect(200) expect(res.body.data.subscribe.subscriptions).to.have.lengthOf(1) expect(res.body.data.subscribe.subscriptions[0].id).to.be.a('string') diff --git a/packages/api/test/util.ts b/packages/api/test/util.ts index 02bac0f99..8268c1503 100644 --- a/packages/api/test/util.ts +++ b/packages/api/test/util.ts @@ -17,15 +17,14 @@ export const stopApolloServer = async () => { export const graphqlRequest = ( query: string, - authToken?: string + authToken: string, + variables?: Record, ): supertest.Test => { return request .post(apollo.graphqlPath) - .send({ - query, - }) + .send({ query, variables }) .set('Accept', 'application/json') - .set('authorization', authToken || '') + .set('authorization', authToken) .expect('Content-Type', /json/) }