From 0572f77c1f67cef7ea4e2120a54f9fbda582db1a Mon Sep 17 00:00:00 2001
From: Hans Tirtaputra <hansybastian@gmail.com>
Date: Thu, 16 Jun 2022 00:51:42 +0800
Subject: [PATCH] refactor: form feedback tests to merge into one describe
 route

---
 .../public-forms.feedback.routes.spec.ts      | 25 +++----------------
 1 file changed, 4 insertions(+), 21 deletions(-)

diff --git a/src/app/routes/api/v3/forms/__tests__/public-forms.feedback.routes.spec.ts b/src/app/routes/api/v3/forms/__tests__/public-forms.feedback.routes.spec.ts
index 58f0ca74f1..456a6a1858 100644
--- a/src/app/routes/api/v3/forms/__tests__/public-forms.feedback.routes.spec.ts
+++ b/src/app/routes/api/v3/forms/__tests__/public-forms.feedback.routes.spec.ts
@@ -18,10 +18,6 @@ import { PublicFormsRouter } from '../public-forms.routes'
 
 const app = setupApp('/forms', PublicFormsRouter)
 
-/**
- * TODO #3964: Remove 'public-form.feedback.routes' test, and keep 'public-form.submissions.feedback.routes' test
- * once `/api/v3/forms/{formId}/feedback` route is cleaned up
- */
 describe('public-form.feedback.routes', () => {
   let request: Session
 
@@ -34,6 +30,10 @@ describe('public-form.feedback.routes', () => {
     jest.restoreAllMocks()
   })
   afterAll(async () => await dbHandler.closeDatabase())
+  /**
+   * TODO #3964: Remove /forms/:formId/feedback tests, and keep '/forms/:formId/submissions/:submissionId/feedback'
+   * test once `/api/v3/forms/{formId}/feedback` route is cleaned up
+   */
   describe('POST /forms/:formId/feedback', () => {
     it('should return 200 when feedback was successfully saved', async () => {
       // Arrange
@@ -165,24 +165,7 @@ describe('public-form.feedback.routes', () => {
       expect(response.body).toEqual(expectedResponse)
     })
   })
-})
-
-/**
- * TODO #3964: Update the `describe` path from 'public-form.submissions.feedback.routes'
- * to 'public-form.feedback.routes' once `/api/v3/forms/{formId}/feedback` route is cleaned up
- */
-describe('public-form.submissions.feedback.routes', () => {
-  let request: Session
 
-  beforeAll(async () => await dbHandler.connect())
-  beforeEach(async () => {
-    request = supertest(app)
-  })
-  afterEach(async () => {
-    await dbHandler.clearDatabase()
-    jest.restoreAllMocks()
-  })
-  afterAll(async () => await dbHandler.closeDatabase())
   describe('POST /forms/:formId/submissions/:submissionId/feedback', () => {
     it('should return 200 when feedback was successfully saved', async () => {
       const MOCK_FEEDBACK = {