IT4Change/Ocelot-Social
3
0
Fork 0
mirror of https://github.com/IT4Change/Ocelot-Social.git synced 2026-04-27 15:09:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #524 from Human-Connection/dependabot/npm_and_yarn/backend/neo4j-graphql-js-2.6.0

Browse Source 
Bump neo4j-graphql-js from 2.4.2 to 2.6.0 in /backend
This commit is contained in:
Robert Schäfer 2019-05-17 01:30:06 +02:00 committed by GitHub
commit b1923e0c84
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/package.json
View File

@ -71,7 +71,7 @@
"lodash": "~4.17.11", "lodash": "~4.17.11",
"ms": "~2.1.1", "ms": "~2.1.1",
"neo4j-driver": "~1.7.4", "neo4j-driver": "~1.7.4",
"neo4j-graphql-js": "~2.4.2", "neo4j-graphql-js": "~2.6.0",
"node-fetch": "~2.5.0", "node-fetch": "~2.5.0",
"npm-run-all": "~4.1.5", "npm-run-all": "~4.1.5",
"request": "~2.88.0", "request": "~2.88.0",

16
backend/yarn.lock
View File

@ -3819,7 +3819,7 @@ graphql-yoga@~1.17.4:
graphql-tools "^4.0.0" graphql-tools "^4.0.0"
subscriptions-transport-ws "^0.9.8" subscriptions-transport-ws "^0.9.8"
"graphql@^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0", graphql@^14.0.2, graphql@~14.3.0: "graphql@^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0", graphql@^14.2.1, graphql@~14.3.0:
version "14.3.0" version "14.3.0"
resolved "https://registry.yarnpkg.com/graphql/-/graphql-14.3.0.tgz#34dd36faa489ff642bcd25df6c3b4f988a1a2f3e" resolved "https://registry.yarnpkg.com/graphql/-/graphql-14.3.0.tgz#34dd36faa489ff642bcd25df6c3b4f988a1a2f3e"
integrity sha512-MdfI4v7kSNC3NhB7cF8KNijDsifuWO2XOtzpyququqaclO8wVuChYv+KogexDwgP5sp7nFI9Z6N4QHgoLkfjrg== integrity sha512-MdfI4v7kSNC3NhB7cF8KNijDsifuWO2XOtzpyququqaclO8wVuChYv+KogexDwgP5sp7nFI9Z6N4QHgoLkfjrg==
@ -5552,7 +5552,7 @@ negotiator@0.6.1:
resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9" resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9"
integrity sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk= integrity sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk=
neo4j-driver@^1.7.2, neo4j-driver@~1.7.4: neo4j-driver@^1.7.3, neo4j-driver@~1.7.4:
version "1.7.4" version "1.7.4"
resolved "https://registry.yarnpkg.com/neo4j-driver/-/neo4j-driver-1.7.4.tgz#9661cf643b63818bff85e82c4691918e75098c1e" resolved "https://registry.yarnpkg.com/neo4j-driver/-/neo4j-driver-1.7.4.tgz#9661cf643b63818bff85e82c4691918e75098c1e"
integrity sha512-pbK1HbXh92zNSwMlXL8aNynkHohg9Jx/Tk+EewdJawGm8n8sKIY4NpRkp0nRw6RHvVBU3u9cQXt01ftFVe7j+A== integrity sha512-pbK1HbXh92zNSwMlXL8aNynkHohg9Jx/Tk+EewdJawGm8n8sKIY4NpRkp0nRw6RHvVBU3u9cQXt01ftFVe7j+A==
@ -5561,15 +5561,15 @@ neo4j-driver@^1.7.2, neo4j-driver@~1.7.4:
text-encoding "^0.6.4" text-encoding "^0.6.4"
uri-js "^4.2.1" uri-js "^4.2.1"
neo4j-graphql-js@~2.4.2: neo4j-graphql-js@~2.6.0:
version "2.4.2" version "2.6.0"
resolved "https://registry.yarnpkg.com/neo4j-graphql-js/-/neo4j-graphql-js-2.4.2.tgz#0acf1d0b3a8a1da516c29dbc6b7c90ef1d0c82bd" resolved "https://registry.yarnpkg.com/neo4j-graphql-js/-/neo4j-graphql-js-2.6.0.tgz#1c418c5e4de384bd0992f99538d3d056d0602669"
integrity sha512-K1A61T6ZaEePXg2wZ4plYsQYxo7cxjHtZ6wZX7JXiX4y96c82J5VcD++FXcUys2jG4z4Bz40YS0Ce7ybMjsmUg== integrity sha512-YStuqeBg6sjXQvQjICz+jpG4W58yHz3Fi1Gjw9HsVYeCSr97ARbGn4Sl02970IKpBeRYqKt1N1Xp3QIvO3OMIw==
dependencies: dependencies:
graphql "^14.0.2" graphql "^14.2.1"
graphql-auth-directives "^2.1.0" graphql-auth-directives "^2.1.0"
lodash "^4.17.11" lodash "^4.17.11"
neo4j-driver "^1.7.2" neo4j-driver "^1.7.3"
next-tick@^1.0.0: next-tick@^1.0.0:
version "1.0.0" version "1.0.0"

