Skip to content

Commit c845bea

Browse files
test(mercurius): update gql module options for federation
1 parent c7cc273 commit c845bea

File tree

10 files changed

+36
-30
lines changed

10 files changed

+36
-30
lines changed

packages/mercurius/tests/code-first-federation/posts-service/federation-posts.module.ts

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
11
import { Module } from '@nestjs/common';
22
import { GraphQLModule } from '@nestjs/graphql';
3-
import { MercuriusDriverConfig, MercuriusFederationDriver } from '../../../lib';
4-
import { UserModule } from './users/user.module';
3+
import {
4+
MercuriusFederationDriver,
5+
MercuriusFederationDriverConfig,
6+
} from '../../../lib';
57
import { PostModule } from './posts/post.module';
8+
import { UserModule } from './users/user.module';
69

710
@Module({
811
imports: [
9-
GraphQLModule.forRoot<MercuriusDriverConfig>({
12+
GraphQLModule.forRoot<MercuriusFederationDriverConfig>({
1013
driver: MercuriusFederationDriver,
1114
autoSchemaFile: true,
12-
federationMetadata: true,
1315
}),
1416
UserModule,
1517
PostModule,

packages/mercurius/tests/code-first-federation/recipes-service/federation-recipes.module.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
import { Module } from '@nestjs/common';
22
import { GraphQLModule } from '@nestjs/graphql';
3-
import { MercuriusDriverConfig, MercuriusFederationDriver } from '../../../lib';
3+
import { MercuriusFederationDriver } from '../../../lib';
44
import { RecipeModule } from './recipes/recipe.module';
55

66
@Module({
77
imports: [
8-
GraphQLModule.forRoot<MercuriusDriverConfig>({
8+
GraphQLModule.forRoot<MercuriusFederationDriverConfig>({
99
driver: MercuriusFederationDriver,
1010
autoSchemaFile: true,
11-
federationMetadata: true,
1211
}),
1312
RecipeModule,
1413
],

packages/mercurius/tests/code-first-federation/users-service/federation-users.module.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
import { Module } from '@nestjs/common';
22
import { GraphQLModule } from '@nestjs/graphql';
3-
import { MercuriusDriverConfig, MercuriusFederationDriver } from '../../../lib';
3+
import {
4+
MercuriusFederationDriver,
5+
MercuriusFederationDriverConfig,
6+
} from '../../../lib';
47
import { UserModule } from './users/user.module';
58

69
@Module({
710
imports: [
8-
GraphQLModule.forRoot<MercuriusDriverConfig>({
11+
GraphQLModule.forRoot<MercuriusFederationDriverConfig>({
912
driver: MercuriusFederationDriver,
1013
autoSchemaFile: true,
11-
federationMetadata: true,
1214
}),
1315
UserModule,
1416
],

packages/mercurius/tests/e2e/code-first-federation.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import { Test } from '@nestjs/testing';
44
import * as request from 'supertest';
55
import { AppModule as GatewayModule } from '../code-first-federation/gateway/gateway.module';
66
import { AppModule as PostsModule } from '../code-first-federation/posts-service/federation-posts.module';
7-
import { AppModule as UsersModule } from '../code-first-federation/users-service/federation-users.module';
87
import { AppModule as RecipesModule } from '../code-first-federation/recipes-service/federation-recipes.module';
8+
import { AppModule as UsersModule } from '../code-first-federation/users-service/federation-users.module';
99

1010
async function createService(Module: Type<any>, port: number) {
1111
const module = await Test.createTestingModule({

packages/mercurius/tests/graphql-federation/posts-service/federation-posts.module.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,19 @@
11
import { Module } from '@nestjs/common';
22
import { GraphQLModule } from '@nestjs/graphql';
33
import { join } from 'path';
4-
import { MercuriusDriverConfig, MercuriusFederationDriver } from '../../../lib';
4+
import {
5+
MercuriusFederationDriver,
6+
MercuriusFederationDriverConfig,
7+
} from '../../../lib';
58
import { PostsModule } from './posts/posts.module';
69
import { upperDirectiveTransformer } from './posts/upper.directive';
710

811
@Module({
912
imports: [
10-
GraphQLModule.forRoot<MercuriusDriverConfig>({
13+
GraphQLModule.forRoot<MercuriusFederationDriverConfig>({
1114
driver: MercuriusFederationDriver,
1215
typePaths: [join(__dirname, '**/*.graphql')],
1316
transformSchema: (schema) => upperDirectiveTransformer(schema, 'upper'),
14-
federationMetadata: true,
1517
}),
1618
PostsModule,
1719
],
Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
11
import { Injectable } from '@nestjs/common';
22
import { join } from 'path';
33
import {
4-
MercuriusDriverConfig,
54
MercuriusDriverConfigFactory,
5+
MercuriusFederationDriverConfig,
66
} from '../../../../lib';
77

88
@Injectable()
99
export class ConfigService implements MercuriusDriverConfigFactory {
10-
public createGqlOptions(): Partial<MercuriusDriverConfig> {
10+
public createGqlOptions(): Partial<MercuriusFederationDriverConfig> {
1111
return {
1212
typePaths: [join(__dirname, '../**/*.graphql')],
13-
federationMetadata: true,
1413
};
1514
}
1615
}

packages/mercurius/tests/graphql-federation/users-service/federation-users.module.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
11
import { Module } from '@nestjs/common';
22
import { GraphQLModule } from '@nestjs/graphql';
33
import { join } from 'path';
4-
import { MercuriusDriverConfig, MercuriusFederationDriver } from '../../../lib';
4+
import {
5+
MercuriusFederationDriver,
6+
MercuriusFederationDriverConfig,
7+
} from '../../../lib';
58
import { UsersModule } from './users/users.module';
69

710
@Module({
811
imports: [
9-
GraphQLModule.forRoot<MercuriusDriverConfig>({
12+
GraphQLModule.forRoot<MercuriusFederationDriverConfig>({
1013
driver: MercuriusFederationDriver,
1114
typePaths: [join(__dirname, '**/*.graphql')],
12-
federationMetadata: true,
1315
}),
1416
UsersModule,
1517
],

packages/mercurius/tests/plugins/graphql-federation-plugin/posts-service/federation-posts.module.ts

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@ import { Module } from '@nestjs/common';
22
import { GraphQLModule } from '@nestjs/graphql';
33
import { join } from 'path';
44
import {
5-
MercuriusDriverConfig,
65
MercuriusFederationDriver,
6+
MercuriusFederationDriverConfig,
77
} from '../../../../lib';
88
import { PostsModule } from '../../../graphql-federation/posts-service/posts/posts.module';
99
import { upperDirectiveTransformer } from '../../../graphql-federation/posts-service/posts/upper.directive';
1010
import { mockPlugin } from '../../mocks/mock.plugin';
1111

1212
@Module({
1313
imports: [
14-
GraphQLModule.forRoot<MercuriusDriverConfig>({
14+
GraphQLModule.forRoot<MercuriusFederationDriverConfig>({
1515
driver: MercuriusFederationDriver,
1616
typePaths: [
1717
join(
@@ -21,10 +21,9 @@ import { mockPlugin } from '../../mocks/mock.plugin';
2121
),
2222
],
2323
transformSchema: (schema) => upperDirectiveTransformer(schema, 'upper'),
24-
federationMetadata: true,
2524
plugins: [
2625
{
27-
plugin: mockPlugin,
26+
plugin: mockPlugin as any,
2827
},
2928
],
3029
}),

packages/mercurius/tests/plugins/graphql-federation-plugin/users-service/federation-users.module.ts

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@ import { Module } from '@nestjs/common';
22
import { GraphQLModule } from '@nestjs/graphql';
33
import { join } from 'path';
44
import {
5-
MercuriusDriverConfig,
65
MercuriusFederationDriver,
6+
MercuriusFederationDriverConfig,
77
} from '../../../../lib';
88
import { UsersModule } from '../../../graphql-federation/users-service/users/users.module';
99
import { mockPlugin } from '../../mocks/mock.plugin';
1010
import { NEW_PLUGIN_URL } from '../../mocks/utils/constants';
1111

1212
@Module({
1313
imports: [
14-
GraphQLModule.forRoot<MercuriusDriverConfig>({
14+
GraphQLModule.forRoot<MercuriusFederationDriverConfig>({
1515
driver: MercuriusFederationDriver,
1616
typePaths: [
1717
join(
@@ -20,14 +20,13 @@ import { NEW_PLUGIN_URL } from '../../mocks/utils/constants';
2020
'**/*.graphql',
2121
),
2222
],
23-
federationMetadata: true,
2423
plugins: [
2524
{
2625
plugin: mockPlugin,
2726
options: {
2827
url: NEW_PLUGIN_URL,
2928
},
30-
},
29+
} as any,
3130
],
3231
}),
3332
UsersModule,

packages/mercurius/tests/subscriptions-federation/app/app.module.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
import { Module } from '@nestjs/common';
22
import { DynamicModule } from '@nestjs/common/interfaces';
33
import { GraphQLModule } from '@nestjs/graphql';
4-
import { MercuriusFederationDriver, MercuriusFederationDriverConfig } from '../../../lib';
4+
import {
5+
MercuriusFederationDriver,
6+
MercuriusFederationDriverConfig,
7+
} from '../../../lib';
58
import { NotificationModule } from './notification.module';
69

710
export type AppModuleConfig = {
@@ -19,7 +22,6 @@ export class AppModule {
1922
GraphQLModule.forRoot<MercuriusFederationDriverConfig>({
2023
driver: MercuriusFederationDriver,
2124
context: options?.context,
22-
federationMetadata: true,
2325
autoSchemaFile: true,
2426
subscription: options?.subscription,
2527
}),

0 commit comments

Comments
 (0)