From 45c64db90f5c02c561ffe55b37809c2a91137883 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Tue, 14 May 2019 21:15:12 +0000 Subject: [PATCH 1/6] Bump neo4j-graphql-js from 2.4.2 to 2.6.0 in /backend Bumps [neo4j-graphql-js](https://github.com/neo4j-graphql/neo4j-graphql-js) from 2.4.2 to 2.6.0. - [Release notes](https://github.com/neo4j-graphql/neo4j-graphql-js/releases) - [Changelog](https://github.com/neo4j-graphql/neo4j-graphql-js/blob/master/CHANGELOG.md) - [Commits](https://github.com/neo4j-graphql/neo4j-graphql-js/commits) Signed-off-by: dependabot[bot] --- backend/package.json | 2 +- backend/yarn.lock | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/backend/package.json b/backend/package.json index 798ed764c..37c01839b 100644 --- a/backend/package.json +++ b/backend/package.json @@ -71,7 +71,7 @@ "lodash": "~4.17.11", "ms": "~2.1.1", "neo4j-driver": "~1.7.4", - "neo4j-graphql-js": "~2.4.2", + "neo4j-graphql-js": "~2.6.0", "node-fetch": "~2.5.0", "npm-run-all": "~4.1.5", "request": "~2.88.0", diff --git a/backend/yarn.lock b/backend/yarn.lock index 51b0a136d..f054fa2f2 100644 --- a/backend/yarn.lock +++ b/backend/yarn.lock @@ -3819,7 +3819,7 @@ graphql-yoga@~1.17.4: graphql-tools "^4.0.0" 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" resolved "https://registry.yarnpkg.com/graphql/-/graphql-14.3.0.tgz#34dd36faa489ff642bcd25df6c3b4f988a1a2f3e" integrity sha512-MdfI4v7kSNC3NhB7cF8KNijDsifuWO2XOtzpyququqaclO8wVuChYv+KogexDwgP5sp7nFI9Z6N4QHgoLkfjrg== @@ -5552,7 +5552,7 @@ negotiator@0.6.1: resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9" 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" resolved "https://registry.yarnpkg.com/neo4j-driver/-/neo4j-driver-1.7.4.tgz#9661cf643b63818bff85e82c4691918e75098c1e" 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" uri-js "^4.2.1" -neo4j-graphql-js@~2.4.2: - version "2.4.2" - resolved "https://registry.yarnpkg.com/neo4j-graphql-js/-/neo4j-graphql-js-2.4.2.tgz#0acf1d0b3a8a1da516c29dbc6b7c90ef1d0c82bd" - integrity sha512-K1A61T6ZaEePXg2wZ4plYsQYxo7cxjHtZ6wZX7JXiX4y96c82J5VcD++FXcUys2jG4z4Bz40YS0Ce7ybMjsmUg== +neo4j-graphql-js@~2.6.0: + version "2.6.0" + resolved "https://registry.yarnpkg.com/neo4j-graphql-js/-/neo4j-graphql-js-2.6.0.tgz#1c418c5e4de384bd0992f99538d3d056d0602669" + integrity sha512-YStuqeBg6sjXQvQjICz+jpG4W58yHz3Fi1Gjw9HsVYeCSr97ARbGn4Sl02970IKpBeRYqKt1N1Xp3QIvO3OMIw== dependencies: - graphql "^14.0.2" + graphql "^14.2.1" graphql-auth-directives "^2.1.0" lodash "^4.17.11" - neo4j-driver "^1.7.2" + neo4j-driver "^1.7.3" next-tick@^1.0.0: version "1.0.0" From 75d54130ea1ec470f1073cc3dcc12b7b6539bc70 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Thu, 16 May 2019 04:45:56 +0000 Subject: [PATCH 2/6] Bump tiptap-extensions from 1.19.2 to 1.19.4 in /webapp Bumps [tiptap-extensions](https://github.com/scrumpy/tiptap) from 1.19.2 to 1.19.4. - [Release notes](https://github.com/scrumpy/tiptap/releases) - [Commits](https://github.com/scrumpy/tiptap/compare/tiptap-extensions@1.19.2...tiptap-extensions@1.19.4) Signed-off-by: dependabot[bot] --- webapp/package.json | 2 +- webapp/yarn.lock | 59 ++++++++++++++++++++++++++++++++------------- 2 files changed, 43 insertions(+), 18 deletions(-) diff --git a/webapp/package.json b/webapp/package.json index 0477e8076..77fbee599 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -70,7 +70,7 @@ "stack-utils": "^1.0.2", "string-hash": "^1.1.3", "tiptap": "1.19.2", - "tiptap-extensions": "1.19.2", + "tiptap-extensions": "1.19.4", "v-tooltip": "~2.0.2", "vue-count-to": "~1.0.13", "vue-izitoast": "1.1.2", diff --git a/webapp/yarn.lock b/webapp/yarn.lock index 436e235f5..7cbb39c6d 100644 --- a/webapp/yarn.lock +++ b/webapp/yarn.lock @@ -8775,6 +8775,15 @@ prosemirror-commands@^1.0.7: prosemirror-state "^1.0.0" prosemirror-transform "^1.0.0" +prosemirror-commands@^1.0.8: + version "1.0.8" + resolved "https://registry.yarnpkg.com/prosemirror-commands/-/prosemirror-commands-1.0.8.tgz#3b21e8b2f2e1c04ddb831b2d4055084b6d627bcc" + integrity sha512-P9QdkYYBHWsrJ1JztQuHgeZS7DPCcijQduOj9oxFiqK8Fm6eTsVHzU1IwiRBe+FlK7tyQaerhu/F5K8sqnZ1Cw== + dependencies: + prosemirror-model "^1.0.0" + prosemirror-state "^1.0.0" + prosemirror-transform "^1.0.0" + prosemirror-dropcursor@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/prosemirror-dropcursor/-/prosemirror-dropcursor-1.1.1.tgz#c60ed1ed6c58804a06a75db06a0d993b087b7622" @@ -8865,10 +8874,10 @@ prosemirror-utils@^0.8.1: resolved "https://registry.yarnpkg.com/prosemirror-utils/-/prosemirror-utils-0.8.1.tgz#a9cb9f5ce292dc20c21ec996af02879651395a65" integrity sha512-u1tCdkj4I5T7sBmL6IvBAnH8p0a//vJ2N3g7pVKbfxPVDQ7gcC9UibbPijpvhb6PALxX/oeccvo+PJXHm6j4vA== -prosemirror-view@^1.0.0, prosemirror-view@^1.1.0, prosemirror-view@^1.9.4: - version "1.9.4" - resolved "https://registry.yarnpkg.com/prosemirror-view/-/prosemirror-view-1.9.4.tgz#d0490846c9e8c88e1460e5f8ed5ee0c8d8f47298" - integrity sha512-3l6pzxEjgSZawW0Y0iUeKSW4pCCfSNxCNZT3q0C6MOqE30dVpA+0acTFOEZz6Gf8D3Lo20FwwaCSH6ld1P+8Lw== +prosemirror-view@^1.0.0, prosemirror-view@^1.1.0, prosemirror-view@^1.9.4, prosemirror-view@^1.9.5: + version "1.9.5" + resolved "https://registry.yarnpkg.com/prosemirror-view/-/prosemirror-view-1.9.5.tgz#4c707c144bdd4d5209e5e92697108b854e0a2138" + integrity sha512-062RMNDpof3SHgfTbJS6pVycdEaVgP1IGqdVLangZb0iwgb7yNZ8C5BPG+Is8GoEk3H5d9uZ0c6FskAA08gR3g== dependencies: prosemirror-model "^1.1.0" prosemirror-state "^1.0.0" @@ -10401,22 +10410,22 @@ tippy.js@^4.3.1: dependencies: popper.js "^1.14.7" -tiptap-commands@^1.10.2: - version "1.10.2" - resolved "https://registry.yarnpkg.com/tiptap-commands/-/tiptap-commands-1.10.2.tgz#34a9534126331d65bd3bad7fcb3893ceef34d5ee" - integrity sha512-OTNMBx1SVnUnZlnUOnx2HC/IFop2QpRJreuvEt/XzqE3eNLExLgQLVELkGkrrLnIDU61MOva010La+6RaoF5NQ== +tiptap-commands@^1.10.2, tiptap-commands@^1.10.3: + version "1.10.3" + resolved "https://registry.yarnpkg.com/tiptap-commands/-/tiptap-commands-1.10.3.tgz#e251712a2ee06ae50595196d7f6a51881da2d0e3" + integrity sha512-qsbRr39439ZrEFJ2C9fvwnC7u9e+eWBFkb28wgRKTe5AQVlKxXA6+MF8Zm6Goz/2wxrkj2ECGf2a3rlYWRDE2Q== dependencies: - prosemirror-commands "^1.0.7" + prosemirror-commands "^1.0.8" prosemirror-inputrules "^1.0.2" prosemirror-model "^1.7.0" prosemirror-schema-list "^1.0.3" prosemirror-state "^1.2.3" tiptap-utils "^1.5.2" -tiptap-extensions@1.19.2: - version "1.19.2" - resolved "https://registry.yarnpkg.com/tiptap-extensions/-/tiptap-extensions-1.19.2.tgz#54313fa82cf5966ae3ee85f3acca819a1c215d90" - integrity sha512-0f/+3qOzAY71GO837puJSpe08gQdzNsQgSa3+RFVgY1HFo9+YHX/AGHZu6PhZTxDBlaUgCLJGtcPpdXW4OrTzw== +tiptap-extensions@1.19.4: + version "1.19.4" + resolved "https://registry.yarnpkg.com/tiptap-extensions/-/tiptap-extensions-1.19.4.tgz#8b0deb0d7262899efe001b72b4f0ac11c6b72bcd" + integrity sha512-JXryshgHgT4jxjaOpvUg+qjExNan+5t3PkIJgvduCBI4v31Qs6U+LoLJHpRj4OgvVHzmwOXgwXYeIsyMBIw9nw== dependencies: lowlight "^1.11.0" prosemirror-collab "^1.1.1" @@ -10426,9 +10435,9 @@ tiptap-extensions@1.19.2: prosemirror-tables "^0.8.0" prosemirror-transform "^1.1.3" prosemirror-utils "^0.8.1" - prosemirror-view "^1.9.4" - tiptap "^1.19.2" - tiptap-commands "^1.10.2" + prosemirror-view "^1.9.5" + tiptap "^1.19.3" + tiptap-commands "^1.10.3" tiptap-utils@^1.5.2: version "1.5.2" @@ -10440,7 +10449,7 @@ tiptap-utils@^1.5.2: prosemirror-tables "^0.8.0" prosemirror-utils "^0.8.1" -tiptap@1.19.2, tiptap@^1.19.2: +tiptap@1.19.2: version "1.19.2" resolved "https://registry.yarnpkg.com/tiptap/-/tiptap-1.19.2.tgz#6d349c32185b358d9f9326c461f4993a99c0374d" integrity sha512-RQxvHZznQYMaYe935ihueGbepWGASn8fM+BQG1LMQEvqjlPZ6+F95lJ5vBFahE/CV9w0A9ddN06RacbF4P+6EA== @@ -10456,6 +10465,22 @@ tiptap@1.19.2, tiptap@^1.19.2: tiptap-commands "^1.10.2" tiptap-utils "^1.5.2" +tiptap@^1.19.3: + version "1.19.3" + resolved "https://registry.yarnpkg.com/tiptap/-/tiptap-1.19.3.tgz#7deaab8099fa40e845b2fecab7eb15f42b54add1" + integrity sha512-4QlYLgf8+KcXn2zyw4cc61aB6KM2b3Fb06HgrEFKyjxIuqFsNo4LsELnkr7uYI0huJuW/H1+gbZUnesJxfhOHw== + dependencies: + prosemirror-commands "^1.0.8" + prosemirror-dropcursor "^1.1.1" + prosemirror-gapcursor "^1.0.3" + prosemirror-inputrules "^1.0.2" + prosemirror-keymap "^1.0.1" + prosemirror-model "^1.7.0" + prosemirror-state "^1.2.3" + prosemirror-view "^1.9.5" + tiptap-commands "^1.10.3" + tiptap-utils "^1.5.2" + tmp@^0.0.33: version "0.0.33" resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9" From f001f7b5e3e57254ea7d79d30b93403d5ff414d9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Thu, 16 May 2019 04:46:33 +0000 Subject: [PATCH 3/6] Bump tiptap from 1.19.2 to 1.19.3 in /webapp Bumps [tiptap](https://github.com/scrumpy/tiptap) from 1.19.2 to 1.19.3. - [Release notes](https://github.com/scrumpy/tiptap/releases) - [Commits](https://github.com/scrumpy/tiptap/compare/tiptap@1.19.2...tiptap@1.19.3) Signed-off-by: dependabot[bot] --- webapp/package.json | 2 +- webapp/yarn.lock | 40 ++++++++++++++++++++-------------------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/webapp/package.json b/webapp/package.json index 0477e8076..02c071c8a 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -69,7 +69,7 @@ "nuxt-env": "~0.1.0", "stack-utils": "^1.0.2", "string-hash": "^1.1.3", - "tiptap": "1.19.2", + "tiptap": "1.19.3", "tiptap-extensions": "1.19.2", "v-tooltip": "~2.0.2", "vue-count-to": "~1.0.13", diff --git a/webapp/yarn.lock b/webapp/yarn.lock index 436e235f5..abe3fd608 100644 --- a/webapp/yarn.lock +++ b/webapp/yarn.lock @@ -8766,10 +8766,10 @@ prosemirror-collab@^1.1.1: dependencies: prosemirror-state "^1.0.0" -prosemirror-commands@^1.0.7: - version "1.0.7" - resolved "https://registry.yarnpkg.com/prosemirror-commands/-/prosemirror-commands-1.0.7.tgz#e5a2ba821e29ea7065c88277fe2c3d7f6b0b9d37" - integrity sha512-IR8yMSdw7XlKuF68tydAak1J9P/lLD5ohsrL7pzoLsJAJAQU7mVPDXtGbQrrm0mesddFjcc1zNo/cJQN3lRYnA== +prosemirror-commands@^1.0.8: + version "1.0.8" + resolved "https://registry.yarnpkg.com/prosemirror-commands/-/prosemirror-commands-1.0.8.tgz#3b21e8b2f2e1c04ddb831b2d4055084b6d627bcc" + integrity sha512-P9QdkYYBHWsrJ1JztQuHgeZS7DPCcijQduOj9oxFiqK8Fm6eTsVHzU1IwiRBe+FlK7tyQaerhu/F5K8sqnZ1Cw== dependencies: prosemirror-model "^1.0.0" prosemirror-state "^1.0.0" @@ -8865,10 +8865,10 @@ prosemirror-utils@^0.8.1: resolved "https://registry.yarnpkg.com/prosemirror-utils/-/prosemirror-utils-0.8.1.tgz#a9cb9f5ce292dc20c21ec996af02879651395a65" integrity sha512-u1tCdkj4I5T7sBmL6IvBAnH8p0a//vJ2N3g7pVKbfxPVDQ7gcC9UibbPijpvhb6PALxX/oeccvo+PJXHm6j4vA== -prosemirror-view@^1.0.0, prosemirror-view@^1.1.0, prosemirror-view@^1.9.4: - version "1.9.4" - resolved "https://registry.yarnpkg.com/prosemirror-view/-/prosemirror-view-1.9.4.tgz#d0490846c9e8c88e1460e5f8ed5ee0c8d8f47298" - integrity sha512-3l6pzxEjgSZawW0Y0iUeKSW4pCCfSNxCNZT3q0C6MOqE30dVpA+0acTFOEZz6Gf8D3Lo20FwwaCSH6ld1P+8Lw== +prosemirror-view@^1.0.0, prosemirror-view@^1.1.0, prosemirror-view@^1.9.4, prosemirror-view@^1.9.5: + version "1.9.5" + resolved "https://registry.yarnpkg.com/prosemirror-view/-/prosemirror-view-1.9.5.tgz#4c707c144bdd4d5209e5e92697108b854e0a2138" + integrity sha512-062RMNDpof3SHgfTbJS6pVycdEaVgP1IGqdVLangZb0iwgb7yNZ8C5BPG+Is8GoEk3H5d9uZ0c6FskAA08gR3g== dependencies: prosemirror-model "^1.1.0" prosemirror-state "^1.0.0" @@ -10401,12 +10401,12 @@ tippy.js@^4.3.1: dependencies: popper.js "^1.14.7" -tiptap-commands@^1.10.2: - version "1.10.2" - resolved "https://registry.yarnpkg.com/tiptap-commands/-/tiptap-commands-1.10.2.tgz#34a9534126331d65bd3bad7fcb3893ceef34d5ee" - integrity sha512-OTNMBx1SVnUnZlnUOnx2HC/IFop2QpRJreuvEt/XzqE3eNLExLgQLVELkGkrrLnIDU61MOva010La+6RaoF5NQ== +tiptap-commands@^1.10.2, tiptap-commands@^1.10.3: + version "1.10.3" + resolved "https://registry.yarnpkg.com/tiptap-commands/-/tiptap-commands-1.10.3.tgz#e251712a2ee06ae50595196d7f6a51881da2d0e3" + integrity sha512-qsbRr39439ZrEFJ2C9fvwnC7u9e+eWBFkb28wgRKTe5AQVlKxXA6+MF8Zm6Goz/2wxrkj2ECGf2a3rlYWRDE2Q== dependencies: - prosemirror-commands "^1.0.7" + prosemirror-commands "^1.0.8" prosemirror-inputrules "^1.0.2" prosemirror-model "^1.7.0" prosemirror-schema-list "^1.0.3" @@ -10440,20 +10440,20 @@ tiptap-utils@^1.5.2: prosemirror-tables "^0.8.0" prosemirror-utils "^0.8.1" -tiptap@1.19.2, tiptap@^1.19.2: - version "1.19.2" - resolved "https://registry.yarnpkg.com/tiptap/-/tiptap-1.19.2.tgz#6d349c32185b358d9f9326c461f4993a99c0374d" - integrity sha512-RQxvHZznQYMaYe935ihueGbepWGASn8fM+BQG1LMQEvqjlPZ6+F95lJ5vBFahE/CV9w0A9ddN06RacbF4P+6EA== +tiptap@1.19.3, tiptap@^1.19.2: + version "1.19.3" + resolved "https://registry.yarnpkg.com/tiptap/-/tiptap-1.19.3.tgz#7deaab8099fa40e845b2fecab7eb15f42b54add1" + integrity sha512-4QlYLgf8+KcXn2zyw4cc61aB6KM2b3Fb06HgrEFKyjxIuqFsNo4LsELnkr7uYI0huJuW/H1+gbZUnesJxfhOHw== dependencies: - prosemirror-commands "^1.0.7" + prosemirror-commands "^1.0.8" prosemirror-dropcursor "^1.1.1" prosemirror-gapcursor "^1.0.3" prosemirror-inputrules "^1.0.2" prosemirror-keymap "^1.0.1" prosemirror-model "^1.7.0" prosemirror-state "^1.2.3" - prosemirror-view "^1.9.4" - tiptap-commands "^1.10.2" + prosemirror-view "^1.9.5" + tiptap-commands "^1.10.3" tiptap-utils "^1.5.2" tmp@^0.0.33: From f16b4003402e23dba129d02da933b647e67360dd Mon Sep 17 00:00:00 2001 From: Sam Joseph Date: Thu, 16 May 2019 12:58:55 +0100 Subject: [PATCH 4/6] Update CONTRIBUTING.md --- CONTRIBUTING.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 01c963187..19aaf3301 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -51,7 +51,19 @@ But what do we do when waiting for merge into master \(wanting to keep PRs small * solutions * 1\) put 2nd PR into branch that the first PR is hitting - but requires update after merging * 2\) prefer to leave exiting PR until it can be reviewed, and instead go and work on some other part of the codebase that is not impacted by the first PR + +### Code Review +* Github setting in place - at least one review is required to merge + - in principle anyone (who is not the PR owner) can review + - but often it will be the core developers (Robert, Ulf, Greg, Wolfgang?) + - once there is a review, and presuming no requested changes, PR opener can merge +* CI/tests + - the CI needs to pass + - linting <-- autofix? + - tests (unit, feature) (backend, frontend) + - codecoverage + ## Notes question: when you want to pick a task - \(find out priority\) - is it in discord? is it in AV slack? --> Robert says you can always ask in discord - group channels are the best From a819d6353a00df75587ca77bec3fa5baa4d7f594 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Fri, 17 May 2019 00:09:54 +0200 Subject: [PATCH 5/6] Fix probably randomly failing cypress test @mattwr18 @ulfgebhardt @tirokk @appinteractive @ogerly I think I just fixed a randomly failing test (so-called "flaky" test). After an update of `neo4j-graphql-js` I wondered why the `TagsAndCategories.feature` test failed consistently. It turns out the table that you can see in the test is ordered by the "Users" column: | | Name | Users | Posts | | 1 | Democracy | 2 | 3 | | 2 | Ecology | 1 | 1 | | 3 | Nature | 1 | 2 | So there is a tie between row 2 and row 3. It seems that on version 2.4.0 the backend would return those rows in arbitrary order and now it returns them in a deterministic order, thus failing the test every time. Therefore I changed the test setup and I believe this should also make the build more robust now. --- .../administration/TagsAndCategories.feature | 6 +++--- cypress/integration/common/steps.js | 13 ++++++++++++- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/cypress/integration/administration/TagsAndCategories.feature b/cypress/integration/administration/TagsAndCategories.feature index 813ff5d80..e55535ea9 100644 --- a/cypress/integration/administration/TagsAndCategories.feature +++ b/cypress/integration/administration/TagsAndCategories.feature @@ -32,6 +32,6 @@ Feature: Tags and Categories And I click on the menu item "Tags" Then I can see the following table: | | Name | Users | Posts | - | 1 | Democracy | 2 | 3 | - | 2 | Ecology | 1 | 1 | - | 3 | Nature | 1 | 2 | + | 1 | Democracy | 3 | 4 | + | 2 | Nature | 2 | 3 | + | 3 | Ecology | 1 | 1 | diff --git a/cypress/integration/common/steps.js b/cypress/integration/common/steps.js index 0be3f882f..387f33ac0 100644 --- a/cypress/integration/common/steps.js +++ b/cypress/integration/common/steps.js @@ -49,14 +49,23 @@ Given('we have a selection of tags and categories as well as posts', () => { email: 'author@example.org', password: '1234' } + const yetAnotherAuthor = { + id: 'yetAnotherAuthor', + email: 'yet-another-author@example.org', + password: '1234' + } cy.factory() .create('User', someAuthor) .authenticateAs(someAuthor) .create('Post', { id: 'p0' }) .create('Post', { id: 'p1' }) cy.factory() - .authenticateAs(loginCredentials) + .create('User', yetAnotherAuthor) + .authenticateAs(yetAnotherAuthor) .create('Post', { id: 'p2' }) + cy.factory() + .authenticateAs(loginCredentials) + .create('Post', { id: 'p3' }) .relate('Post', 'Categories', { from: 'p0', to: 'cat1' }) .relate('Post', 'Categories', { from: 'p1', to: 'cat2' }) .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: 'p1', to: 't2' }) .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: 'p3', to: 't3' }) }) Given('we have the following user accounts:', table => { From 041c9056e7c43097a6a9822fda317b0581cf17cb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Fri, 17 May 2019 03:06:55 +0000 Subject: [PATCH 6/6] Bump tiptap-extensions from 1.19.2 to 1.19.4 in /webapp Bumps [tiptap-extensions](https://github.com/scrumpy/tiptap) from 1.19.2 to 1.19.4. - [Release notes](https://github.com/scrumpy/tiptap/releases) - [Commits](https://github.com/scrumpy/tiptap/compare/tiptap-extensions@1.19.2...tiptap-extensions@1.19.4) Signed-off-by: dependabot[bot] --- webapp/package.json | 2 +- webapp/yarn.lock | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/webapp/package.json b/webapp/package.json index 02c071c8a..52a979725 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -70,7 +70,7 @@ "stack-utils": "^1.0.2", "string-hash": "^1.1.3", "tiptap": "1.19.3", - "tiptap-extensions": "1.19.2", + "tiptap-extensions": "1.19.4", "v-tooltip": "~2.0.2", "vue-count-to": "~1.0.13", "vue-izitoast": "1.1.2", diff --git a/webapp/yarn.lock b/webapp/yarn.lock index abe3fd608..80a559383 100644 --- a/webapp/yarn.lock +++ b/webapp/yarn.lock @@ -8865,7 +8865,7 @@ prosemirror-utils@^0.8.1: resolved "https://registry.yarnpkg.com/prosemirror-utils/-/prosemirror-utils-0.8.1.tgz#a9cb9f5ce292dc20c21ec996af02879651395a65" integrity sha512-u1tCdkj4I5T7sBmL6IvBAnH8p0a//vJ2N3g7pVKbfxPVDQ7gcC9UibbPijpvhb6PALxX/oeccvo+PJXHm6j4vA== -prosemirror-view@^1.0.0, prosemirror-view@^1.1.0, prosemirror-view@^1.9.4, prosemirror-view@^1.9.5: +prosemirror-view@^1.0.0, prosemirror-view@^1.1.0, prosemirror-view@^1.9.5: version "1.9.5" resolved "https://registry.yarnpkg.com/prosemirror-view/-/prosemirror-view-1.9.5.tgz#4c707c144bdd4d5209e5e92697108b854e0a2138" integrity sha512-062RMNDpof3SHgfTbJS6pVycdEaVgP1IGqdVLangZb0iwgb7yNZ8C5BPG+Is8GoEk3H5d9uZ0c6FskAA08gR3g== @@ -10401,7 +10401,7 @@ tippy.js@^4.3.1: dependencies: popper.js "^1.14.7" -tiptap-commands@^1.10.2, tiptap-commands@^1.10.3: +tiptap-commands@^1.10.3: version "1.10.3" resolved "https://registry.yarnpkg.com/tiptap-commands/-/tiptap-commands-1.10.3.tgz#e251712a2ee06ae50595196d7f6a51881da2d0e3" integrity sha512-qsbRr39439ZrEFJ2C9fvwnC7u9e+eWBFkb28wgRKTe5AQVlKxXA6+MF8Zm6Goz/2wxrkj2ECGf2a3rlYWRDE2Q== @@ -10413,10 +10413,10 @@ tiptap-commands@^1.10.2, tiptap-commands@^1.10.3: prosemirror-state "^1.2.3" tiptap-utils "^1.5.2" -tiptap-extensions@1.19.2: - version "1.19.2" - resolved "https://registry.yarnpkg.com/tiptap-extensions/-/tiptap-extensions-1.19.2.tgz#54313fa82cf5966ae3ee85f3acca819a1c215d90" - integrity sha512-0f/+3qOzAY71GO837puJSpe08gQdzNsQgSa3+RFVgY1HFo9+YHX/AGHZu6PhZTxDBlaUgCLJGtcPpdXW4OrTzw== +tiptap-extensions@1.19.4: + version "1.19.4" + resolved "https://registry.yarnpkg.com/tiptap-extensions/-/tiptap-extensions-1.19.4.tgz#8b0deb0d7262899efe001b72b4f0ac11c6b72bcd" + integrity sha512-JXryshgHgT4jxjaOpvUg+qjExNan+5t3PkIJgvduCBI4v31Qs6U+LoLJHpRj4OgvVHzmwOXgwXYeIsyMBIw9nw== dependencies: lowlight "^1.11.0" prosemirror-collab "^1.1.1" @@ -10426,9 +10426,9 @@ tiptap-extensions@1.19.2: prosemirror-tables "^0.8.0" prosemirror-transform "^1.1.3" prosemirror-utils "^0.8.1" - prosemirror-view "^1.9.4" - tiptap "^1.19.2" - tiptap-commands "^1.10.2" + prosemirror-view "^1.9.5" + tiptap "^1.19.3" + tiptap-commands "^1.10.3" tiptap-utils@^1.5.2: version "1.5.2" @@ -10440,7 +10440,7 @@ tiptap-utils@^1.5.2: prosemirror-tables "^0.8.0" prosemirror-utils "^0.8.1" -tiptap@1.19.3, tiptap@^1.19.2: +tiptap@1.19.3, tiptap@^1.19.3: version "1.19.3" resolved "https://registry.yarnpkg.com/tiptap/-/tiptap-1.19.3.tgz#7deaab8099fa40e845b2fecab7eb15f42b54add1" integrity sha512-4QlYLgf8+KcXn2zyw4cc61aB6KM2b3Fb06HgrEFKyjxIuqFsNo4LsELnkr7uYI0huJuW/H1+gbZUnesJxfhOHw==