From 978347ba7b5a6aa1bc915ada972ffffa2816d37c Mon Sep 17 00:00:00 2001 From: roschaefer Date: Sat, 16 Nov 2019 19:34:10 +0100 Subject: [PATCH] Tell github-linguists to ignore snapshots --- .gitattributes | 2 + .../snapshots/embeds/HumanConnectionOrg.html | 2667 +++++++++++++++++ backend/snapshots/embeds/babyLovesCat.html | 1783 +++++++++++ .../jest => }/snapshots/embeds/pr960.html | 0 backend/src/helpers/jest.js | 5 + .../snapshots/embeds/HumanConnectionOrg.html | 38 - .../jest/snapshots/embeds/babyLovesCat.html | 1545 ---------- .../hashtags/hashtagsMiddleware.spec.js | 2 +- .../notificationsMiddleware.spec.js | 2 +- .../src/middleware/orderByMiddleware.spec.js | 2 +- .../middleware/permissionsMiddleware.spec.js | 2 +- .../src/middleware/slugifyMiddleware.spec.js | 2 +- .../softDelete/softDeleteMiddleware.spec.js | 2 +- backend/src/schema/resolvers/comments.spec.js | 2 +- .../src/schema/resolvers/donations.spec.js | 2 +- backend/src/schema/resolvers/emails.spec.js | 2 +- backend/src/schema/resolvers/embeds.spec.js | 15 +- backend/src/schema/resolvers/follow.spec.js | 2 +- .../src/schema/resolvers/locations.spec.js | 2 +- .../src/schema/resolvers/moderation.spec.js | 2 +- .../schema/resolvers/notifications.spec.js | 2 +- .../schema/resolvers/passwordReset.spec.js | 2 +- backend/src/schema/resolvers/posts.spec.js | 2 +- .../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/shout.spec.js | 2 +- .../src/schema/resolvers/socialMedia.spec.js | 2 +- .../schema/resolvers/user_management.spec.js | 2 +- backend/src/schema/resolvers/users.spec.js | 2 +- .../resolvers/users/blockedUsers.spec.js | 2 +- backend/src/seed/seed-db.js | 2 +- backend/test/features/support/steps.js | 1 - cypress/support/commands.js | 2 +- 34 files changed, 4490 insertions(+), 1616 deletions(-) create mode 100644 .gitattributes create mode 100644 backend/snapshots/embeds/HumanConnectionOrg.html create mode 100644 backend/snapshots/embeds/babyLovesCat.html rename backend/{src/jest => }/snapshots/embeds/pr960.html (100%) create mode 100644 backend/src/helpers/jest.js delete mode 100644 backend/src/jest/snapshots/embeds/HumanConnectionOrg.html delete mode 100644 backend/src/jest/snapshots/embeds/babyLovesCat.html diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 000000000..99fb0ab34 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,2 @@ +backend/snapshots/* linguist-generated=true + diff --git a/backend/snapshots/embeds/HumanConnectionOrg.html b/backend/snapshots/embeds/HumanConnectionOrg.html new file mode 100644 index 000000000..67a7844d2 --- /dev/null +++ b/backend/snapshots/embeds/HumanConnectionOrg.html @@ -0,0 +1,2667 @@ + + + + + + + +Human Connection - Startseite | +Facebook + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+
+
+
Gehe +zu:
+ +
+
+
+
+
+
+
+
+ + +
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Mehr von Human Connection auf Facebook +anzeigen
+ +
+
+
+
+
+
Mehr von Human Connection auf Facebook +anzeigen
+
+
+ +
+
+
+
+
+
+ + +
+
+
+
+
oder
+
+Neues Konto erstellen + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Willkommen bei Human Connection
+
+
Human Connection +ist ein gemeinnütziges soziales Wissens- und Aktionsnetzwerk mit +Sitz in Weilheim-T...
+
+Mehr anzeigen
+
+
+
CommunityAlle +ansehen +
+
+
+
+
+"Highlights
+
+
24.407 Personen gefällt das
+
+
+
+
+
+
+"Highlights
+
+
25.652 Personen haben das abonniert
+
+
+
+
+
+
+"Highlights
+
+
72 Besuche
+
+
+
+
+
+
InfoAlle ansehen +
+
+
+ +
+
+
+
+"Highlights
+
+
Bahnhofstraße 11 (512,71 km)
+73235 Weilheim an der Teck
+ +
+
+
+
+
+
+"Highlights
+
+
01514 3804222
+
+
+
+ +
+ +
+
+
+ +
+
+
+
+
+"Highlights
+
+
Preisklasse €
+
+
+
+
+ +
+
+
+
SeitentransparenzMehr +anzeigen +
+
+
Facebook liefert +Informationen, mit denen du die Intention von Seiten besser +verstehst. Hier erfährst du mehr zu den Personen, die die Seiten +verwalten und Beiträge darin posten.
+
+
+Seite erstellt – 21. Oktober 2015
+
+
+
+
+
+
+
+
+
+
+
+
+
Personen
+
+ +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Ähnliche +Seiten
+
+ +
+
+
+
+
+
+
+
+ +
Seiten, die +dieser Seite gefallen
+
+ +
+
+
+
+
+
+
+
+
+
+
+
+
Orte +Weilheim an der Teck +Human Connection
+
+
+
+ +
+
+
+
+
+
+
+
+
+
+
+
Beiträge +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+
+
+
+

Human Connection soll mehr als nur ein einfacher Facebookersatz +werden – nämlich vor allem lösungsorientiert und zukunftsfähig. Wir +möchten mit unserem Netzwerk dazu beitragen, dass mehr Menschen +aktiv werden und selbst etwas verändern. Vor allem möchten wir, +dass sie nicht jede negative Neuigkeit in einem sozialen Netzwerk +“schlucken” müssen. Der Gedanke man könne doch eh nichts ändern, +stimmt nur dann, wenn andere Leser genauso denken. Gemeinsam ist so +viel mehr möglich und... +dafür braucht es zunächst erst +einmal jeden Einzelnen.

+
+

Wie kann Human Connection dabei helfen?

+

Das erfahrt ihr im ganzen Beitrag:
+https://human-connection.org/human-connection-loesungsorie…/

+
+Mehr anzeigen
+
+
+
+
+
+ +
+
+
+
+
+
+ +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+
+
+

Human Connection ist unser Herzensprojekt, welches allerdings +uns und auch euch sehr viel Geduld abfordert. Warum dauert das +eigentlich so lange?

+

Hier erfahrt ihr die Antwort:

+
+
+
+
+
+
+
+ +
+
+
+
+
human-connection.org
+
+
+
+
+ +
Human Connection ist +unser Herzensprojekt, welches allerdings uns und auch euch sehr +viel Geduld abfordert. Warum dauert das eigentlich so +lange?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+
+
+
+ +
+
+
Videos +
+
+
+
+
+
Schau es an und Du +weißt, was zu tun ist
+ +
+
+
+
+
+
+
+
+
+
+
+
10
+
+
+
+
2
+
+
+
+
+
+
+
+
+Messe Fair Handeln: Human Connection beim Hackathon (Stuttgart +26.-28.04.2019)
+ +
+
+
+
+
+
+
+
+
+
+
9
+
+
+
+
1
+
+
+
+
+
+
+
+
In +Nerds We Trust - Open Source - Wir lieben freie +Software!
+ +
+
+
+
+
+
+
+
+
+
+
4
+
+
+
+
1
+
+
+
+
+
+
+
+ +
+
+
+
Fotos +
+
+ +
+ +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + + + diff --git a/backend/snapshots/embeds/babyLovesCat.html b/backend/snapshots/embeds/babyLovesCat.html new file mode 100644 index 000000000..61db8cf72 --- /dev/null +++ b/backend/snapshots/embeds/babyLovesCat.html @@ -0,0 +1,1783 @@ + + + + + + + + + + + + + Baby Loves Cat - YouTube + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ +
+
+
+ + +
+
+
+
+
+ DE +
+
+ +
+
+ +
+
+
+
+
+
+
+
+ +
+
+
+
+
+
+
+
+

+ + + +Wird geladen... + +

+ +
+
+
+ +
+
+
+
+
+ +
+ +
+
+
+
+ + Du siehst YouTube auf Deutsch. Du kannst diese Einstellung unten ändern. +
+
+ + You're viewing YouTube in German. You can change this preference below. +
+
+
+
+ +
+
+
+ +
+ +
+
+ + +
+
+ + +
+
+
+
+ +
+
+
+
+ + +
+
+
+
+
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+
+

+ + + + + Baby Loves Cat + + +

+
+
+ + +
+
+ + + + + +
+ +
+
+
+
+
30.160.931 Aufrufe
+
+
+
+
+
+ + + + + +
+
+
+ + + +
+
+
+
+

+ + + +Wird geladen... + +

+ +
+
+
+ +
+ +
+
+
+

+ + + +Wird geladen... + +

+ +
+
+
+

+ Transkript +

+
+ +
+ + + +
+
+ Das interaktive Transkript konnte nicht geladen werden. +
+ + +
+
+ +
+ +
+
+

+ + + +Wird geladen... + +

+ +
+
+ + +
+
+ Die Bewertungsfunktion ist nach Ausleihen des Videos verfügbar. +
+ +
+ +
+
+ Diese Funktion ist gerade nicht verfügbar. Bitte versuche es später noch einmal. +
+
+ + +
+ + +
+ + +
+
+
+
+
Am 16.08.2015 veröffentlicht
+
+

She's incapable of controlling her limbs when her kitty is around. The obsession grows every day.

Ps. That's a sleep sack she's in. Not a starfish outfit. Although I wish I were cool enough to dress my daughter in a starfish outfit.

Jukin Media Verified (Original)
*For licensing / permission to use please contact licensing(at)jukinmediadotcom

+
+
+
    +
  • +

    + Kategorie +

    + +
  • + +
+
+
+
+
+ +
+ + +
+
+
+ + +
+ Kommentare sind für dieses Video deaktiviert. +
+ +
+ + + + +
+
+
+
+ +
+ + +
+
+
+ + + +
+
+ +
+ +
+
+
+ Anzeige +
+
+
+
+ + +
+
+
+
+
+ + + + Wenn Autoplay aktiviert ist, wird die Wiedergabe automatisch mit einem der aktuellen Videovorschläge fortgesetzt. + + + + +
+

+ Nächstes Video +

+ + +
+
+ + +
+
+
+ +
+
+ +
+
+ +
+
+
+ + +
+ +
+
+
+
+ + +
+
+ + +
+
+ + +
+
+ , um dieses Video zur Playlist "Später ansehen" hinzuzufügen. + +
+
+
+

+ Hinzufügen +

+
+
+

+ + + + Playlists werden geladen... + +

+ +
+
+
+ + + + + + + diff --git a/backend/src/jest/snapshots/embeds/pr960.html b/backend/snapshots/embeds/pr960.html similarity index 100% rename from backend/src/jest/snapshots/embeds/pr960.html rename to backend/snapshots/embeds/pr960.html diff --git a/backend/src/helpers/jest.js b/backend/src/helpers/jest.js new file mode 100644 index 000000000..201d68c14 --- /dev/null +++ b/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('') +} diff --git a/backend/src/jest/snapshots/embeds/HumanConnectionOrg.html b/backend/src/jest/snapshots/embeds/HumanConnectionOrg.html deleted file mode 100644 index ed3f96cda..000000000 --- a/backend/src/jest/snapshots/embeds/HumanConnectionOrg.html +++ /dev/null @@ -1,38 +0,0 @@ - - -Human Connection - Startseite | Facebook - - - - - - - - - - - - - - - - - - - - - - - -
Mehr von Human Connection auf Facebook anzeigen
Mehr von Human Connection auf Facebook anzeigen
oder
Neues Konto erstellen
Willkommen bei Human Connection
Human Connection ist ein gemeinnütziges soziales Wissens- und Aktionsnetzwerk mit Sitz in Weilheim-T...
Mehr anzeigen
CommunityAlle ansehen
Highlights info row image
24.407 Personen gefällt das
Highlights info row image
25.652 Personen haben das abonniert
Highlights info row image
72 Besuche
Highlights info row image
Bahnhofstraße 11 (512,71 km)
73235 Weilheim an der Teck
Highlights info row image
01514 3804222
Highlights info row image
Preisklasse €
SeitentransparenzMehr anzeigen
Facebook liefert Informationen, mit denen du die Intention von Seiten besser verstehst. Hier erfährst du mehr zu den Personen, die die Seiten verwalten und Beiträge darin posten.
Seite erstellt – 21. Oktober 2015
Ähnliche Seiten
OrteWeilheim an der TeckHuman Connection
Beiträge

Human Connection soll mehr als nur ein einfacher Facebookersatz werden – nämlich vor allem lösungsorientiert und zukunftsfähig. Wir möchten mit unserem Netzwerk dazu beitragen, dass mehr Menschen aktiv werden und selbst etwas verändern. Vor allem möchten wir, dass sie nicht jede negative Neuigkeit in einem sozialen Netzwerk “schlucken” müssen. Der Gedanke man könne doch eh nichts ändern, stimmt nur dann, wenn andere Leser genauso denken. Gemeinsam ist so viel mehr möglich und... dafür braucht es zunächst erst einmal jeden Einzelnen.

Wie kann Human Connection dabei helfen?

Das erfahrt ihr im ganzen Beitrag:
https://human-connection.org/human-connection-loesungsorie…/

Mehr anzeigen
Bild könnte enthalten: Text

Human Connection ist unser Herzensprojekt, welches allerdings uns und auch euch sehr viel Geduld abfordert. Warum dauert das eigentlich so lange?

Hier erfahrt ihr die Antwort:

human-connection.org
Human Connection ist unser Herzensprojekt, welches allerdings uns und auch euch sehr viel Geduld abfordert. Warum dauert das eigentlich so lange?
Videos
Schau es an und Du weißt, was zu tun ist
10
2
Messe Fair Handeln: Human Connection beim Hackathon (Stuttgart 26.-28.04.2019)
9
1
In Nerds We Trust - Open Source - Wir lieben freie Software!
4
1
- - - - \ No newline at end of file diff --git a/backend/src/jest/snapshots/embeds/babyLovesCat.html b/backend/src/jest/snapshots/embeds/babyLovesCat.html deleted file mode 100644 index 88ce2a327..000000000 --- a/backend/src/jest/snapshots/embeds/babyLovesCat.html +++ /dev/null @@ -1,1545 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - -Baby Loves Cat - YouTube - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
-
-
-
- DE -
-
-
- -
-
-
-

- - - -Wird geladen... - -

- -
-
-
- -
- -
-
-
- -Du siehst YouTube auf Deutsch. -Du kannst diese Einstellung unten ändern. -
-
- - You're viewing YouTube in German. - You can change this preference below. -
-
-
- -
-
- -
-
- - -
-
-
- -
-
-
-
- - -
-
-
-
-
-
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-
-

- - - - - Baby Loves Cat - - -

-
-
- - -
- - - - - -
-
30.160.931 Aufrufe
-
-
-
-
-
- - - - - -
-
- - - -
-
-
-
-

- - - -Wird geladen... - -

- -
-
-
- -
- -
-
-
-

- - - -Wird geladen... - -

- -
-
-
-

-Transkript -

-
- -
- - - -
-
-Das interaktive Transkript konnte nicht geladen werden. -
- - -
-
- -
- -
-
-

- - - -Wird geladen... - -

- -
-
- - -
-
- Die Bewertungsfunktion ist nach Ausleihen des Videos verfügbar. -
- -
- -
-
- Diese Funktion ist gerade nicht verfügbar. Bitte versuche es später noch einmal. -
-
- - -
- - -
- - -
Am 16.08.2015 veröffentlicht

She's incapable of controlling her limbs when her kitty is around. The obsession grows every day.

Ps. That's a sleep sack she's in. Not a starfish outfit. Although I wish I were cool enough to dress my daughter in a starfish outfit.

Jukin Media Verified (Original)
*For licensing / permission to use please contact licensing(at)jukinmediadotcom

-
    -
  • -

    - Kategorie -

    - -
  • - -
-
-
- -
- - -
-
-
- - -
- Kommentare sind für dieses Video deaktiviert. -
- -
- - - - -
-
-
-
- -
- - -
-
-
- - - -
-
- -
- -
-
-
-Anzeige -
-
-
-
- - -
-
-
-
-
- - - -Wenn Autoplay aktiviert ist, wird die Wiedergabe automatisch mit einem der aktuellen Videovorschläge fortgesetzt. - - - -
-

- Nächstes Video -

- - -
-
- - -
-
-
- -
-
- -
-
- -
-
-
- - -
- -
- -
-
- - -
-
- - -
- , um dieses Video zur Playlist "Später ansehen" hinzuzufügen. - -
-
-

-Hinzufügen -

-
-
-

- - - - Playlists werden geladen... - -

- -
-
- - - - - - - \ No newline at end of file diff --git a/backend/src/middleware/hashtags/hashtagsMiddleware.spec.js b/backend/src/middleware/hashtags/hashtagsMiddleware.spec.js index 89f1bdd86..6e97f34c4 100644 --- a/backend/src/middleware/hashtags/hashtagsMiddleware.spec.js +++ b/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' diff --git a/backend/src/middleware/notifications/notificationsMiddleware.spec.js b/backend/src/middleware/notifications/notificationsMiddleware.spec.js index 18ee998db..502ddaa8e 100644 --- a/backend/src/middleware/notifications/notificationsMiddleware.spec.js +++ b/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' diff --git a/backend/src/middleware/orderByMiddleware.spec.js b/backend/src/middleware/orderByMiddleware.spec.js index 7a42166cf..a7b31da0a 100644 --- a/backend/src/middleware/orderByMiddleware.spec.js +++ b/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' diff --git a/backend/src/middleware/permissionsMiddleware.spec.js b/backend/src/middleware/permissionsMiddleware.spec.js index da703fb11..340766136 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 from '../seed/factories' -import { gql } from '../jest/helpers' +import { gql } from '../helpers/jest' import { getDriver, neode as getNeode } from '../bootstrap/neo4j' const factory = Factory() diff --git a/backend/src/middleware/slugifyMiddleware.spec.js b/backend/src/middleware/slugifyMiddleware.spec.js index e65b7ba6c..02699f7b2 100644 --- a/backend/src/middleware/slugifyMiddleware.spec.js +++ b/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' diff --git a/backend/src/middleware/softDelete/softDeleteMiddleware.spec.js b/backend/src/middleware/softDelete/softDeleteMiddleware.spec.js index 5b04abebd..ac23d67f1 100644 --- a/backend/src/middleware/softDelete/softDeleteMiddleware.spec.js +++ b/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' diff --git a/backend/src/schema/resolvers/comments.spec.js b/backend/src/schema/resolvers/comments.spec.js index ba7364a7f..c0f86ffe3 100644 --- a/backend/src/schema/resolvers/comments.spec.js +++ b/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' diff --git a/backend/src/schema/resolvers/donations.spec.js b/backend/src/schema/resolvers/donations.spec.js index 327688d3a..9e701059d 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 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' diff --git a/backend/src/schema/resolvers/emails.spec.js b/backend/src/schema/resolvers/emails.spec.js index ea3491d1e..156007435 100644 --- a/backend/src/schema/resolvers/emails.spec.js +++ b/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' diff --git a/backend/src/schema/resolvers/embeds.spec.js b/backend/src/schema/resolvers/embeds.spec.js index eabd2553e..d0e3208b2 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 '../../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, }, }, - }) - await expect(embedAction(variables)).resolves.toEqual(expected) + errors: undefined + } + ) }) }) diff --git a/backend/src/schema/resolvers/follow.spec.js b/backend/src/schema/resolvers/follow.spec.js index c7da80695..8402842e2 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 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() diff --git a/backend/src/schema/resolvers/locations.spec.js b/backend/src/schema/resolvers/locations.spec.js index aed2419e0..51dafcc2e 100644 --- a/backend/src/schema/resolvers/locations.spec.js +++ b/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' diff --git a/backend/src/schema/resolvers/moderation.spec.js b/backend/src/schema/resolvers/moderation.spec.js index 2ac0dd934..765126c52 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 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' diff --git a/backend/src/schema/resolvers/notifications.spec.js b/backend/src/schema/resolvers/notifications.spec.js index 1b9cac102..24b8280bd 100644 --- a/backend/src/schema/resolvers/notifications.spec.js +++ b/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' diff --git a/backend/src/schema/resolvers/passwordReset.spec.js b/backend/src/schema/resolvers/passwordReset.spec.js index b8633e9c3..8b36b8c85 100644 --- a/backend/src/schema/resolvers/passwordReset.spec.js +++ b/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' diff --git a/backend/src/schema/resolvers/posts.spec.js b/backend/src/schema/resolvers/posts.spec.js index 9106e4eb9..5ed6c6b6e 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 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' diff --git a/backend/src/schema/resolvers/registration.spec.js b/backend/src/schema/resolvers/registration.spec.js index c2b83324d..7d53b63c9 100644 --- a/backend/src/schema/resolvers/registration.spec.js +++ b/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' diff --git a/backend/src/schema/resolvers/reports.spec.js b/backend/src/schema/resolvers/reports.spec.js index 21b1b4a7b..2ecd1f20d 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 from '../../seed/factories' -import { gql } from '../../jest/helpers' +import { gql } from '../../helpers/jest' import { getDriver, neode as getNeode } from '../../bootstrap/neo4j' const factory = Factory() diff --git a/backend/src/schema/resolvers/rewards.spec.js b/backend/src/schema/resolvers/rewards.spec.js index a81133373..2dcdd5b53 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 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' diff --git a/backend/src/schema/resolvers/shout.spec.js b/backend/src/schema/resolvers/shout.spec.js index 462dc15be..f39e4d137 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 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' diff --git a/backend/src/schema/resolvers/socialMedia.spec.js b/backend/src/schema/resolvers/socialMedia.spec.js index 1bbcb8d5b..092139747 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 from '../../seed/factories' -import { gql } from '../../jest/helpers' +import { gql } from '../../helpers/jest' import { neode, getDriver } from '../../bootstrap/neo4j' const driver = getDriver() diff --git a/backend/src/schema/resolvers/user_management.spec.js b/backend/src/schema/resolvers/user_management.spec.js index 4fe21f92a..9d7dff2a3 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 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' diff --git a/backend/src/schema/resolvers/users.spec.js b/backend/src/schema/resolvers/users.spec.js index 986f4a41f..36b77d611 100644 --- a/backend/src/schema/resolvers/users.spec.js +++ b/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' diff --git a/backend/src/schema/resolvers/users/blockedUsers.spec.js b/backend/src/schema/resolvers/users/blockedUsers.spec.js index 887c34494..e0ab00448 100644 --- a/backend/src/schema/resolvers/users/blockedUsers.spec.js +++ b/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() diff --git a/backend/src/seed/seed-db.js b/backend/src/seed/seed-db.js index c99f348cf..692d95542 100644 --- a/backend/src/seed/seed-db.js +++ b/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'] diff --git a/backend/test/features/support/steps.js b/backend/test/features/support/steps.js index fdbca289c..73d059348 100644 --- a/backend/test/features/support/steps.js +++ b/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() diff --git a/cypress/support/commands.js b/cypress/support/commands.js index 51ba950a6..f8bc76d50 100644 --- a/cypress/support/commands.js +++ b/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 => {