6
cypress/integration/administration/TagsAndCategories.feature
View File

@ -32,6 +32,6 @@ Feature: Tags and Categories
And I click on the menu item "Tags" And I click on the menu item "Tags"
Then I can see the following table: Then I can see the following table:
| | Name | Users | Posts | | | Name | Users | Posts |
| 1 | Democracy | 2 | 3 | | 1 | Democracy | 3 | 4 |
| 2 | Ecology | 1 | 1 | | 2 | Nature | 2 | 3 |
| 3 | Nature | 1 | 2 | | 3 | Ecology | 1 | 1 |

13
cypress/integration/common/steps.js
View File

@ -49,14 +49,23 @@ Given('we have a selection of tags and categories as well as posts', () => {
email: 'author@example.org', email: 'author@example.org',
password: '1234' password: '1234'
} }
const yetAnotherAuthor = {
id: 'yetAnotherAuthor',
email: 'yet-another-author@example.org',
password: '1234'
}
cy.factory() cy.factory()
.create('User', someAuthor) .create('User', someAuthor)
.authenticateAs(someAuthor) .authenticateAs(someAuthor)
.create('Post', { id: 'p0' }) .create('Post', { id: 'p0' })
.create('Post', { id: 'p1' }) .create('Post', { id: 'p1' })
cy.factory() cy.factory()
.authenticateAs(loginCredentials) .create('User', yetAnotherAuthor)
.authenticateAs(yetAnotherAuthor)
.create('Post', { id: 'p2' }) .create('Post', { id: 'p2' })
cy.factory()
.authenticateAs(loginCredentials)
.create('Post', { id: 'p3' })
.relate('Post', 'Categories', { from: 'p0', to: 'cat1' }) .relate('Post', 'Categories', { from: 'p0', to: 'cat1' })
.relate('Post', 'Categories', { from: 'p1', to: 'cat2' }) .relate('Post', 'Categories', { from: 'p1', to: 'cat2' })
.relate('Post', 'Categories', { from: 'p2', to: 'cat1' }) .relate('Post', 'Categories', { from: 'p2', to: 'cat1' })
@ -65,7 +74,9 @@ Given('we have a selection of tags and categories as well as posts', () => {
.relate('Post', 'Tags', { from: 'p0', to: 't3' }) .relate('Post', 'Tags', { from: 'p0', to: 't3' })
.relate('Post', 'Tags', { from: 'p1', to: 't2' }) .relate('Post', 'Tags', { from: 'p1', to: 't2' })
.relate('Post', 'Tags', { from: 'p1', to: 't3' }) .relate('Post', 'Tags', { from: 'p1', to: 't3' })
.relate('Post', 'Tags', { from: 'p2', to: 't2' })
.relate('Post', 'Tags', { from: 'p2', to: 't3' }) .relate('Post', 'Tags', { from: 'p2', to: 't3' })
.relate('Post', 'Tags', { from: 'p3', to: 't3' })
}) })
Given('we have the following user accounts:', table => { Given('we have the following user accounts:', table => {