From 10a22487ef2df027147409c2fd8f0a8f32cc2094 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Thu, 23 Feb 2023 09:06:41 +0100
Subject: [PATCH 1/7] Withdrew helper/jest.js and replace it with graphql-tag

---
 backend/src/helpers/jest.js                            | 10 ----------
 .../src/middleware/hashtags/hashtagsMiddleware.spec.js |  2 +-
 backend/src/middleware/languages/languages.spec.js     |  2 +-
 .../notifications/notificationsMiddleware.spec.js      |  2 +-
 backend/src/middleware/orderByMiddleware.spec.js       |  2 +-
 backend/src/middleware/permissionsMiddleware.spec.js   |  2 +-
 .../middleware/softDelete/softDeleteMiddleware.spec.js |  2 +-
 backend/src/middleware/userInteractions.spec.js        |  2 +-
 .../middleware/validation/validationMiddleware.spec.js |  2 +-
 backend/src/schema/resolvers/comments.spec.js          |  2 +-
 backend/src/schema/resolvers/donations.spec.js         |  2 +-
 backend/src/schema/resolvers/emails.spec.js            |  2 +-
 backend/src/schema/resolvers/embeds.spec.js            |  2 +-
 backend/src/schema/resolvers/follow.spec.js            |  2 +-
 backend/src/schema/resolvers/inviteCodes.spec.js       |  2 +-
 backend/src/schema/resolvers/locations.spec.js         |  2 +-
 backend/src/schema/resolvers/moderation.spec.js        |  2 +-
 backend/src/schema/resolvers/notifications.spec.js     |  2 +-
 backend/src/schema/resolvers/passwordReset.spec.js     |  2 +-
 backend/src/schema/resolvers/posts.spec.js             |  2 +-
 backend/src/schema/resolvers/registration.spec.js      |  2 +-
 backend/src/schema/resolvers/reports.spec.js           |  2 +-
 backend/src/schema/resolvers/rewards.spec.js           |  2 +-
 backend/src/schema/resolvers/searches.spec.js          |  2 +-
 backend/src/schema/resolvers/shout.spec.js             |  2 +-
 backend/src/schema/resolvers/socialMedia.spec.js       |  2 +-
 backend/src/schema/resolvers/statistics.spec.js        |  2 +-
 backend/src/schema/resolvers/userData.spec.js          |  2 +-
 backend/src/schema/resolvers/user_management.spec.js   |  2 +-
 backend/src/schema/resolvers/users.spec.js             |  2 +-
 backend/src/schema/resolvers/users/location.spec.js    |  2 +-
 backend/src/schema/resolvers/users/mutedUsers.spec.js  |  2 +-
 backend/src/schema/resolvers/viewedTeaserCount.spec.js |  2 +-
 33 files changed, 32 insertions(+), 42 deletions(-)

diff --git a/backend/src/helpers/jest.js b/backend/src/helpers/jest.js
index e3f6a3c84..09744e9f2 100644
--- a/backend/src/helpers/jest.js
+++ b/backend/src/helpers/jest.js
@@ -1,13 +1,3 @@
-// TODO: can be replaced with: (which is no a fake)
-// import gql from 'graphql-tag'
-// See issue: https://github.com/Ocelot-Social-Community/Ocelot-Social/issues/5152
-
-//* This is a fake ES2015 template string, just to benefit of syntax
-// highlighting of `gql` template strings in certain editors.
-export function gql(strings) {
-  return strings.join('')
-}
-
 // sometime we have to wait to check a db state by having a look into the db in a certain moment
 // or we wait a bit to check if we missed to set an await somewhere
 // see: https://www.sitepoint.com/delay-sleep-pause-wait/
diff --git a/backend/src/middleware/hashtags/hashtagsMiddleware.spec.js b/backend/src/middleware/hashtags/hashtagsMiddleware.spec.js
index bcecee73b..10d53ab7b 100644
--- a/backend/src/middleware/hashtags/hashtagsMiddleware.spec.js
+++ b/backend/src/middleware/hashtags/hashtagsMiddleware.spec.js
@@ -1,4 +1,4 @@
-import { gql } from '../../helpers/jest'
+import gql from 'graphql-tag'
 import { cleanDatabase } from '../../db/factories'
 import { createTestClient } from 'apollo-server-testing'
 import { getNeode, getDriver } from '../../db/neo4j'
