From a35b842158c014c9970549c1695c64c545dc8088 Mon Sep 17 00:00:00 2001 From: Lauri Harpf Date: Sat, 22 May 2021 19:31:00 +0300 Subject: [PATCH] Remove "apollo-server-testing" based on the comments at https://github.com/apollographql/apollo-server/issues/4724 --- README.md | 2 +- package-lock.json | 25 ------------------------- package.json | 1 - src/posts/post-resolver.test.ts | 8 ++++---- src/users/user-resolver.test.ts | 20 ++++++++------------ 5 files changed, 13 insertions(+), 43 deletions(-) diff --git a/README.md b/README.md index bdb8e14..7624240 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ query Posts { - [Apollo Server](https://github.com/apollographql/apollo-server) - [Bootstrapping code to start the server](https://typegraphql.com/docs/bootstrap.html) - Example resolvers and [Apollo REST Data Source](https://www.npmjs.com/package/apollo-datasource-rest)s (posts, users) -- Test infrastructure ([ts-jest](https://github.com/kulshekhar/ts-jest), [apollo-server-testing](https://www.apollographql.com/docs/apollo-server/testing/testing/) and [nock](https://www.npmjs.com/package/nock)) and example tests +- Test infrastructure ([ts-jest](https://github.com/kulshekhar/ts-jest) and [nock](https://www.npmjs.com/package/nock)) with example tests - [ts-node-dev](https://www.npmjs.com/package/ts-node-dev) for development (restarts app when code changes) - [typescript-eslint](https://github.com/typescript-eslint/typescript-eslint/blob/master/docs/getting-started/linting/README.md) with [type-aware rules](https://github.com/typescript-eslint/typescript-eslint/blob/master/docs/getting-started/linting/TYPED_LINTING.md) - Github: Dependabot dependency updates diff --git a/package-lock.json b/package-lock.json index 75d22d3..d194ca3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -19,7 +19,6 @@ "@types/jest": "^26.0.23", "@typescript-eslint/eslint-plugin": "^4.23.0", "@typescript-eslint/parser": "^4.23.0", - "apollo-server-testing": "^2.24.0", "eslint": "^7.26.0", "eslint-plugin-jest": "^24.3.6", "jest": "^26.6.3", @@ -2104,21 +2103,6 @@ "graphql": "^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0" } }, - "node_modules/apollo-server-testing": { - "version": "2.24.0", - "resolved": "https://registry.npmjs.org/apollo-server-testing/-/apollo-server-testing-2.24.0.tgz", - "integrity": "sha512-GmNO624c65XH2iaPKWG/yQg8fx1ZJIfnl86W1RgL9AV00SXJZu53OP0A6cbDyYvKBZj5Fl3czaPyNR/4YG5Lrg==", - "dev": true, - "dependencies": { - "apollo-server-core": "^2.24.0" - }, - "engines": { - "node": ">=6" - }, - "peerDependencies": { - "graphql": "^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0" - } - }, "node_modules/apollo-server-types": { "version": "0.8.0", "resolved": "https://registry.npmjs.org/apollo-server-types/-/apollo-server-types-0.8.0.tgz", @@ -11655,15 +11639,6 @@ "apollo-server-types": "^0.8.0" } }, - "apollo-server-testing": { - "version": "2.24.0", - "resolved": "https://registry.npmjs.org/apollo-server-testing/-/apollo-server-testing-2.24.0.tgz", - "integrity": "sha512-GmNO624c65XH2iaPKWG/yQg8fx1ZJIfnl86W1RgL9AV00SXJZu53OP0A6cbDyYvKBZj5Fl3czaPyNR/4YG5Lrg==", - "dev": true, - "requires": { - "apollo-server-core": "^2.24.0" - } - }, "apollo-server-types": { "version": "0.8.0", "resolved": "https://registry.npmjs.org/apollo-server-types/-/apollo-server-types-0.8.0.tgz", diff --git a/package.json b/package.json index c178812..4a53c53 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,6 @@ "@types/jest": "^26.0.23", "@typescript-eslint/eslint-plugin": "^4.23.0", "@typescript-eslint/parser": "^4.23.0", - "apollo-server-testing": "^2.24.0", "eslint": "^7.26.0", "eslint-plugin-jest": "^24.3.6", "jest": "^26.6.3", diff --git a/src/posts/post-resolver.test.ts b/src/posts/post-resolver.test.ts index eb67060..70c6d1c 100644 --- a/src/posts/post-resolver.test.ts +++ b/src/posts/post-resolver.test.ts @@ -1,7 +1,7 @@ import nock from "nock"; import { gql } from "apollo-server"; import { createServer } from "../create-server"; -import { createTestClient } from "apollo-server-testing"; +import { print } from "graphql"; describe("PostResolver", () => { it("returns all posts", async () => { @@ -27,9 +27,9 @@ describe("PostResolver", () => { ]); const server = await createServer(); - // eslint-disable-next-line jest/unbound-method - const { query } = createTestClient(server); - const response = await query({ query: postsQuery }); + const response = await server.executeOperation({ + query: print(postsQuery), + }); expect(response.errors).toBeUndefined(); expect(response.data).toEqual({ diff --git a/src/users/user-resolver.test.ts b/src/users/user-resolver.test.ts index 1034a87..a6a73cc 100644 --- a/src/users/user-resolver.test.ts +++ b/src/users/user-resolver.test.ts @@ -1,6 +1,6 @@ import { gql } from "apollo-server"; -import { createTestClient } from "apollo-server-testing"; import nock from "nock"; +import { print } from "graphql"; import { createServer } from "../create-server"; describe("UserResolver", () => { @@ -27,9 +27,9 @@ describe("UserResolver", () => { ]); const server = await createServer(); - // eslint-disable-next-line jest/unbound-method - const { query } = createTestClient(server); - const response = await query({ query: usersQuery }); + const response = await server.executeOperation({ + query: print(usersQuery), + }); expect(response.errors).toBeUndefined(); expect(response.data).toEqual({ @@ -55,10 +55,8 @@ describe("UserResolver", () => { }); const server = await createServer(); - // eslint-disable-next-line jest/unbound-method - const { query } = createTestClient(server); - const response = await query({ - query: userQuery, + const response = await server.executeOperation({ + query: print(userQuery), variables: { userId: "1" }, }); @@ -100,10 +98,8 @@ describe("UserResolver", () => { ]); const server = await createServer(); - // eslint-disable-next-line jest/unbound-method - const { query } = createTestClient(server); - const response = await query({ - query: userQueryWithPosts, + const response = await server.executeOperation({ + query: print(userQueryWithPosts), variables: { userId: "1" }, });