Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 0 additions & 49 deletions .github/workflows/reusable-api-library-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,55 +17,6 @@ env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

jobs:
# TODO: delete once 4.0.0 is released
tck-tests-four-three:
runs-on: ubuntu-latest

strategy:
matrix:
shard:
- 1/4
- 2/4
- 3/4
- 4/4
graphql-version:
- "^15.0.0"
- "^16.0.0"

services:
neo4j:
image: neo4j:4.3-enterprise
env:
NEO4J_AUTH: neo4j/password
NEO4JLABS_PLUGINS: '["apoc"]'
NEO4J_ACCEPT_LICENSE_AGREEMENT: yes
ports:
- 7687:7687

steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: lts/*
cache: yarn
- name: Install dependencies
run: yarn
- name: Overwrite GraphQL version
run: yarn up --exact graphql@${{ matrix.graphql-version }}
- name: Run TCK tests
run: yarn --cwd packages/graphql run test:tck --shard=${{ matrix.shard }} --coverage
env:
VERIFY_TCK: true
NEO_USER: neo4j
- if: ${{ env.CODECOV_TOKEN != '' && !inputs.disable-code-cov-upload }}
name: Upload coverage to Codecov
uses: codecov/codecov-action@v3
with:
token: ${{ secrets.CODECOV_TOKEN }}
directory: ./packages/graphql/coverage/
flags: graphql,tck
fail_ci_if_error: true

tck-tests:
runs-on: ubuntu-latest

Expand Down
64 changes: 0 additions & 64 deletions .github/workflows/reusable-integration-tests-on-prem.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,70 +17,6 @@ env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

jobs:
# TODO: delete once 4.0.0 is released
integration-tests-four-three:
strategy:
matrix:
packages:
[
{ package: "ogm", shard: 1/1 },
{ package: "introspector", shard: 1/1 },
{ package: "graphql", shard: 1/4 },
{ package: "graphql", shard: 2/4 },
{ package: "graphql", shard: 3/4 },
{ package: "graphql", shard: 4/4 },
]
graphql-version:
- "^15.0.0"
- "^16.0.0"

runs-on: ubuntu-latest

services:
neo4j:
image: neo4j:4.3-enterprise
env:
NEO4J_AUTH: neo4j/password
NEO4JLABS_PLUGINS: '["apoc"]'
NEO4J_ACCEPT_LICENSE_AGREEMENT: yes
ports:
- 7687:7687

steps:
- name: Check out repository code
uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: lts/*
cache: yarn
- name: Install dependencies
run: yarn --immutable
- name: Overwrite GraphQL version
run: yarn up --exact graphql@${{ matrix.graphql-version }}
- name: Run @neo4j/graphql integration tests and move coverage
run: |
yarn test:int --shard=${{ matrix.packages.shard }} --coverage
mv coverage coverage-4.3-enterprise
working-directory: packages/${{ matrix.packages.package }}
env:
NEO_USER: neo4j
NEO_PASSWORD: password
NEO_URL: bolt://localhost:7687
- if: ${{ env.CODECOV_TOKEN != '' && !inputs.disable-code-cov-upload && matrix.packages.package == 'graphql' }}
name: Upload coverage to Codecov
uses: codecov/codecov-action@v3
with:
token: ${{ secrets.CODECOV_TOKEN }}
directory: ./packages/${{ matrix.packages.package }}/coverage-4.3-enterprise/
flags: ${{ matrix.packages.package }},4.3-enterprise,integration
fail_ci_if_error: true
- if: ${{ env.CODECOV_TOKEN != '' && !inputs.disable-code-cov-upload && matrix.packages.package == 'graphql' }}
name: Archive coverage report
uses: actions/upload-artifact@v3
with:
name: integration-coverage-${{ matrix.packages.package }}
path: packages/${{ matrix.packages.package }}/coverage/

integration-tests:
strategy:
matrix:
Expand Down
41 changes: 22 additions & 19 deletions packages/graphql/tests/schema/directives/subscription.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@
import type { GraphQLFieldMap } from "graphql";
import { gql } from "graphql-tag";
import { Neo4jGraphQL } from "../../../src";
import { TestSubscriptionsPlugin } from "../../utils/TestSubscriptionPlugin";
import { TestSubscriptionsMechanism } from "../../utils/TestSubscriptionsMechanism";

describe("@subscription directive", () => {
let subscriptionPlugin: TestSubscriptionsPlugin;
let subscriptionPlugin: TestSubscriptionsMechanism;

beforeAll(() => {
subscriptionPlugin = new TestSubscriptionsPlugin();
subscriptionPlugin = new TestSubscriptionsMechanism();
});

describe("on OBJECT", () => {
Expand All @@ -44,7 +44,10 @@ describe("@subscription directive", () => {
}
`;

const neoSchema = new Neo4jGraphQL({ typeDefs, plugins: { subscriptions: subscriptionPlugin } });
const neoSchema = new Neo4jGraphQL({
typeDefs,
features: { subscriptions: subscriptionPlugin },
});
const schema = await neoSchema.getSchema();

const subscriptionFields = schema.getSubscriptionType()?.getFields() as GraphQLFieldMap<any, any>;
Expand Down Expand Up @@ -94,7 +97,7 @@ describe("@subscription directive", () => {
}
`;

const neoSchema = new Neo4jGraphQL({ typeDefs, plugins: { subscriptions: subscriptionPlugin } });
const neoSchema = new Neo4jGraphQL({ typeDefs, features: { subscriptions: subscriptionPlugin } });
const schema = await neoSchema.getSchema();
const subscriptionFields = schema.getSubscriptionType()?.getFields() as GraphQLFieldMap<any, any>;

Expand Down Expand Up @@ -143,7 +146,7 @@ describe("@subscription directive", () => {
}
`;

const neoSchema = new Neo4jGraphQL({ typeDefs, plugins: { subscriptions: subscriptionPlugin } });
const neoSchema = new Neo4jGraphQL({ typeDefs, features: { subscriptions: subscriptionPlugin } });
const schema = await neoSchema.getSchema();
const subscriptionFields = schema.getSubscriptionType()?.getFields() as GraphQLFieldMap<any, any>;

Expand Down Expand Up @@ -192,7 +195,7 @@ describe("@subscription directive", () => {
}
`;

const neoSchema = new Neo4jGraphQL({ typeDefs, plugins: { subscriptions: subscriptionPlugin } });
const neoSchema = new Neo4jGraphQL({ typeDefs, features: { subscriptions: subscriptionPlugin } });
const schema = await neoSchema.getSchema();
const subscriptionFields = schema.getSubscriptionType()?.getFields() as GraphQLFieldMap<any, any>;

Expand Down Expand Up @@ -241,7 +244,7 @@ describe("@subscription directive", () => {
}
`;

const neoSchema = new Neo4jGraphQL({ typeDefs, plugins: { subscriptions: subscriptionPlugin } });
const neoSchema = new Neo4jGraphQL({ typeDefs, features: { subscriptions: subscriptionPlugin } });
const schema = await neoSchema.getSchema();
const subscriptionFields = schema.getSubscriptionType()?.getFields() as GraphQLFieldMap<any, any>;

Expand Down Expand Up @@ -290,7 +293,7 @@ describe("@subscription directive", () => {
}
`;

const neoSchema = new Neo4jGraphQL({ typeDefs, plugins: { subscriptions: subscriptionPlugin } });
const neoSchema = new Neo4jGraphQL({ typeDefs, features: { subscriptions: subscriptionPlugin } });
const schema = await neoSchema.getSchema();
const subscriptionFields = schema.getSubscriptionType()?.getFields() as GraphQLFieldMap<any, any>;

Expand Down Expand Up @@ -339,7 +342,7 @@ describe("@subscription directive", () => {
}
`;

const neoSchema = new Neo4jGraphQL({ typeDefs, plugins: { subscriptions: subscriptionPlugin } });
const neoSchema = new Neo4jGraphQL({ typeDefs, features: { subscriptions: subscriptionPlugin } });
const schema = await neoSchema.getSchema();
const subscriptionFields = schema.getSubscriptionType()?.getFields() as GraphQLFieldMap<any, any>;

Expand Down Expand Up @@ -387,7 +390,7 @@ describe("@subscription directive", () => {
actors: [Actor!]! @relationship(type: "ACTED_IN", direction: OUT)
}
`;
const neoSchema = new Neo4jGraphQL({ typeDefs, plugins: { subscriptions: subscriptionPlugin } });
const neoSchema = new Neo4jGraphQL({ typeDefs, features: { subscriptions: subscriptionPlugin } });

const schema = await neoSchema.getSchema();
expect(schema).toBeDefined();
Expand All @@ -410,7 +413,7 @@ describe("@subscription directive", () => {
extend schema @subscription
`;

const neoSchema = new Neo4jGraphQL({ typeDefs, plugins: { subscriptions: subscriptionPlugin } });
const neoSchema = new Neo4jGraphQL({ typeDefs, features: { subscriptions: subscriptionPlugin } });
const schema = await neoSchema.getSchema();

const subscriptionFields = schema.getSubscriptionType()?.getFields() as GraphQLFieldMap<any, any>;
Expand Down Expand Up @@ -461,7 +464,7 @@ describe("@subscription directive", () => {
extend schema @subscription(operations: [UPDATE, DELETE, CREATE_RELATIONSHIP, DELETE_RELATIONSHIP])
`;

const neoSchema = new Neo4jGraphQL({ typeDefs, plugins: { subscriptions: subscriptionPlugin } });
const neoSchema = new Neo4jGraphQL({ typeDefs, features: { subscriptions: subscriptionPlugin } });
const schema = await neoSchema.getSchema();
const subscriptionFields = schema.getSubscriptionType()?.getFields() as GraphQLFieldMap<any, any>;

Expand Down Expand Up @@ -511,7 +514,7 @@ describe("@subscription directive", () => {
extend schema @subscription(operations: [CREATE, DELETE, CREATE_RELATIONSHIP, DELETE_RELATIONSHIP])
`;

const neoSchema = new Neo4jGraphQL({ typeDefs, plugins: { subscriptions: subscriptionPlugin } });
const neoSchema = new Neo4jGraphQL({ typeDefs, features: { subscriptions: subscriptionPlugin } });
const schema = await neoSchema.getSchema();
const subscriptionFields = schema.getSubscriptionType()?.getFields() as GraphQLFieldMap<any, any>;

Expand Down Expand Up @@ -561,7 +564,7 @@ describe("@subscription directive", () => {
extend schema @subscription(operations: [CREATE, UPDATE, CREATE_RELATIONSHIP, DELETE_RELATIONSHIP])
`;

const neoSchema = new Neo4jGraphQL({ typeDefs, plugins: { subscriptions: subscriptionPlugin } });
const neoSchema = new Neo4jGraphQL({ typeDefs, features: { subscriptions: subscriptionPlugin } });
const schema = await neoSchema.getSchema();
const subscriptionFields = schema.getSubscriptionType()?.getFields() as GraphQLFieldMap<any, any>;

Expand Down Expand Up @@ -611,7 +614,7 @@ describe("@subscription directive", () => {
extend schema @subscription(operations: [CREATE, UPDATE, DELETE, DELETE_RELATIONSHIP])
`;

const neoSchema = new Neo4jGraphQL({ typeDefs, plugins: { subscriptions: subscriptionPlugin } });
const neoSchema = new Neo4jGraphQL({ typeDefs, features: { subscriptions: subscriptionPlugin } });
const schema = await neoSchema.getSchema();
const subscriptionFields = schema.getSubscriptionType()?.getFields() as GraphQLFieldMap<any, any>;

Expand Down Expand Up @@ -661,7 +664,7 @@ describe("@subscription directive", () => {
extend schema @subscription(operations: [CREATE, UPDATE, DELETE, CREATE_RELATIONSHIP])
`;

const neoSchema = new Neo4jGraphQL({ typeDefs, plugins: { subscriptions: subscriptionPlugin } });
const neoSchema = new Neo4jGraphQL({ typeDefs, features: { subscriptions: subscriptionPlugin } });
const schema = await neoSchema.getSchema();
const subscriptionFields = schema.getSubscriptionType()?.getFields() as GraphQLFieldMap<any, any>;

Expand Down Expand Up @@ -711,7 +714,7 @@ describe("@subscription directive", () => {
extend schema @subscription(operations: [])
`;

const neoSchema = new Neo4jGraphQL({ typeDefs, plugins: { subscriptions: subscriptionPlugin } });
const neoSchema = new Neo4jGraphQL({ typeDefs, features: { subscriptions: subscriptionPlugin } });
const schema = await neoSchema.getSchema();
const subscriptionFields = schema.getSubscriptionType()?.getFields() as GraphQLFieldMap<any, any>;

Expand Down Expand Up @@ -760,7 +763,7 @@ describe("@subscription directive", () => {
}
extend schema @query(read: true) @subscription(operations: [])
`;
const neoSchema = new Neo4jGraphQL({ typeDefs, plugins: { subscriptions: subscriptionPlugin } });
const neoSchema = new Neo4jGraphQL({ typeDefs, features: { subscriptions: subscriptionPlugin } });

const schema = await neoSchema.getSchema();
expect(schema).toBeDefined();
Expand Down
Loading