diff --git a/backend/src/middleware/languages/languages.spec.js b/backend/src/middleware/languages/languages.spec.js
index 99e87152e..f4f57adc4 100644
--- a/backend/src/middleware/languages/languages.spec.js
+++ b/backend/src/middleware/languages/languages.spec.js
@@ -1,5 +1,5 @@
 import Factory, { cleanDatabase } from '../../db/factories'
-import { gql } from '../../helpers/jest'
+import gql from 'graphql-tag'
 import { getNeode, getDriver } from '../../db/neo4j'
 import createServer from '../../server'
 import { createTestClient } from 'apollo-server-testing'
diff --git a/backend/src/middleware/notifications/notificationsMiddleware.spec.js b/backend/src/middleware/notifications/notificationsMiddleware.spec.js
index ad7fd3f8c..a8a5d396b 100644
--- a/backend/src/middleware/notifications/notificationsMiddleware.spec.js
+++ b/backend/src/middleware/notifications/notificationsMiddleware.spec.js
@@ -1,4 +1,4 @@
-import { gql } from '../../helpers/jest'
+import gql from 'graphql-tag'
 import { cleanDatabase } from '../../db/factories'
 import { createTestClient } from 'apollo-server-testing'
 import { getNeode, getDriver } from '../../db/neo4j'
diff --git a/backend/src/middleware/orderByMiddleware.spec.js b/backend/src/middleware/orderByMiddleware.spec.js
index 1aef1c52a..7453cf301 100644
--- a/backend/src/middleware/orderByMiddleware.spec.js
+++ b/backend/src/middleware/orderByMiddleware.spec.js
@@ -1,4 +1,4 @@
-import { gql } from '../helpers/jest'
+import gql from 'graphql-tag'
 import { cleanDatabase } from '../db/factories'
 import { getNeode, getDriver } from '../db/neo4j'
 import { createTestClient } from 'apollo-server-testing'
diff --git a/backend/src/middleware/permissionsMiddleware.spec.js b/backend/src/middleware/permissionsMiddleware.spec.js
index 35a2ab82b..667e74164 100644
--- a/backend/src/middleware/permissionsMiddleware.spec.js
+++ b/backend/src/middleware/permissionsMiddleware.spec.js
@@ -1,7 +1,7 @@
 import { createTestClient } from 'apollo-server-testing'
 import createServer from '../server'
 import Factory, { cleanDatabase } from '../db/factories'
-import { gql } from '../helpers/jest'
+import gql from 'graphql-tag'
 import { getDriver, getNeode } from '../db/neo4j'
 import CONFIG from '../config'
 
diff --git a/backend/src/middleware/softDelete/softDeleteMiddleware.spec.js b/backend/src/middleware/softDelete/softDeleteMiddleware.spec.js
index 7e14cad1f..88d46a1c7 100644
--- a/backend/src/middleware/softDelete/softDeleteMiddleware.spec.js
+++ b/backend/src/middleware/softDelete/softDeleteMiddleware.spec.js
@@ -1,5 +1,5 @@
 import Factory, { cleanDatabase } from '../../db/factories'
-import { gql } from '../../helpers/jest'
+import gql from 'graphql-tag'
 import { getNeode, getDriver } from '../../db/neo4j'
 import createServer from '../../server'
 import { createTestClient } from 'apollo-server-testing'
diff --git a/backend/src/middleware/userInteractions.spec.js b/backend/src/middleware/userInteractions.spec.js
index 2f97bda5a..94d1ff274 100644
--- a/backend/src/middleware/userInteractions.spec.js
+++ b/backend/src/middleware/userInteractions.spec.js
@@ -1,5 +1,5 @@
 import Factory, { cleanDatabase } from '../db/factories'
-import { gql } from '../helpers/jest'
+import gql from 'graphql-tag'
 import { getNeode, getDriver } from '../db/neo4j'
 import createServer from '../server'
 import { createTestClient } from 'apollo-server-testing'
diff --git a/backend/src/middleware/validation/validationMiddleware.spec.js b/backend/src/middleware/validation/validationMiddleware.spec.js
index a887832c1..2e1cd6fa7 100644
--- a/backend/src/middleware/validation/validationMiddleware.spec.js
+++ b/backend/src/middleware/validation/validationMiddleware.spec.js
@@ -1,4 +1,4 @@
-import { gql } from '../../helpers/jest'
+import gql from 'graphql-tag'
 import Factory, { cleanDatabase } from '../../db/factories'
 import { getNeode, getDriver } from '../../db/neo4j'
 import { createTestClient } from 'apollo-server-testing'
