From be00218567701fc09d2a9f22c199ba1f52bf1001 Mon Sep 17 00:00:00 2001 From: MacondoExpress Date: Thu, 30 May 2024 11:02:45 +0100 Subject: [PATCH 1/2] change 4667 tests to use tooling available on 4.x --- .../graphql/tests/integration/issues/4667.int.test.ts | 8 +++++++- packages/graphql/tests/tck/issues/4667.test.ts | 3 ++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/packages/graphql/tests/integration/issues/4667.int.test.ts b/packages/graphql/tests/integration/issues/4667.int.test.ts index 7cdffd54fd..09f5903967 100644 --- a/packages/graphql/tests/integration/issues/4667.int.test.ts +++ b/packages/graphql/tests/integration/issues/4667.int.test.ts @@ -53,7 +53,13 @@ describe("https://github.com/neo4j/graphql/issues/4667", () => { }); afterEach(async () => { - await cleanNodes(driver, [MyThing, MyStuff]); + const session = await neo4j.getSession(); + try { + await cleanNodes(session, [MyThing, MyStuff]); + } finally { + await session.close(); + } + await driver.close(); }); afterAll(async () => { diff --git a/packages/graphql/tests/tck/issues/4667.test.ts b/packages/graphql/tests/tck/issues/4667.test.ts index b85375c527..475b4956fb 100644 --- a/packages/graphql/tests/tck/issues/4667.test.ts +++ b/packages/graphql/tests/tck/issues/4667.test.ts @@ -17,6 +17,7 @@ * limitations under the License. */ +import gql from "graphql-tag"; import { Neo4jGraphQL } from "../../../src"; import { formatCypher, formatParams, translateQuery } from "../utils/tck-test-utils"; @@ -36,7 +37,7 @@ describe("https://github.com/neo4j/graphql/issues/4667", () => { const neoSchema = new Neo4jGraphQL({ typeDefs }); - const query = /* GraphQL */ ` + const query = /* GraphQL */ gql` query { myThings(where: { stuff: null }) { id From 36b1d65639b02109cd4a577490b143fb0e07bc2a Mon Sep 17 00:00:00 2001 From: MacondoExpress Date: Thu, 30 May 2024 11:06:35 +0100 Subject: [PATCH 2/2] Update packages/graphql/tests/tck/issues/4667.test.ts Co-authored-by: Darrell Warde <8117355+darrellwarde@users.noreply.github.com> --- packages/graphql/tests/tck/issues/4667.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/graphql/tests/tck/issues/4667.test.ts b/packages/graphql/tests/tck/issues/4667.test.ts index 475b4956fb..82800acf1c 100644 --- a/packages/graphql/tests/tck/issues/4667.test.ts +++ b/packages/graphql/tests/tck/issues/4667.test.ts @@ -37,7 +37,7 @@ describe("https://github.com/neo4j/graphql/issues/4667", () => { const neoSchema = new Neo4jGraphQL({ typeDefs }); - const query = /* GraphQL */ gql` + const query = gql` query { myThings(where: { stuff: null }) { id