fix(): resolve merge conflicts

Author: kamilmysliwiec

.circleci/config.yml

@@ -123,7 +123,7 @@ jobs:
           command: docker ps
       - run:
           name: Integration tests
-          command: npm run integration-test
+          command: npm run test:integration
 
   codechecks_benchmarks:
     working_directory: ~/nest

CONTRIBUTING.md

@@ -3,7 +3,7 @@ import { Test } from '@nestjs/testing';
 import * as request from 'supertest';
 import { ApplicationModule } from '../src/app.module';
 
-describe('TypeGraphQL', () => {
+describe('GraphQL - Code-first', () => {
   let app: INestApplication;
 
   beforeEach(async () => {

…tion/typegraphql/e2e/typegraphql.spec.ts …raphql-code-first/e2e/code-first.spec.tsintegration/typegraphql/e2e/typegraphql.spec.ts renamed to integration/graphql-code-first/e2e/code-first.spec.ts integration/typegraphql/e2e/typegraphql.spec.ts renamed to integration/graphql-code-first/e2e/code-first.spec.ts

@@ -32,24 +32,7 @@ describe('GraphQL Pipes', () => {
             extensions: {
               code: 'INTERNAL_SERVER_ERROR',
               exception: {
-                message: {
-                  error: 'Bad Request',
-                  message: [
-                    {
-                      children: [],
-                      constraints: {
-                        length:
-                          'description must be longer than or equal to 30 characters',
-                      },
-                      property: 'description',
-                      target: {
-                        ingredients: [],
-                        title: 'test',
-                      },
-                    },
-                  ],
-                  statusCode: 400,
-                },
+                message: 'Bad Request Exception',
                 response: {
                   error: 'Bad Request',
                   message: [
@@ -77,24 +60,7 @@ describe('GraphQL Pipes', () => {
                 line: 2,
               },
             ],
-            message: {
-              error: 'Bad Request',
-              message: [
-                {
-                  children: [],
-                  constraints: {
-                    length:
-                      'description must be longer than or equal to 30 characters',
-                  },
-                  property: 'description',
-                  target: {
-                    ingredients: [],
-                    title: 'test',
-                  },
-                },
-              ],
-              statusCode: 400,
-            },
+            message: 'Bad Request Exception',
             path: ['addRecipe'],
           },
         ],

…n/typegraphql/e2e/guards-filters.spec.ts …ql-code-first/e2e/guards-filters.spec.tsintegration/typegraphql/e2e/guards-filters.spec.ts renamed to integration/graphql-code-first/e2e/guards-filters.spec.ts integration/typegraphql/e2e/guards-filters.spec.ts renamed to integration/graphql-code-first/e2e/guards-filters.spec.ts

@@ -1,7 +1,6 @@
-# -----------------------------------------------
-# !!! THIS FILE WAS GENERATED BY TYPE-GRAPHQL !!!
-# !!!   DO NOT MODIFY THIS FILE BY YOURSELF   !!!
-# -----------------------------------------------
+# ------------------------------------------------------
+# THIS FILE WAS AUTOMATICALLY GENERATED (DO NOT MODIFY)
+# ------------------------------------------------------
 
 """Date custom scalar type"""
 scalar Date

integration/typegraphql/e2e/pipes.spec.ts …ion/graphql-code-first/e2e/pipes.spec.tsintegration/typegraphql/e2e/pipes.spec.ts renamed to integration/graphql-code-first/e2e/pipes.spec.ts integration/typegraphql/e2e/pipes.spec.ts renamed to integration/graphql-code-first/e2e/pipes.spec.ts

@@ -9,7 +9,10 @@ import { RecipesModule } from './recipes/recipes.module';
     GraphQLModule.forRoot({
       debug: false,
       installSubscriptionHandlers: true,
-      autoSchemaFile: join(process.cwd(), 'integration/typegraphql/schema.gql'),
+      autoSchemaFile: join(
+        process.cwd(),
+        'integration/graphql-code-first/schema.gql',
+      ),
     }),
   ],
 })

integration/typegraphql/schema.gql integration/graphql-code-first/schema.gqlintegration/typegraphql/schema.gql renamed to integration/graphql-code-first/schema.gql

@@ -10,6 +10,6 @@ import { tap } from 'rxjs/operators';
 @Injectable()
 export class DataInterceptor implements NestInterceptor {
   intercept(context: ExecutionContext, next: CallHandler): Observable<any> {
-    return next.handle().pipe(tap(data => console.log(data)));
+    return next.handle().pipe(tap(data => data));
   }
 }