diff --git a/backend/src/schema/resolvers/comments.spec.js b/backend/src/schema/resolvers/comments.spec.js
index 09487082e..b2730dad4 100644
--- a/backend/src/schema/resolvers/comments.spec.js
+++ b/backend/src/schema/resolvers/comments.spec.js
@@ -1,5 +1,5 @@
 import Factory, { cleanDatabase } from '../../db/factories'
-import { gql } from '../../helpers/jest'
+import gql from 'graphql-tag'
 import { createTestClient } from 'apollo-server-testing'
 import createServer from '../../server'
 import { getNeode, getDriver } from '../../db/neo4j'
diff --git a/backend/src/schema/resolvers/donations.spec.js b/backend/src/schema/resolvers/donations.spec.js
index 5a2bcfd7b..9fc010eca 100644
--- a/backend/src/schema/resolvers/donations.spec.js
+++ b/backend/src/schema/resolvers/donations.spec.js
@@ -1,6 +1,6 @@
 import { createTestClient } from 'apollo-server-testing'
 import Factory, { cleanDatabase } from '../../db/factories'
-import { gql } from '../../helpers/jest'
+import gql from 'graphql-tag'
 import { getNeode, getDriver } from '../../db/neo4j'
 import createServer from '../../server'
 
diff --git a/backend/src/schema/resolvers/emails.spec.js b/backend/src/schema/resolvers/emails.spec.js
index 4778e3fcf..02a631495 100644
--- a/backend/src/schema/resolvers/emails.spec.js
+++ b/backend/src/schema/resolvers/emails.spec.js
@@ -1,5 +1,5 @@
 import Factory, { cleanDatabase } from '../../db/factories'
-import { gql } from '../../helpers/jest'
+import gql from 'graphql-tag'
 import { getDriver, getNeode } from '../../db/neo4j'
 import createServer from '../../server'
 import { createTestClient } from 'apollo-server-testing'
diff --git a/backend/src/schema/resolvers/embeds.spec.js b/backend/src/schema/resolvers/embeds.spec.js
index 347825f3a..0f0d41357 100644
--- a/backend/src/schema/resolvers/embeds.spec.js
+++ b/backend/src/schema/resolvers/embeds.spec.js
@@ -3,7 +3,7 @@ import fs from 'fs'
 import path from 'path'
 import { createTestClient } from 'apollo-server-testing'
 import createServer from '../../server'
-import { gql } from '../../helpers/jest'
+import gql from 'graphql-tag'
 
 jest.mock('node-fetch')
 const { Response } = jest.requireActual('node-fetch')
diff --git a/backend/src/schema/resolvers/follow.spec.js b/backend/src/schema/resolvers/follow.spec.js
index 14d8a366d..0d9d524ff 100644
--- a/backend/src/schema/resolvers/follow.spec.js
+++ b/backend/src/schema/resolvers/follow.spec.js
@@ -2,7 +2,7 @@ import { createTestClient } from 'apollo-server-testing'
 import Factory, { cleanDatabase } from '../../db/factories'
 import { getDriver, getNeode } from '../../db/neo4j'
 import createServer from '../../server'
-import { gql } from '../../helpers/jest'
+import gql from 'graphql-tag'
 
 const driver = getDriver()
 const neode = getNeode()
diff --git a/backend/src/schema/resolvers/inviteCodes.spec.js b/backend/src/schema/resolvers/inviteCodes.spec.js
index b55ab079b..1df791ba6 100644
--- a/backend/src/schema/resolvers/inviteCodes.spec.js
+++ b/backend/src/schema/resolvers/inviteCodes.spec.js
@@ -1,6 +1,6 @@
 import Factory, { cleanDatabase } from '../../db/factories'
 import { getDriver } from '../../db/neo4j'
-import { gql } from '../../helpers/jest'
+import gql from 'graphql-tag'
 import createServer from '../../server'
 import { createTestClient } from 'apollo-server-testing'
 import CONSTANTS_REGISTRATION from './../../constants/registration'
diff --git a/backend/src/schema/resolvers/locations.spec.js b/backend/src/schema/resolvers/locations.spec.js
index 87542cf6d..82aebd441 100644
--- a/backend/src/schema/resolvers/locations.spec.js
+++ b/backend/src/schema/resolvers/locations.spec.js
@@ -1,5 +1,5 @@
 import Factory, { cleanDatabase } from '../../db/factories'
-import { gql } from '../../helpers/jest'
+import gql from 'graphql-tag'
 import { getNeode, getDriver } from '../../db/neo4j'
 import createServer from '../../server'
 import { createTestClient } from 'apollo-server-testing'
