integration-testsuite: relax error expectations (#6760)

Fastify's JSON parser returns errors directly in these cases rather than
letting our middleware react to the lack of parsing.

Author: glasser

.changeset/lazy-emus-hunt.md

@@ -0,0 +1,5 @@
+---
+"@apollo/server-integration-testsuite": patch
+---
+
+Relax error-handling expectations to work better with Fastify

packages/integration-testsuite/src/apolloServerTests.ts

@@ -2724,13 +2724,22 @@ export function defineIntegrationTestSuiteApolloServerTests(
         expect(invalidRequestErrors).toHaveLength(0);
       }
 
-      function blocked(res: Response) {
-        expect(res.status).toBe(400);
-        expect(res.text).toMatch(/This operation has been blocked/);
-        expect(invalidRequestErrors).toHaveLength(1);
-        expect(invalidRequestErrors.pop()?.message).toMatch(
-          /This operation has been blocked/,
-        );
+      // When Apollo Server itself blocks a request, it returns status code 400
+      // with a particular message. With some web frameworks, a request without
+      // a parsable Content-Type will make it to our middleware and get blocked
+      // by us; with other frameworks (eg Fastify) the framework itself will
+      // block it earlier in some cases. This function is thus relaxed for the
+      // one particular case where Fastify returns a 415 earlier; we can relax
+      // it further if other integrations need it.
+      function blocked(res: Response, statusCodes = [400]) {
+        expect(statusCodes).toContain(res.status);
+        if (res.status === 400) {
+          expect(res.text).toMatch(/This operation has been blocked/);
+          expect(invalidRequestErrors).toHaveLength(1);
+          expect(invalidRequestErrors.pop()?.message).toMatch(
+            /This operation has been blocked/,
+          );
+        }
       }
 
       it('default', async () => {
@@ -2745,7 +2754,10 @@ export function defineIntegrationTestSuiteApolloServerTests(
         );
 
         // POST without content-type is blocked.
-        blocked(await request(url).post('/').send(JSON.stringify(operation)));
+        blocked(
+          await request(url).post('/').send(JSON.stringify(operation)),
+          [400, 415],
+        );
 
         // POST with text/plain is blocked.
         blocked(

packages/integration-testsuite/src/httpServerTests.ts

@@ -272,24 +272,21 @@ export function defineIntegrationTestSuiteHttpServerTests(
 
       it('throws an error if POST body is empty', async () => {
         const app = await createApp();
-        const req = request(app)
+        const res = await request(app)
           .post('/')
           .type('text/plain')
           .set('apollo-require-preflight', 't')
           .send('  ');
-        return req.then((res) => {
-          expect(res.status).toEqual(400);
-          expect((res.error as HTTPError).text).toMatch('POST body missing');
-        });
+        expect(res.status).toEqual(400);
       });
 
       it('throws an error if POST body is missing even with content-type', async () => {
         const app = await createApp();
-        const req = request(app).post('/').type('application/json').send();
-        return req.then((res) => {
-          expect(res.status).toEqual(400);
-          expect((res.error as HTTPError).text).toMatch('POST body missing');
-        });
+        const res = await request(app)
+          .post('/')
+          .type('application/json')
+          .send();
+        expect(res.status).toEqual(400);
       });
 
       it('throws an error if invalid content-type', async () => {