Withdrew helper/jest.js and replace it with graphql-tag

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/

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'

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'

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'

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'

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'
 

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'

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'

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'

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'

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'
 

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'

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')

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()

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'

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'

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'
 

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'

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'

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'
 

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'

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()

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'
 

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'

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'
 

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()

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'
 

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'

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'

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'

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'

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()

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'