diff --git a/backend/src/schema/resolvers/moderation.spec.js b/backend/src/schema/resolvers/moderation.spec.js
index 9f5014756..1665e9446 100644
--- a/backend/src/schema/resolvers/moderation.spec.js
+++ b/backend/src/schema/resolvers/moderation.spec.js
@@ -1,6 +1,6 @@
 import { createTestClient } from 'apollo-server-testing'
 import Factory, { cleanDatabase } from '../../db/factories'
-import { gql } from '../../helpers/jest'
+import gql from 'graphql-tag'
 import { getNeode, getDriver } from '../../db/neo4j'
 import createServer from '../../server'
 
diff --git a/backend/src/schema/resolvers/notifications.spec.js b/backend/src/schema/resolvers/notifications.spec.js
index 82d6e6371..36bd530eb 100644
--- a/backend/src/schema/resolvers/notifications.spec.js
+++ b/backend/src/schema/resolvers/notifications.spec.js
@@ -1,5 +1,5 @@
 import Factory, { cleanDatabase } from '../../db/factories'
-import { gql } from '../../helpers/jest'
+import gql from 'graphql-tag'
 import { getDriver } from '../../db/neo4j'
 import { createTestClient } from 'apollo-server-testing'
 import createServer from '../.././server'
diff --git a/backend/src/schema/resolvers/passwordReset.spec.js b/backend/src/schema/resolvers/passwordReset.spec.js
index 90c570f5a..fa5f26e58 100644
--- a/backend/src/schema/resolvers/passwordReset.spec.js
+++ b/backend/src/schema/resolvers/passwordReset.spec.js
@@ -1,5 +1,5 @@
 import Factory, { cleanDatabase } from '../../db/factories'
-import { gql } from '../../helpers/jest'
+import gql from 'graphql-tag'
 import { getNeode, getDriver } from '../../db/neo4j'
 import CONSTANTS_REGISTRATION from './../../constants/registration'
 import createPasswordReset from './helpers/createPasswordReset'
diff --git a/backend/src/schema/resolvers/posts.spec.js b/backend/src/schema/resolvers/posts.spec.js
index 7a0dc0176..9335c1313 100644
--- a/backend/src/schema/resolvers/posts.spec.js
+++ b/backend/src/schema/resolvers/posts.spec.js
@@ -1,6 +1,6 @@
 import { createTestClient } from 'apollo-server-testing'
 import Factory, { cleanDatabase } from '../../db/factories'
-import { gql } from '../../helpers/jest'
+import gql from 'graphql-tag'
 import { getNeode, getDriver } from '../../db/neo4j'
 import createServer from '../../server'
 
diff --git a/backend/src/schema/resolvers/registration.spec.js b/backend/src/schema/resolvers/registration.spec.js
index ae6bcb7d7..bfc6a5fa6 100644
--- a/backend/src/schema/resolvers/registration.spec.js
+++ b/backend/src/schema/resolvers/registration.spec.js
@@ -1,5 +1,5 @@
 import Factory, { cleanDatabase } from '../../db/factories'
-import { gql } from '../../helpers/jest'
+import gql from 'graphql-tag'
 import { getDriver, getNeode } from '../../db/neo4j'
 import createServer from '../../server'
 import { createTestClient } from 'apollo-server-testing'
diff --git a/backend/src/schema/resolvers/reports.spec.js b/backend/src/schema/resolvers/reports.spec.js
index 449bdb3a7..96ef07d03 100644
--- a/backend/src/schema/resolvers/reports.spec.js
+++ b/backend/src/schema/resolvers/reports.spec.js
@@ -1,7 +1,7 @@
 import { createTestClient } from 'apollo-server-testing'
 import createServer from '../.././server'
 import Factory, { cleanDatabase } from '../../db/factories'
-import { gql } from '../../helpers/jest'
+import gql from 'graphql-tag'
 import { getDriver, getNeode } from '../../db/neo4j'
 
 const instance = getNeode()
diff --git a/backend/src/schema/resolvers/rewards.spec.js b/backend/src/schema/resolvers/rewards.spec.js
index 108973c9c..06fe87ec0 100644
--- a/backend/src/schema/resolvers/rewards.spec.js
+++ b/backend/src/schema/resolvers/rewards.spec.js
@@ -1,6 +1,6 @@
 import { createTestClient } from 'apollo-server-testing'
 import Factory, { cleanDatabase } from '../../db/factories'
-import { gql } from '../../helpers/jest'
+import gql from 'graphql-tag'
 import { getNeode, getDriver } from '../../db/neo4j'
 import createServer from '../../server'
 
