From 22002d50ac1d1298ad584274f6852e9ab97d09f3 Mon Sep 17 00:00:00 2001
From: Faruk AYDIN <omerfaruk26@gmail.com>
Date: Mon, 26 Aug 2024 16:01:15 +0300
Subject: [PATCH 1/3] chore: Comment converted graphQL mutations

---
 packages/backend/src/graphql/mutation-resolvers.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/backend/src/graphql/mutation-resolvers.js b/packages/backend/src/graphql/mutation-resolvers.js
index 4d60ae53..8ff998a7 100644
--- a/packages/backend/src/graphql/mutation-resolvers.js
+++ b/packages/backend/src/graphql/mutation-resolvers.js
@@ -9,7 +9,6 @@ import deleteConnection from './mutations/delete-connection.js';
 import deleteCurrentUser from './mutations/delete-current-user.ee.js';
 import deleteFlow from './mutations/delete-flow.js';
 import deleteRole from './mutations/delete-role.ee.js';
-import deleteStep from './mutations/delete-step.js';
 import duplicateFlow from './mutations/duplicate-flow.js';
 import executeFlow from './mutations/execute-flow.js';
 import generateAuthUrl from './mutations/generate-auth-url.js';
@@ -29,6 +28,9 @@ import upsertSamlAuthProvider from './mutations/upsert-saml-auth-provider.ee.js'
 import upsertSamlAuthProvidersRoleMappings from './mutations/upsert-saml-auth-providers-role-mappings.ee.js';
 import verifyConnection from './mutations/verify-connection.js';
 
+// Converted mutations
+import deleteStep from './mutations/delete-step.js';
+
 const mutationResolvers = {
   createAppAuthClient,
   createAppConfig,

From ce6214dc0f44d288f68628e796f6f6ab2dc8dbbe Mon Sep 17 00:00:00 2001
From: Faruk AYDIN <omerfaruk26@gmail.com>
Date: Mon, 26 Aug 2024 16:26:03 +0300
Subject: [PATCH 2/3] refactor: Rename create test action as test connection

---
 .../api/v1/connections/{create-test.js => test-connection.js} | 0
 .../{create-test.test.js => test-connection.test.js}          | 0
 packages/backend/src/routes/api/v1/connections.js             | 4 ++--
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename packages/backend/src/controllers/api/v1/connections/{create-test.js => test-connection.js} (100%)
 rename packages/backend/src/controllers/api/v1/connections/{create-test.test.js => test-connection.test.js} (100%)

diff --git a/packages/backend/src/controllers/api/v1/connections/create-test.js b/packages/backend/src/controllers/api/v1/connections/test-connection.js
similarity index 100%
rename from packages/backend/src/controllers/api/v1/connections/create-test.js
rename to packages/backend/src/controllers/api/v1/connections/test-connection.js
diff --git a/packages/backend/src/controllers/api/v1/connections/create-test.test.js b/packages/backend/src/controllers/api/v1/connections/test-connection.test.js
similarity index 100%
rename from packages/backend/src/controllers/api/v1/connections/create-test.test.js
rename to packages/backend/src/controllers/api/v1/connections/test-connection.test.js
diff --git a/packages/backend/src/routes/api/v1/connections.js b/packages/backend/src/routes/api/v1/connections.js
index 223f5a05..29f41a4f 100644
--- a/packages/backend/src/routes/api/v1/connections.js
+++ b/packages/backend/src/routes/api/v1/connections.js
@@ -3,7 +3,7 @@ import asyncHandler from 'express-async-handler';
 import { authenticateUser } from '../../../helpers/authentication.js';
 import { authorizeUser } from '../../../helpers/authorization.js';
 import getFlowsAction from '../../../controllers/api/v1/connections/get-flows.js';
-import createTestAction from '../../../controllers/api/v1/connections/create-test.js';
+import testConnectionAction from '../../../controllers/api/v1/connections/test-connection.js';
 
 const router = Router();
 
@@ -18,7 +18,7 @@ router.post(
   '/:connectionId/test',
   authenticateUser,
   authorizeUser,
-  asyncHandler(createTestAction)
+  asyncHandler(testConnectionAction)
 );
 
 export default router;

From 56c08a358753b781518b9bffb0dde1aa5489695c Mon Sep 17 00:00:00 2001
From: Faruk AYDIN <omerfaruk26@gmail.com>
Date: Mon, 26 Aug 2024 16:26:29 +0300
Subject: [PATCH 3/3] fix: Solve truncate deadlock problem for test suite

---
 packages/backend/test/setup/global-hooks.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/backend/test/setup/global-hooks.js b/packages/backend/test/setup/global-hooks.js
index 7e4eee85..c953539f 100644
--- a/packages/backend/test/setup/global-hooks.js
+++ b/packages/backend/test/setup/global-hooks.js
@@ -8,7 +8,9 @@ global.beforeAll(async () => {
   logger.silent = true;
 
   // Remove default roles and permissions before running the test suite
-  await knex.raw('TRUNCATE TABLE config, roles, permissions CASCADE');
+  await knex.raw('TRUNCATE TABLE config CASCADE');
+  await knex.raw('TRUNCATE TABLE roles CASCADE');
+  await knex.raw('TRUNCATE TABLE permissions CASCADE');
 });
 
 global.beforeEach(async () => {