Tell github-linguists to ignore snapshots

.gitattributes

@@ -0,0 +1,2 @@
+backend/snapshots/* linguist-generated=true
+

backend/src/helpers/jest.js

@@ -0,0 +1,5 @@
+//* 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('')
+}

backend/src/middleware/hashtags/hashtagsMiddleware.spec.js

@@ -1,4 +1,4 @@
-import { gql } from '../../jest/helpers'
+import { gql } from '../../helpers/jest'
 import Factory from '../../seed/factories'
 import { createTestClient } from 'apollo-server-testing'
 import { neode, getDriver } from '../../bootstrap/neo4j'

backend/src/middleware/notifications/notificationsMiddleware.spec.js

@@ -1,4 +1,4 @@
-import { gql } from '../../jest/helpers'
+import { gql } from '../../helpers/jest'
 import Factory from '../../seed/factories'
 import { createTestClient } from 'apollo-server-testing'
 import { neode, getDriver } from '../../bootstrap/neo4j'

backend/src/middleware/orderByMiddleware.spec.js

@@ -1,5 +1,5 @@
+import { gql } from '../helpers/jest'
 import Factory from '../seed/factories'
-import { gql } from '../jest/helpers'
 import { neode as getNeode, getDriver } from '../bootstrap/neo4j'
 import { createTestClient } from 'apollo-server-testing'
 import createServer from '../server'

backend/src/middleware/permissionsMiddleware.spec.js

@@ -1,7 +1,7 @@
 import { createTestClient } from 'apollo-server-testing'
 import createServer from '../server'
 import Factory from '../seed/factories'
-import { gql } from '../jest/helpers'
+import { gql } from '../helpers/jest'
 import { getDriver, neode as getNeode } from '../bootstrap/neo4j'
 
 const factory = Factory()

backend/src/middleware/slugifyMiddleware.spec.js

@@ -1,5 +1,5 @@
 import Factory from '../seed/factories'
-import { gql } from '../jest/helpers'
+import { gql } from '../helpers/jest'
 import { neode as getNeode, getDriver } from '../bootstrap/neo4j'
 import createServer from '../server'
 import { createTestClient } from 'apollo-server-testing'

backend/src/middleware/softDelete/softDeleteMiddleware.spec.js

@@ -1,5 +1,5 @@
 import Factory from '../../seed/factories'
-import { gql } from '../../jest/helpers'
+import { gql } from '../../helpers/jest'
 import { neode as getNeode, getDriver } from '../../bootstrap/neo4j'
 import createServer from '../../server'
 import { createTestClient } from 'apollo-server-testing'

backend/src/schema/resolvers/comments.spec.js

@@ -1,5 +1,5 @@
 import Factory from '../../seed/factories'
-import { gql } from '../../jest/helpers'
+import { gql } from '../../helpers/jest'
 import { createTestClient } from 'apollo-server-testing'
 import createServer from '../../server'
 import { neode as getNeode, getDriver } from '../../bootstrap/neo4j'

backend/src/schema/resolvers/donations.spec.js

@@ -1,6 +1,6 @@
 import { createTestClient } from 'apollo-server-testing'
 import Factory from '../../seed/factories'
-import { gql } from '../../jest/helpers'
+import { gql } from '../../helpers/jest'
 import { neode as getNeode, getDriver } from '../../bootstrap/neo4j'
 import createServer from '../../server'
 

backend/src/schema/resolvers/emails.spec.js

@@ -1,5 +1,5 @@
 import Factory from '../../seed/factories'
-import { gql } from '../../jest/helpers'
+import { gql } from '../../helpers/jest'
 import { getDriver, neode as getNeode } from '../../bootstrap/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 '../../jest/helpers'
+import { gql } from '../../helpers/jest'
 
 jest.mock('node-fetch')
 const { Response } = jest.requireActual('node-fetch')
@@ -15,15 +15,15 @@ afterEach(() => {
 let variables = {}
 
 const HumanConnectionOrg = fs.readFileSync(
-  path.join(__dirname, '../../jest/snapshots/embeds/HumanConnectionOrg.html'),
+  path.join(__dirname, '../../../snapshots/embeds/HumanConnectionOrg.html'),
   'utf8',
 )
 const pr960 = fs.readFileSync(
-  path.join(__dirname, '../../jest/snapshots/embeds/pr960.html'),
+  path.join(__dirname, '../../../snapshots/embeds/pr960.html'),
   'utf8',
 )
 const babyLovesCat = fs.readFileSync(
-  path.join(__dirname, '../../jest/snapshots/embeds/babyLovesCat.html'),
+  path.join(__dirname, '../../../snapshots/embeds/babyLovesCat.html'),
   'utf8',
 )
 
@@ -88,7 +88,7 @@ describe('Query', () => {
       })
 
       it('shows some default data', async () => {
-        const expected = expect.objectContaining({
+        await expect(embedAction(variables)).resolves.toMatchObject({
           data: {
             embed: {
               audio: null,
@@ -106,8 +106,9 @@ describe('Query', () => {
               video: null,
             },
           },
-        })
+          errors: undefined
-        await expect(embedAction(variables)).resolves.toEqual(expected)
+        }
+        )
       })
     })
 

backend/src/schema/resolvers/follow.spec.js

@@ -2,7 +2,7 @@ import { createTestClient } from 'apollo-server-testing'
 import Factory from '../../seed/factories'
 import { getDriver, neode as getNeode } from '../../bootstrap/neo4j'
 import createServer from '../../server'
-import { gql } from '../../jest/helpers'
+import { gql } from '../../helpers/jest'
 
 const factory = Factory()
 const driver = getDriver()

backend/src/schema/resolvers/locations.spec.js

@@ -1,5 +1,5 @@
 import Factory from '../../seed/factories'
-import { gql } from '../../jest/helpers'
+import { gql } from '../../helpers/jest'
 import { neode as getNeode, getDriver } from '../../bootstrap/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 from '../../seed/factories'
-import { gql } from '../../jest/helpers'
+import { gql } from '../../helpers/jest'
 import { neode as getNeode, getDriver } from '../../bootstrap/neo4j'
 import createServer from '../../server'
 

backend/src/schema/resolvers/notifications.spec.js

@@ -1,5 +1,5 @@
 import Factory from '../../seed/factories'
-import { gql } from '../../jest/helpers'
+import { gql } from '../../helpers/jest'
 import { getDriver } from '../../bootstrap/neo4j'
 import { createTestClient } from 'apollo-server-testing'
 import createServer from '../.././server'

backend/src/schema/resolvers/passwordReset.spec.js

@@ -1,5 +1,5 @@
 import Factory from '../../seed/factories'
-import { gql } from '../../jest/helpers'
+import { gql } from '../../helpers/jest'
 import { neode as getNeode, getDriver } from '../../bootstrap/neo4j'
 import createPasswordReset from './helpers/createPasswordReset'
 import createServer from '../../server'

backend/src/schema/resolvers/posts.spec.js

@@ -1,6 +1,6 @@
 import { createTestClient } from 'apollo-server-testing'
 import Factory from '../../seed/factories'
-import { gql } from '../../jest/helpers'
+import { gql } from '../../helpers/jest'
 import { neode as getNeode, getDriver } from '../../bootstrap/neo4j'
 import createServer from '../../server'
 

backend/src/schema/resolvers/registration.spec.js

@@ -1,5 +1,5 @@
 import Factory from '../../seed/factories'
-import { gql } from '../../jest/helpers'
+import { gql } from '../../helpers/jest'
 import { getDriver, neode as getNeode } from '../../bootstrap/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 from '../../seed/factories'
-import { gql } from '../../jest/helpers'
+import { gql } from '../../helpers/jest'
 import { getDriver, neode as getNeode } from '../../bootstrap/neo4j'
 
 const factory = Factory()

backend/src/schema/resolvers/rewards.spec.js

@@ -1,6 +1,6 @@
 import { createTestClient } from 'apollo-server-testing'
 import Factory from '../../seed/factories'
-import { gql } from '../../jest/helpers'
+import { gql } from '../../helpers/jest'
 import { neode as getNeode, getDriver } from '../../bootstrap/neo4j'
 import createServer from '../../server'
 

backend/src/schema/resolvers/shout.spec.js

@@ -1,6 +1,6 @@
 import { createTestClient } from 'apollo-server-testing'
 import Factory from '../../seed/factories'
-import { gql } from '../../jest/helpers'
+import { gql } from '../../helpers/jest'
 import { neode as getNeode, getDriver } from '../../bootstrap/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 from '../../seed/factories'
-import { gql } from '../../jest/helpers'
+import { gql } from '../../helpers/jest'
 import { neode, getDriver } from '../../bootstrap/neo4j'
 
 const driver = getDriver()

backend/src/schema/resolvers/user_management.spec.js

@@ -1,7 +1,7 @@
 import jwt from 'jsonwebtoken'
 import CONFIG from './../../config'
 import Factory from '../../seed/factories'
-import { gql } from '../../jest/helpers'
+import { gql } from '../../helpers/jest'
 import { createTestClient } from 'apollo-server-testing'
 import createServer, { context } from '../../server'
 import encode from '../../jwt/encode'

backend/src/schema/resolvers/users.spec.js

@@ -1,5 +1,5 @@
 import Factory from '../../seed/factories'
-import { gql } from '../../jest/helpers'
+import { gql } from '../../helpers/jest'
 import { neode as getNeode, getDriver } from '../../bootstrap/neo4j'
 import createServer from '../../server'
 import { createTestClient } from 'apollo-server-testing'

backend/src/schema/resolvers/users/blockedUsers.spec.js

@@ -1,7 +1,7 @@
 import { createTestClient } from 'apollo-server-testing'
 import createServer from '../../../server'
 import Factory from '../../../seed/factories'
-import { gql } from '../../../jest/helpers'
+import { gql } from '../../../helpers/jest'
 import { neode, getDriver } from '../../../bootstrap/neo4j'
 
 const driver = getDriver()

backend/src/seed/seed-db.js

@@ -4,7 +4,7 @@ import { createTestClient } from 'apollo-server-testing'
 import createServer from '../server'
 import Factory from './factories'
 import { neode as getNeode, getDriver } from '../bootstrap/neo4j'
-import { gql } from '../jest/helpers'
+import { gql } from '../helpers/jest'
 
 const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
 

backend/test/features/support/steps.js

@@ -4,7 +4,6 @@ import { expect } from 'chai'
 // import { client } from '../../../src/activitypub/apollo-client'
 import { GraphQLClient } from 'graphql-request'
 import Factory from '../../../src/seed/factories'
-import { host } from '../../../src/jest/helpers'
 const debug = require('debug')('ea:test:steps')
 
 const factory = Factory()

cypress/support/commands.js

@@ -17,7 +17,7 @@ import "cypress-file-upload";
 import helpers from "./helpers";
 import users from "../fixtures/users.json";
 import { GraphQLClient, request } from 'graphql-request'
-import { gql } from '../../backend/src/jest/helpers'
+import { gql } from '../../backend/src/helpers/jest'
 
 const backendHost = Cypress.env('BACKEND_HOST')
 const switchLang = name => {