diff --git a/backend/src/schema/resolvers/searches.spec.js b/backend/src/schema/resolvers/searches.spec.js
index 7c1a5a254..f889c2ac8 100644
--- a/backend/src/schema/resolvers/searches.spec.js
+++ b/backend/src/schema/resolvers/searches.spec.js
@@ -1,5 +1,5 @@
 import Factory, { cleanDatabase } from '../../db/factories'
-import { gql } from '../../helpers/jest'
+import gql from 'graphql-tag'
 import { getNeode, getDriver } from '../../db/neo4j'
 import createServer from '../../server'
 import { createTestClient } from 'apollo-server-testing'
diff --git a/backend/src/schema/resolvers/shout.spec.js b/backend/src/schema/resolvers/shout.spec.js
index f774d7d0b..294a28a76 100644
--- a/backend/src/schema/resolvers/shout.spec.js
+++ b/backend/src/schema/resolvers/shout.spec.js
@@ -1,6 +1,6 @@
 import { createTestClient } from 'apollo-server-testing'
 import Factory, { cleanDatabase } from '../../db/factories'
-import { gql } from '../../helpers/jest'
+import gql from 'graphql-tag'
 import { getNeode, getDriver } from '../../db/neo4j'
 import createServer from '../../server'
 
diff --git a/backend/src/schema/resolvers/socialMedia.spec.js b/backend/src/schema/resolvers/socialMedia.spec.js
index dafbed6d6..8265e8376 100644
--- a/backend/src/schema/resolvers/socialMedia.spec.js
+++ b/backend/src/schema/resolvers/socialMedia.spec.js
@@ -1,7 +1,7 @@
 import { createTestClient } from 'apollo-server-testing'
 import createServer from '../../server'
 import Factory, { cleanDatabase } from '../../db/factories'
-import { gql } from '../../helpers/jest'
+import gql from 'graphql-tag'
 import { getDriver } from '../../db/neo4j'
 
 const driver = getDriver()
diff --git a/backend/src/schema/resolvers/statistics.spec.js b/backend/src/schema/resolvers/statistics.spec.js
index 46330ef9a..15aa2d449 100644
--- a/backend/src/schema/resolvers/statistics.spec.js
+++ b/backend/src/schema/resolvers/statistics.spec.js
@@ -1,6 +1,6 @@
 import { createTestClient } from 'apollo-server-testing'
 import Factory, { cleanDatabase } from '../../db/factories'
-import { gql } from '../../helpers/jest'
+import gql from 'graphql-tag'
 import { getNeode, getDriver } from '../../db/neo4j'
 import createServer from '../../server'
 
diff --git a/backend/src/schema/resolvers/userData.spec.js b/backend/src/schema/resolvers/userData.spec.js
index ee4901f0a..3c521a4f1 100644
--- a/backend/src/schema/resolvers/userData.spec.js
+++ b/backend/src/schema/resolvers/userData.spec.js
@@ -1,5 +1,5 @@
 import Factory, { cleanDatabase } from '../../db/factories'
-import { gql } from '../../helpers/jest'
+import gql from 'graphql-tag'
 import { getNeode, getDriver } from '../../db/neo4j'
 import createServer from '../../server'
 import { createTestClient } from 'apollo-server-testing'
diff --git a/backend/src/schema/resolvers/user_management.spec.js b/backend/src/schema/resolvers/user_management.spec.js
index a249d7500..546c7a748 100644
--- a/backend/src/schema/resolvers/user_management.spec.js
+++ b/backend/src/schema/resolvers/user_management.spec.js
@@ -1,7 +1,7 @@
 import jwt from 'jsonwebtoken'
 import CONFIG from './../../config'
 import Factory, { cleanDatabase } from '../../db/factories'
-import { gql } from '../../helpers/jest'
+import gql from 'graphql-tag'
 import { loginMutation } from '../../graphql/userManagement'
 import { createTestClient } from 'apollo-server-testing'
 import createServer, { context } from '../../server'
diff --git a/backend/src/schema/resolvers/users.spec.js b/backend/src/schema/resolvers/users.spec.js
index 9b7699dc1..f256c6363 100644
--- a/backend/src/schema/resolvers/users.spec.js
+++ b/backend/src/schema/resolvers/users.spec.js
@@ -1,5 +1,5 @@
 import Factory, { cleanDatabase } from '../../db/factories'
-import { gql } from '../../helpers/jest'
+import gql from 'graphql-tag'
 import { getNeode, getDriver } from '../../db/neo4j'
 import createServer from '../../server'
 import { createTestClient } from 'apollo-server-testing'
diff --git a/backend/src/schema/resolvers/users/location.spec.js b/backend/src/schema/resolvers/users/location.spec.js
index 73938c41a..7097002da 100644
--- a/backend/src/schema/resolvers/users/location.spec.js
+++ b/backend/src/schema/resolvers/users/location.spec.js
@@ -1,4 +1,4 @@
-import { gql } from '../../../helpers/jest'
+import gql from 'graphql-tag'
 import Factory, { cleanDatabase } from '../../../db/factories'
 import { getNeode, getDriver } from '../../../db/neo4j'
 import { createTestClient } from 'apollo-server-testing'
diff --git a/backend/src/schema/resolvers/users/mutedUsers.spec.js b/backend/src/schema/resolvers/users/mutedUsers.spec.js
index 5c1a7dd5d..20e37f627 100644
--- a/backend/src/schema/resolvers/users/mutedUsers.spec.js
+++ b/backend/src/schema/resolvers/users/mutedUsers.spec.js
@@ -1,7 +1,7 @@
 import { createTestClient } from 'apollo-server-testing'
 import createServer from '../../../server'
 import { cleanDatabase } from '../../../db/factories'
-import { gql } from '../../../helpers/jest'
+import gql from 'graphql-tag'
 import { getNeode, getDriver } from '../../../db/neo4j'
 
 const driver = getDriver()
diff --git a/backend/src/schema/resolvers/viewedTeaserCount.spec.js b/backend/src/schema/resolvers/viewedTeaserCount.spec.js
index d7437646b..ee90d1a08 100644
--- a/backend/src/schema/resolvers/viewedTeaserCount.spec.js
+++ b/backend/src/schema/resolvers/viewedTeaserCount.spec.js
@@ -1,6 +1,6 @@
 import { createTestClient } from 'apollo-server-testing'
 import Factory, { cleanDatabase } from '../../db/factories'
-import { gql } from '../../helpers/jest'
+import gql from 'graphql-tag'
 import { getNeode, getDriver } from '../../db/neo4j'
 import createServer from '../../server'
 

From 71820a94f5c6aa8d7961bff92358171571265dcd Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Tue, 28 Feb 2023 13:14:18 +0100
Subject: [PATCH 2/7] Change gql tag in cypress.

---
 .../somebody_reported_the_following_posts.js                    | 2 +-
 cypress/support/commands.js                                     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cypress/integration/Moderation.ReportContent/somebody_reported_the_following_posts.js b/cypress/integration/Moderation.ReportContent/somebody_reported_the_following_posts.js
index ce876a081..e10c0675f 100644
--- a/cypress/integration/Moderation.ReportContent/somebody_reported_the_following_posts.js
+++ b/cypress/integration/Moderation.ReportContent/somebody_reported_the_following_posts.js
@@ -1,5 +1,5 @@
 import { Given } from "cypress-cucumber-preprocessor/steps";
-import { gql } from '../../../backend/src/helpers/jest'
+import gql from 'graphql-tag'
 
 Given('somebody reported the following posts:', table => {
   table.hashes().forEach(({ submitterEmail, resourceId, reasonCategory, reasonDescription }) => {
diff --git a/cypress/support/commands.js b/cypress/support/commands.js
index 335e00390..de09834e5 100644
--- a/cypress/support/commands.js
+++ b/cypress/support/commands.js
@@ -15,7 +15,7 @@
 /* globals Cypress cy */
 import "cypress-file-upload";
 import { GraphQLClient, request } from 'graphql-request'
-import { gql } from '../../backend/src/helpers/jest'
+import gql from 'graphql-tag'
 import config from '../../backend/src/config'
 
 const authenticatedHeaders = (variables) => {

From 738d69d3e7a50e68458be4ffc48f3e73f9dbe146 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Wed, 1 Mar 2023 09:07:44 +0100
Subject: [PATCH 3/7] Add graphql-tag to package.

---
 package.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index ba1e67eec..4b9fc523e 100644
--- a/package.json
+++ b/package.json
@@ -51,5 +51,7 @@
     "set-value": "^2.0.1",
     "nan": "2.17.0"
   },
-  "dependencies": {}
+  "dependencies": {
+    "graphql-tag": "^2.12.6"
+  }
 }

From d76e7e485e440f4a562cd079473a340e2662fd47 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Wed, 1 Mar 2023 10:42:55 +0100
Subject: [PATCH 4/7] Add some graphql and graphql-tag libraries.

---
 package.json |  1 +
 yarn.lock    | 17 +++++++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/package.json b/package.json
index 4b9fc523e..fad9e207d 100644
--- a/package.json
+++ b/package.json
@@ -52,6 +52,7 @@
     "nan": "2.17.0"
   },
   "dependencies": {
+    "graphql": "^16.6.0",
     "graphql-tag": "^2.12.6"
   }
 }
diff --git a/yarn.lock b/yarn.lock
index 0a91bc1d6..1d7578a48 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3317,6 +3317,18 @@ graphql-request@^2.0.0:
   resolved "https://registry.yarnpkg.com/graphql-request/-/graphql-request-2.0.0.tgz#8dd12cf1eb2ce0c80f4114fd851741e091134862"
   integrity sha512-Ww3Ax+G3l2d+mPT8w7HC9LfrKjutnCKtnDq7ZZp2ghVk5IQDjwAk3/arRF1ix17Ky15rm0hrSKVKxRhIVlSuoQ==
 
+graphql-tag@^2.12.6:
+  version "2.12.6"
+  resolved "https://registry.yarnpkg.com/graphql-tag/-/graphql-tag-2.12.6.tgz#d441a569c1d2537ef10ca3d1633b48725329b5f1"
+  integrity sha512-FdSNcu2QQcWnM2VNvSCCDCVS5PpPqpzgFT8+GXzqJuoDd0CBncxCY278u4mhRO7tMgo2JjgJA5aZ+nWSQ/Z+xg==
+  dependencies:
+    tslib "^2.1.0"
+
+graphql@^16.6.0:
+  version "16.6.0"
+  resolved "https://registry.yarnpkg.com/graphql/-/graphql-16.6.0.tgz#c2dcffa4649db149f6282af726c8c83f1c7c5fdb"
+  integrity sha512-KPIBPDlW7NxrbT/eh4qPXz5FiFdL5UbaA0XUNz2Rp3Z3hqBSkbj0GVjwFDztsWVauZUWsbKHgMg++sk8UX0bkw==
+
 handlebars@^4.7.3:
   version "4.7.3"
   resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.3.tgz#8ece2797826886cf8082d1726ff21d2a022550ee"
@@ -5925,6 +5937,11 @@ tslib@^1.9.0:
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.10.0.tgz#c3c19f95973fb0a62973fb09d90d961ee43e5c8a"
   integrity sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==
 
+tslib@^2.1.0:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.5.0.tgz#42bfed86f5787aeb41d031866c8f402429e0fddf"
+  integrity sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg==
+
 tty-browserify@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.1.tgz#3f05251ee17904dfd0677546670db9651682b811"

From e0064e7cf0337a669c465403bbd3ea5aec6c9a55 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Thu, 2 Mar 2023 10:57:18 +0100
Subject: [PATCH 5/7] Update browserlist.

---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 1d7578a48..149f583f9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1969,9 +1969,9 @@ cachedir@^2.3.0:
   integrity sha512-A+Fezp4zxnit6FanDmv9EqXNAi3vt9DWp51/71UEhXukb7QUuvtv9344h91dyAxuTLoSYJFU299qzR3tzwPAhw==
 
 caniuse-lite@^1.0.30001157:
-  version "1.0.30001159"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001159.tgz#bebde28f893fa9594dadcaa7d6b8e2aa0299df20"
-  integrity sha512-w9Ph56jOsS8RL20K9cLND3u/+5WASWdhC/PPrf+V3/HsM3uHOavWOR1Xzakbv4Puo/srmPHudkmCRWM7Aq+/UA==
+  version "1.0.30001458"
+  resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001458.tgz"
+  integrity sha512-lQ1VlUUq5q9ro9X+5gOEyH7i3vm+AYVT1WDCVB69XOZ17KZRhnZ9J0Sqz7wTHQaLBJccNCHq8/Ww5LlOIZbB0w==
 
 caseless@~0.12.0:
   version "0.12.0"

From a09960aa541842f125af33fbed81c769e3eb564f Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Fri, 3 Mar 2023 20:40:16 +0100
Subject: [PATCH 6/7] Remove gql tag of cypress code.

---
 .../somebody_reported_the_following_posts.js                   | 3 +--
 cypress/support/commands.js                                    | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/cypress/integration/Moderation.ReportContent/somebody_reported_the_following_posts.js b/cypress/integration/Moderation.ReportContent/somebody_reported_the_following_posts.js
index e10c0675f..3ca39e6e6 100644
--- a/cypress/integration/Moderation.ReportContent/somebody_reported_the_following_posts.js
+++ b/cypress/integration/Moderation.ReportContent/somebody_reported_the_following_posts.js
@@ -1,5 +1,4 @@
 import { Given } from "cypress-cucumber-preprocessor/steps";
-import gql from 'graphql-tag'
 
 Given('somebody reported the following posts:', table => {
   table.hashes().forEach(({ submitterEmail, resourceId, reasonCategory, reasonDescription }) => {
@@ -10,7 +9,7 @@ Given('somebody reported the following posts:', table => {
     cy.factory()
       .build('user', {}, submitter)
       .authenticateAs(submitter)
-      .mutate(gql`mutation($resourceId: ID!, $reasonCategory: ReasonCategory!, $reasonDescription: String!) {
+      .mutate(`mutation($resourceId: ID!, $reasonCategory: ReasonCategory!, $reasonDescription: String!) {
         fileReport(resourceId: $resourceId, reasonCategory: $reasonCategory, reasonDescription: $reasonDescription) {
           reportId
         }
diff --git a/cypress/support/commands.js b/cypress/support/commands.js
index de09834e5..7d3738a3d 100644
--- a/cypress/support/commands.js
+++ b/cypress/support/commands.js
@@ -15,11 +15,10 @@
 /* globals Cypress cy */
 import "cypress-file-upload";
 import { GraphQLClient, request } from 'graphql-request'
-import gql from 'graphql-tag'
 import config from '../../backend/src/config'
 
 const authenticatedHeaders = (variables) => {
-  const mutation = gql`
+  const mutation = `
     mutation($email: String!, $password: String!) {
       login(email: $email, password: $password)
     }

From a724fec8812c374a0c6f91d6c47fc55ac23ef832 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Fri, 3 Mar 2023 21:28:49 +0100
Subject: [PATCH 7/7] Remove unused graphql packages from cypress modul.

---
 package.json |  5 +----
 yarn.lock    | 17 -----------------
 2 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/package.json b/package.json
index fad9e207d..ba1e67eec 100644
--- a/package.json
+++ b/package.json
@@ -51,8 +51,5 @@
     "set-value": "^2.0.1",
     "nan": "2.17.0"
   },
-  "dependencies": {
-    "graphql": "^16.6.0",
-    "graphql-tag": "^2.12.6"
-  }
+  "dependencies": {}
 }
diff --git a/yarn.lock b/yarn.lock
index 149f583f9..51e44fa78 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3317,18 +3317,6 @@ graphql-request@^2.0.0:
   resolved "https://registry.yarnpkg.com/graphql-request/-/graphql-request-2.0.0.tgz#8dd12cf1eb2ce0c80f4114fd851741e091134862"
   integrity sha512-Ww3Ax+G3l2d+mPT8w7HC9LfrKjutnCKtnDq7ZZp2ghVk5IQDjwAk3/arRF1ix17Ky15rm0hrSKVKxRhIVlSuoQ==
 
-graphql-tag@^2.12.6:
-  version "2.12.6"
-  resolved "https://registry.yarnpkg.com/graphql-tag/-/graphql-tag-2.12.6.tgz#d441a569c1d2537ef10ca3d1633b48725329b5f1"
-  integrity sha512-FdSNcu2QQcWnM2VNvSCCDCVS5PpPqpzgFT8+GXzqJuoDd0CBncxCY278u4mhRO7tMgo2JjgJA5aZ+nWSQ/Z+xg==
-  dependencies:
-    tslib "^2.1.0"
-
-graphql@^16.6.0:
-  version "16.6.0"
-  resolved "https://registry.yarnpkg.com/graphql/-/graphql-16.6.0.tgz#c2dcffa4649db149f6282af726c8c83f1c7c5fdb"
-  integrity sha512-KPIBPDlW7NxrbT/eh4qPXz5FiFdL5UbaA0XUNz2Rp3Z3hqBSkbj0GVjwFDztsWVauZUWsbKHgMg++sk8UX0bkw==
-
 handlebars@^4.7.3:
   version "4.7.3"
   resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.3.tgz#8ece2797826886cf8082d1726ff21d2a022550ee"
@@ -5937,11 +5925,6 @@ tslib@^1.9.0:
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.10.0.tgz#c3c19f95973fb0a62973fb09d90d961ee43e5c8a"
   integrity sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==
 
-tslib@^2.1.0:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.5.0.tgz#42bfed86f5787aeb41d031866c8f402429e0fddf"
-  integrity sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg==
-
 tty-browserify@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.1.tgz#3f05251ee17904dfd0677546670db9651682b811"