Merge branch 'master' into fix-coverage

backend/.dockerignore

@@ -12,7 +12,6 @@ docker-compose*.yml
 ./*.log
 
 node_modules/
-scripts/
 build/
 
 maintenance-worker/

backend/Dockerfile

@@ -74,7 +74,7 @@ FROM code as build
 # yarn install
 RUN yarn install --production=false --frozen-lockfile --non-interactive
 # yarn build
-RUN yarn run build
+RUN /bin/sh -c "yarn run build"
 
 ##################################################################################
 # TEST ###########################################################################

backend/package.json

@@ -11,7 +11,7 @@
     "__migrate": "migrate --compiler 'js:@babel/register' --migrations-dir ./src/db/migrations",
     "prod:migrate": "migrate --migrations-dir ./build/db/migrations --store ./build/db/migrate/store.js",
     "start": "node build/",
-    "build": "tsc && mkdir -p build/middleware/helpers/email/templates/ && cp -r src/middleware/helpers/email/templates/*.html build/middleware/helpers/email/templates/ && mkdir -p build/middleware/helpers/email/templates/en/ && cp -r src/middleware/helpers/email/templates/en/*.html build/middleware/helpers/email/templates/en/ && mkdir -p build/middleware/helpers/email/templates/de/ && cp -r src/middleware/helpers/email/templates/de/*.html build/middleware/helpers/email/templates/de/ && mkdir -p build/schema/types/ && cp -r src/schema/types/*.gql build/schema/types/ && mkdir -p build/schema/types/enum/ && cp -r src/schema/types/enum/*.gql build/schema/types/enum/ && mkdir -p build/schema/types/scalar/ && cp -r src/schema/types/scalar/*.gql build/schema/types/scalar/ && mkdir -p build/schema/types/type/ && cp -r src/schema/types/type/*.gql build/schema/types/type/",
+    "build": "tsc && ./scripts/build.copy.files.sh",
     "dev": "nodemon --exec ts-node src/ -e js,ts,gql",
     "dev:debug": "nodemon --exec babel-node --inspect=0.0.0.0:9229 src/ -e js,gql",
     "lint": "eslint src --config .eslintrc.js",
@@ -72,7 +72,7 @@
     "metascraper-logo": "^5.33.5",
     "metascraper-publisher": "^5.33.5",
     "metascraper-soundcloud": "^5.34.4",
-    "metascraper-title": "^5.33.5",
+    "metascraper-title": "^5.34.7",
     "metascraper-url": "^5.34.2",
     "metascraper-video": "^5.33.5",
     "metascraper-youtube": "^5.33.5",

backend/scripts/build.copy.files.sh

@@ -0,0 +1,24 @@
+#!/bin/sh
+
+# html files
+mkdir -p build/middleware/helpers/email/templates/
+cp -r src/middleware/helpers/email/templates/*.html build/middleware/helpers/email/templates/
+
+mkdir -p build/middleware/helpers/email/templates/en/
+cp -r src/middleware/helpers/email/templates/en/*.html build/middleware/helpers/email/templates/en/
+
+mkdir -p build/middleware/helpers/email/templates/de/
+cp -r src/middleware/helpers/email/templates/de/*.html build/middleware/helpers/email/templates/de/
+
+# gql files
+mkdir -p build/schema/types/
+cp -r src/schema/types/*.gql build/schema/types/
+
+mkdir -p build/schema/types/enum/
+cp -r src/schema/types/enum/*.gql build/schema/types/enum/
+
+mkdir -p build/schema/types/scalar/
+cp -r src/schema/types/scalar/*.gql build/schema/types/scalar/
+
+mkdir -p build/schema/types/type/
+cp -r src/schema/types/type/*.gql build/schema/types/type/

backend/src/models/index.js

@@ -1,20 +1,37 @@
 // NOTE: We cannot use `fs` here to clean up the code. Cypress breaks on any npm
 // module that is not browser-compatible. Node's `fs` module is server-side only
 export default {
-  Image: require('./Image.js').default,
+  Image: typeof Cypress !== 'undefined' ? require('./Image.js') : require('./Image.js').default,
-  Badge: require('./Badge.js').default,
+  Badge: typeof Cypress !== 'undefined' ? require('./Badge.js') : require('./Badge.js').default,
-  User: require('./User.js').default,
+  User: typeof Cypress !== 'undefined' ? require('./User.js') : require('./User.js').default,
-  Group: require('./Group.js').default,
+  Group: typeof Cypress !== 'undefined' ? require('./Group.js') : require('./Group.js').default,
-  EmailAddress: require('./EmailAddress.js').default,
+  EmailAddress:
-  UnverifiedEmailAddress: require('./UnverifiedEmailAddress.js').default,
+    typeof Cypress !== 'undefined'
-  SocialMedia: require('./SocialMedia.js').default,
+      ? require('./EmailAddress.js')
-  Post: require('./Post.js').default,
+      : require('./EmailAddress.js').default,
-  Comment: require('./Comment.js').default,
+  UnverifiedEmailAddress:
-  Category: require('./Category.js').default,
+    typeof Cypress !== 'undefined'
-  Tag: require('./Tag.js').default,
+      ? require('./UnverifiedEmailAddress.js')
-  Location: require('./Location.js').default,
+      : require('./UnverifiedEmailAddress.js').default,
-  Donations: require('./Donations.js').default,
+  SocialMedia:
-  Report: require('./Report.js').default,
+    typeof Cypress !== 'undefined'
-  Migration: require('./Migration.js').default,
+      ? require('./SocialMedia.js')
-  InviteCode: require('./InviteCode.js').default,
+      : require('./SocialMedia.js').default,
+  Post: typeof Cypress !== 'undefined' ? require('./Post.js') : require('./Post.js').default,
+  Comment:
+    typeof Cypress !== 'undefined' ? require('./Comment.js') : require('./Comment.js').default,
+  Category:
+    typeof Cypress !== 'undefined' ? require('./Category.js') : require('./Category.js').default,
+  Tag: typeof Cypress !== 'undefined' ? require('./Tag.js') : require('./Tag.js').default,
+  Location:
+    typeof Cypress !== 'undefined' ? require('./Location.js') : require('./Location.js').default,
+  Donations:
+    typeof Cypress !== 'undefined' ? require('./Donations.js') : require('./Donations.js').default,
+  Report: typeof Cypress !== 'undefined' ? require('./Report.js') : require('./Report.js').default,
+  Migration:
+    typeof Cypress !== 'undefined' ? require('./Migration.js') : require('./Migration.js').default,
+  InviteCode:
+    typeof Cypress !== 'undefined'
+      ? require('./InviteCode.js')
+      : require('./InviteCode.js').default,
 }

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

@@ -158,7 +158,7 @@ describe('Filter Posts', () => {
   })
 
   describe('order events by event start descending', () => {
-    it('finds the events orderd accordingly', async () => {
+    it('finds the events ordered accordingly', async () => {
       const {
         data: { Post: result },
       } = await query({
@@ -180,7 +180,7 @@ describe('Filter Posts', () => {
   })
 
   describe('order events by event start ascending', () => {
-    it('finds the events orderd accordingly', async () => {
+    it('finds the events ordered accordingly', async () => {
       const {
         data: { Post: result },
       } = await query({

backend/yarn.lock

@@ -1511,10 +1511,10 @@
     url-regex "~4.1.1"
     video-extensions "~1.1.0"
 
-"@metascraper/helpers@^5.33.5", "@metascraper/helpers@^5.34.2", "@metascraper/helpers@^5.34.4":
+"@metascraper/helpers@^5.33.5", "@metascraper/helpers@^5.34.2", "@metascraper/helpers@^5.34.4", "@metascraper/helpers@^5.34.7":
-  version "5.34.4"
+  version "5.34.7"
-  resolved "https://registry.yarnpkg.com/@metascraper/helpers/-/helpers-5.34.4.tgz#59faf01466938b26aa8df147f97c7f9f4d739d28"
+  resolved "https://registry.yarnpkg.com/@metascraper/helpers/-/helpers-5.34.7.tgz#749a288813e9f61938bb64d34bfb4e2c26689cbe"
-  integrity sha512-OZdXkfxJXH5dW+aoptLJzxN56Xj+ABzbqZ9NDuKn908zW4tvLBPD6go3qdd3GXXQZH7TxvWpETn9i1AxzoyKmQ==
+  integrity sha512-h3Kg9xFoVlr3rqxbhpR+o7nzYuThXtiDuk+kiaIWozAguUWT6xvwb3iHKuCdKC9/29PXeJ+UqM9WxBamxbzGmg==
   dependencies:
     audio-extensions "0.0.0"
     chrono-node "~2.6.2"
@@ -1527,13 +1527,13 @@
     is-uri "~1.2.4"
     iso-639-3 "~2.2.0"
     isostring "0.0.1"
-    jsdom "~22.0.0"
+    jsdom "~22.1.0"
     lodash "~4.17.21"
     memoize-one "~6.0.0"
     microsoft-capitalize "~1.0.5"
     mime "~3.0.0"
     normalize-url "~6.1.0"
-    re2 "~1.18.0"
+    re2 "~1.18.3"
     smartquotes "~2.3.2"
     tldts "~6.0.1"
     url-regex-safe "~3.0.0"
@@ -5918,10 +5918,10 @@ insane@2.6.1:
     assignment "2.0.0"
     he "0.5.0"
 
-install-artifact-from-github@^1.3.1:
+install-artifact-from-github@^1.3.3:
-  version "1.3.2"
+  version "1.3.3"
-  resolved "https://registry.yarnpkg.com/install-artifact-from-github/-/install-artifact-from-github-1.3.2.tgz#1a16d9508e40330523a3017ae0d4713ccc64de82"
+  resolved "https://registry.yarnpkg.com/install-artifact-from-github/-/install-artifact-from-github-1.3.3.tgz#57d89bacfa0f47d7307fe41b6247cda9f9a8079c"
-  integrity sha512-yCFcLvqk0yQdxx0uJz4t9Z3adDMLAYrcGYv546uRXCSvxE+GqNYhhz/KmrGcUKGI/gVLR9n/e/zM9jX/+ASMJQ==
+  integrity sha512-x79SL0d8WOi1ZjXSTUqqs0GPQZ92YArJAN9O46wgU9wdH2U9ecyyhB9YGDbPe2OLV4ptmt6AZYRQZ2GydQZosQ==
 
 invariant@^2.2.2, invariant@^2.2.4:
   version "2.2.4"
@@ -6807,10 +6807,10 @@ jsbn@~0.1.0:
   resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
   integrity sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==
 
-jsdom@~22.0.0:
+jsdom@~22.1.0:
-  version "22.0.0"
+  version "22.1.0"
-  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-22.0.0.tgz#3295c6992c70089c4b8f5cf060489fddf7ee9816"
+  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-22.1.0.tgz#0fca6d1a37fbeb7f4aac93d1090d782c56b611c8"
-  integrity sha512-p5ZTEb5h+O+iU02t0GfEjAnkdYPrQSkfuTSMkMYyIoMvUNEHsbG0bHHbfXIcfTqD2UfvjQX7mmgiFsyRwGscVw==
+  integrity sha512-/9AVW7xNbsBv6GfWho4TTNjEo9fe6Zhf9O7s0Fhhr3u+awPwAJMKwAMXnkk5vBxflqLW9hTHX/0cs+P3gW+cQw==
   dependencies:
     abab "^2.0.6"
     cssstyle "^3.0.0"
@@ -7385,12 +7385,12 @@ metascraper-soundcloud@^5.34.4:
   dependencies:
     "@metascraper/helpers" "^5.34.4"
 
-metascraper-title@^5.33.5:
+metascraper-title@^5.34.7:
-  version "5.33.5"
+  version "5.34.7"
-  resolved "https://registry.yarnpkg.com/metascraper-title/-/metascraper-title-5.33.5.tgz#2efd6aae03211175fa2e27b4d827cade4c3e35f4"
+  resolved "https://registry.yarnpkg.com/metascraper-title/-/metascraper-title-5.34.7.tgz#d53afa05eb4d5f2d7b8ec772ddfc335733f86a21"
-  integrity sha512-Vavt/2Yt4BZP+++xsV2ZnUqqQ4WHxRImZq6fZD6Eh8R8nt43kuQdgKrBKTD3Ybk6/qvlCTQ9XY57m/KTIiAMnA==
+  integrity sha512-k+eDC12Y1m5n/RE3GhqmWRtNSKH9rDXvAzJ6k2T9+9PyaGeaSN9dWLnc3rK9TYmdFP02kTKhCAV8WerHw/7IqA==
   dependencies:
-    "@metascraper/helpers" "^5.33.5"
+    "@metascraper/helpers" "^5.34.7"
 
 metascraper-url@^5.34.2:
   version "5.34.2"
@@ -7854,7 +7854,7 @@ node-fetch@^2.1.2, node-fetch@^2.2.0, node-fetch@^2.6.0, node-fetch@~2.6.1:
   resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052"
   integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==
 
-node-gyp@^9.3.0:
+node-gyp@^9.3.1:
   version "9.3.1"
   resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-9.3.1.tgz#1e19f5f290afcc9c46973d68700cbd21a96192e4"
   integrity sha512-4Q16ZCqq3g8awk6UplT7AuxQ35XN4R/yf/+wSAwcBUAjg7l58RTactWaP8fIDTi0FzI7YcVLujwExakZlfWkXg==
@@ -8711,14 +8711,14 @@ rc@^1.0.1, rc@^1.1.6, rc@^1.2.7:
     minimist "^1.2.0"
     strip-json-comments "~2.0.1"
 
-re2@~1.18.0:
+re2@~1.18.3:
-  version "1.18.0"
+  version "1.18.3"
-  resolved "https://registry.yarnpkg.com/re2/-/re2-1.18.0.tgz#6d6f47c5aaa436eb7a7d68b260f8cf25d7948619"
+  resolved "https://registry.yarnpkg.com/re2/-/re2-1.18.3.tgz#64120f3990351e6d71207b095a92ebc41f123c7f"
-  integrity sha512-MoCYZlJ9YUgksND9asyNF2/x532daXU/ARp1UeJbQ5flMY6ryKNEhrWt85aw3YluzOJlC3vXpGgK2a1jb0b4GA==
+  integrity sha512-QAUSIl5znNR/GOXLIUWWao0pPQ2VZU/t9u+0j17x7lXXypPsil8iuYBsSuMDZ3TGx439332tYdh0d9Nt8XGbHg==
   dependencies:
-    install-artifact-from-github "^1.3.1"
+    install-artifact-from-github "^1.3.3"
     nan "^2.17.0"
-    node-gyp "^9.3.0"
+    node-gyp "^9.3.1"
 
 reachable-url@~1.7.1:
   version "1.7.1"

cypress/cypress.config.js

@@ -0,0 +1,53 @@
+const dotenv = require('dotenv')
+const { defineConfig } = require("cypress");
+const browserify = require("@badeball/cypress-cucumber-preprocessor/browserify");
+const { addCucumberPreprocessorPlugin } = require("@badeball/cypress-cucumber-preprocessor");
+
+// Test persistent(between commands) store
+const testStore = {}
+
+async function setupNodeEvents(on, config) {
+  await addCucumberPreprocessorPlugin(on, config);
+
+  on("file:preprocessor", browserify.default(config));
+
+  on("task", {
+    pushValue({ name, value }) {
+      testStore[name] = value
+      return true
+    },
+    getValue(name) {
+      console.log("getValue",name,testStore)
+      return testStore[name]
+    },
+  });
+
+  on("after:run", (results) => {
+    if (results) {
+      console.log(results.status);
+    }
+  });
+
+  return config;
+}
+
+// Import backend .env (smart)?
+const { parsed } = dotenv.config({ path: '../backend/.env' })
+
+module.exports = defineConfig({
+  e2e: {
+    projectId: "qa7fe2",
+    defaultCommandTimeout: 10000,
+    chromeWebSecurity: false,
+    baseUrl: "http://localhost:3000",
+    specPattern: "cypress/e2e/**/*.feature",
+    supportFile: "cypress/support/e2e.js",
+    retries: {
+      runMode: 2,
+      openMode: 0,
+    },
+    video: false,
+    setupNodeEvents,
+  },
+  env: parsed
+});

cypress/cypress.json

@@ -1,12 +0,0 @@
-{
-  "projectId": "qa7fe2",
-  "defaultCommandTimeout": 10000,
-  "ignoreTestFiles": "*.js",
-  "chromeWebSecurity": false,
-  "baseUrl": "http://localhost:3000",
-  "video":false,
-  "retries": {
-    "runMode": 2,
-    "openMode": 0
-  }
-}

cypress/e2e/User.Authentication.feature

@@ -22,5 +22,6 @@ Feature: User authentication
 
   Scenario: Log out
     Given I am logged in as "peter-pan"
-    When I log out
+    When I navigate to page "/"
+    And I log out
     Then I am on page "login"

cypress/integration/User.SettingNotifications/I_click_save.js

@@ -1,5 +0,0 @@
-import { Then } from "cypress-cucumber-preprocessor/steps";
-
-Then("I click save", () => {
-  cy.get(".save-button").click()
-})

cypress/integration/User.SettingNotifications/I_click_the_checkbox_show_donations_progress_bar_and_save.js

@@ -1,6 +0,0 @@
-import { Then } from "cypress-cucumber-preprocessor/steps";
-
-Then("I click the checkbox show donations progress bar and save", () => {
-  cy.get("#showDonations").click()
-  cy.get(".donations-info-button").click()
-})

cypress/integration/UserProfile.ChangePassword/I_submit_the_form.js

@@ -1,5 +0,0 @@
-import { When } from "cypress-cucumber-preprocessor/steps";
-
-When("I submit the form", () => {
-  cy.get("form").submit();
-});

cypress/integration/common/I_navigate_to_page_{string}.js

@@ -1,5 +0,0 @@
-import { Given } from "cypress-cucumber-preprocessor/steps";
-
-Given("I navigate to page {string}", page => {
-  cy.visit(page);
-});

cypress/integration/common/I_refresh_the_page.js

@@ -1,6 +0,0 @@
-import { When } from "cypress-cucumber-preprocessor/steps";
-
-When('I refresh the page', () => {
-  cy.visit('/')
-    .reload();
-});

cypress/integration/common/I_wait_for_{int}_milliseconds.js

@@ -1,5 +0,0 @@
-import { When } from "cypress-cucumber-preprocessor/steps";
-
-When("I wait for {int} milliseconds", time => {
-  cy.wait(time)
-});

cypress/parallel-features.sh

@@ -8,10 +8,10 @@ CUR_JOB=$(expr $1 - 1)
 MAX_JOBS=$2
 
 # Features
-FEATURE_LIST=( $(find cypress/integration/ -maxdepth 1 -name "*.feature") )
+FEATURE_LIST=( $(find cypress/e2e/ -maxdepth 1 -name "*.feature") )
 
 # Calculation
-MAX_FEATURES=$(find cypress/integration/ -maxdepth 1 -name "*.feature" -print | wc -l)
+MAX_FEATURES=$(find cypress/e2e/ -maxdepth 1 -name "*.feature" -print | wc -l)
 # adds overhead features to the first jobs
 if [[ $CUR_JOB -lt $(expr ${MAX_FEATURES} % ${MAX_JOBS}) ]]
 then

cypress/plugins/index.js

@@ -1,41 +0,0 @@
-// ***********************************************************
-// This example plugins/index.js can be used to load plugins
-//
-// You can change the location of this file or turn off loading
-// the plugins file with the 'pluginsFile' configuration option.
-//
-// You can read more here:
-// https://on.cypress.io/plugins-guide
-// ***********************************************************
-
-// This function is called when a project is opened or re-opened (e.g. due to
-// the project's config changing)
-
-
-const cucumber = require('cypress-cucumber-preprocessor').default
-const dotenv = require('dotenv')
-
-// Import backend .env (smart)?
-const { parsed } = dotenv.config({ path: require.resolve('../../backend/.env') })
-
-// Test persistent(between commands) store
-const testStore = {}
-
-module.exports = (on, config) => {
-  config.env.NEO4J_URI = parsed.NEO4J_URI
-  config.env.NEO4J_USERNAME = parsed.NEO4J_USERNAME
-  config.env.NEO4J_PASSWORD = parsed.NEO4J_PASSWORD
-  config.env.JWT_SECRET = parsed.JWT_SECRET
-  on('file:preprocessor', cucumber())
-  on('task', {
-    pushValue({ name, value }) {
-      testStore[name] = value
-      return true
-    },
-    getValue(name) {
-      console.log("getValue",name,testStore)
-      return testStore[name]
-    },
-  })
-  return config
-}

cypress/support/commands.js

@@ -15,7 +15,7 @@
 /* globals Cypress cy */
 import "cypress-file-upload";
 import { GraphQLClient, request } from 'graphql-request'
-import config from '../../backend/src/config'
+import CONFIG from '../../backend/src/config'
 
 const authenticatedHeaders = (variables) => {
   const mutation = `
@@ -24,7 +24,7 @@ const authenticatedHeaders = (variables) => {
     }
   `
   return new Cypress.Promise((resolve, reject) => {
-    request(config.GRAPHQL_URI, mutation, variables).then((response) => {
+    request(CONFIG.GRAPHQL_URI, mutation, variables).then((response) => {
       resolve({ authorization: `Bearer ${response.login}` })
     })
   })
@@ -40,7 +40,7 @@ Cypress.Commands.add(
   ({email, password}) => {
     return new Cypress.Promise((resolve, reject) => {
       authenticatedHeaders({ email, password }).then((headers) => {
-        resolve(new GraphQLClient(config.GRAPHQL_URI, { headers }))
+        resolve(new GraphQLClient(CONFIG.GRAPHQL_URI, { headers }))
       })
     })
   })

cypress/support/factories.js

@@ -1,13 +1,7 @@
 import Factory from '../../backend/src/db/factories'
 import { getNeode } from '../../backend/src/db/neo4j'
 
-
+const neodeInstance = getNeode()
-const neo4jConfigs = {
-  uri: Cypress.env('NEO4J_URI'),
-  username: Cypress.env('NEO4J_USERNAME'),
-  password: Cypress.env('NEO4J_PASSWORD')
-}
-const neodeInstance = getNeode(neo4jConfigs)
 
 beforeEach(() => cy.then(() => neodeInstance.cypher('MATCH (everything) DETACH DELETE everything;')))
 
@@ -16,7 +10,7 @@ Cypress.Commands.add('neode', () => {
 })
 
 Cypress.Commands.add(
-  'first',
+  'firstOf',
   { prevSubject: true },
   (neode, model, properties) => {
     return neode.first(model, properties)

cypress/support/step_definitions/Admin.DonationInfo/the_donation_info_contains_goal_{string}_and_progress_{string}.js

@@ -1,4 +1,4 @@
-import { When } from "cypress-cucumber-preprocessor/steps";
+import { When } from "@badeball/cypress-cucumber-preprocessor";
 
 When("the donation info contains goal {string} and progress {string}", (goal, progress) => {
   cy.get('.top-info-bar')

cypress/support/step_definitions/Admin.DonationInfo/the_donation_info_is_{string}.js

@@ -1,4 +1,4 @@
-import { Then } from "cypress-cucumber-preprocessor/steps";
+import { Then } from "@badeball/cypress-cucumber-preprocessor";
 
 Then("the donation info is {string}", (visibility) => {
   cy.get('.top-info-bar')

cypress/support/step_definitions/Admin.PinPost/I_open_the_content_menu_of_post_{string}.js

@@ -1,4 +1,4 @@
-import { When } from "cypress-cucumber-preprocessor/steps";
+import { When } from "@badeball/cypress-cucumber-preprocessor";
 
 When("I open the content menu of post {string}", (title) => {
   cy.contains('.post-teaser', title)

cypress/support/step_definitions/Admin.PinPost/the_post_with_title_{string}_has_a_ribbon_for_pinned_posts.js

@@ -1,4 +1,4 @@
-import { Then } from "cypress-cucumber-preprocessor/steps";
+import { Then } from "@badeball/cypress-cucumber-preprocessor";
 
 Then("the post with title {string} has a ribbon for pinned posts", (title) => {
   cy.get(".post-teaser").contains(title)

cypress/support/step_definitions/Admin.PinPost/there_is_no_button_to_pin_a_post.js

@@ -1,4 +1,4 @@
-import { Then } from "cypress-cucumber-preprocessor/steps";
+import { Then } from "@badeball/cypress-cucumber-preprocessor";
 
 Then("there is no button to pin a post", () => {
   cy.get("a.ds-menu-item-link")

cypress/support/step_definitions/Internationalization/I_see_a_button_with_the_label_{string}.js

@@ -1,4 +1,4 @@
-import { Then } from "cypress-cucumber-preprocessor/steps";
+import { Then } from "@badeball/cypress-cucumber-preprocessor";
 
 Then("I see a button with the label {string}", label => {
   cy.contains("button", label);

cypress/support/step_definitions/Internationalization/I_select_{string}_in_the_language_menu.js

@@ -1,4 +1,4 @@
-import { When } from "cypress-cucumber-preprocessor/steps";
+import { When } from "@badeball/cypress-cucumber-preprocessor";
 
 When("I select {string} in the language menu", language => {
     cy.get(".locale-menu")

cypress/support/step_definitions/Internationalization/the_whole_user_interface_appears_in_{string}.js

@@ -1,5 +1,5 @@
-import { Then } from "cypress-cucumber-preprocessor/steps";
+import { Then } from "@badeball/cypress-cucumber-preprocessor";
-import locales from '../../../webapp/locales'
+import locales from '../../../../webapp/locales'
 
 Then("the whole user interface appears in {string}", language => {
   const { code } = locales.find((entry) => entry.name === language);

cypress/support/step_definitions/Moderation.HidePost/I_should_see_only_{int}_posts_on_the_newsfeed.js

@@ -1,4 +1,4 @@
-import { Then } from "cypress-cucumber-preprocessor/steps";
+import { Then } from "@badeball/cypress-cucumber-preprocessor";
 
 Then("I should see only {int} posts on the newsfeed", posts => {
   cy.get(".post-teaser")

cypress/support/step_definitions/Moderation.HidePost/the_page_{string}_returns_a_404_error_with_a_message.js

@@ -1,4 +1,4 @@
-import { Then } from "cypress-cucumber-preprocessor/steps";
+import { Then } from "@badeball/cypress-cucumber-preprocessor";
 
 Then("the page {string} returns a 404 error with a message:", (route, message) => {
   cy.request({

cypress/support/step_definitions/Moderation.ReportContent/I_can_t_see_the_moderation_menu_item.js

@@ -1,4 +1,4 @@
-import { Then } from "cypress-cucumber-preprocessor/steps";
+import { Then } from "@badeball/cypress-cucumber-preprocessor";
 
 Then(`I can't see the moderation menu item`, () => {
   cy.get('.avatar-menu-popover')

cypress/support/step_definitions/Moderation.ReportContent/I_can_visit_the_post_page.js

@@ -1,4 +1,4 @@
-import { Then } from "cypress-cucumber-preprocessor/steps";
+import { Then } from "@badeball/cypress-cucumber-preprocessor";
 
 Then('I can visit the post page', () => {
   cy.contains('Fake news').click()

cypress/support/step_definitions/Moderation.ReportContent/I_click_on_Report_Post_from_the_content_menu_of_the_post.js

@@ -1,9 +1,9 @@
-import { When } from "cypress-cucumber-preprocessor/steps";
+import { When } from "@badeball/cypress-cucumber-preprocessor";
 
 When('I click on "Report Post" from the content menu of the post', () => {
   cy.contains('.base-card', 'The Truth about the Holocaust')
     .find('.content-menu .base-button')
-    .click({force: true})
+    .click()
   
   cy.get('.popover .ds-menu-item-link')
     .contains('Report Post')

cypress/support/step_definitions/Moderation.ReportContent/I_click_on_the_author.js

@@ -1,4 +1,4 @@
-import { When } from "cypress-cucumber-preprocessor/steps";
+import { When } from "@badeball/cypress-cucumber-preprocessor";
 
 When('I click on the author', () => {
   cy.get('[data-test="avatarUserLink"]')

cypress/support/step_definitions/Moderation.ReportContent/I_click_on_the_avatar_menu_in_the_top_right_corner.js

@@ -1,4 +1,4 @@
-import { When } from "cypress-cucumber-preprocessor/steps";
+import { When } from "@badeball/cypress-cucumber-preprocessor";
 
 When("I click on the avatar menu in the top right corner", () => {
   cy.get(".avatar-menu").click();

cypress/support/step_definitions/Moderation.ReportContent/I_confirm_the_reporting_dialog.js

@@ -1,4 +1,4 @@
-import { When } from "cypress-cucumber-preprocessor/steps";
+import { When } from "@badeball/cypress-cucumber-preprocessor";
 
 When(/^I confirm the reporting dialog .*:$/, message => {
   cy.contains(message) // wait for element to become visible

cypress/support/step_definitions/Moderation.ReportContent/I_see_all_the_reported_posts_including_from_the_user_who_muted_me.js

@@ -1,4 +1,4 @@
-import { Then } from "cypress-cucumber-preprocessor/steps";
+import { Then } from "@badeball/cypress-cucumber-preprocessor";
 
 Then('I see all the reported posts including from the user who muted me', () => {
   cy.get('table tbody').within(() => {

cypress/support/step_definitions/Moderation.ReportContent/I_see_all_the_reported_posts_including_the_one_from_above.js

@@ -1,4 +1,4 @@
-import { Then } from "cypress-cucumber-preprocessor/steps";
+import { Then } from "@badeball/cypress-cucumber-preprocessor";
 
 Then('I see all the reported posts including the one from above', () => {
   cy.get('table tbody').within(() => {

cypress/support/step_definitions/Moderation.ReportContent/each_list_item_links_to_the_post_page.js

@@ -1,4 +1,4 @@
-import { Then } from "cypress-cucumber-preprocessor/steps";
+import { Then } from "@badeball/cypress-cucumber-preprocessor";
 
 Then('each list item links to the post page', () => {
   cy.contains('The Truth about the Holocaust').click();

cypress/support/step_definitions/Moderation.ReportContent/somebody_reported_the_following_posts.js

@@ -1,4 +1,4 @@
-import { Given } from "cypress-cucumber-preprocessor/steps";
+import { Given } from "@badeball/cypress-cucumber-preprocessor";
 
 Given('somebody reported the following posts:', table => {
   table.hashes().forEach(({ submitterEmail, resourceId, reasonCategory, reasonDescription }) => {

cypress/support/step_definitions/Moderation.ReportContent/there_is_an_annoying_user_who_has_muted_me.js

@@ -1,11 +1,13 @@
+import { Given } from "@badeball/cypress-cucumber-preprocessor";
+
 Given("there is an annoying user who has muted me", () => {
   cy.neode()
-    .first("User", {
+    .firstOf("User", {
       role: 'moderator'
     })
     .then(mutedUser => {
       cy.neode()
-        .first("User", {
+        .firstOf("User", {
           id: 'user'
         })
       .relateTo(mutedUser, "muted");

cypress/support/step_definitions/Notification.Mention/I_start_to_write_a_new_post_with_the_title_{string}_beginning_with.js

@@ -1,4 +1,4 @@
-import { When } from "cypress-cucumber-preprocessor/steps";
+import { When } from "@badeball/cypress-cucumber-preprocessor";
 
 When("I start to write a new post with the title {string} beginning with:", (title, intro) => {
   cy.get('input[name="title"]')

cypress/support/step_definitions/Notification.Mention/mention_{string}_in_the_text.js

@@ -1,4 +1,4 @@
-import { When } from "cypress-cucumber-preprocessor/steps";
+import { When } from "@badeball/cypress-cucumber-preprocessor";
 
 When("mention {string} in the text", mention => {
   cy.get(".ProseMirror")

cypress/support/step_definitions/Notification.Mention/open_the_notification_menu_and_click_on_the_first_item.js

@@ -1,4 +1,4 @@
-import { When } from "cypress-cucumber-preprocessor/steps";
+import { When } from "@badeball/cypress-cucumber-preprocessor";
 
 When("open the notification menu and click on the first item", () => {
   cy.get(".notifications-menu")

cypress/support/step_definitions/Notification.Mention/see_{int}_unread_notifications_in_the_top_menu.js

@@ -1,4 +1,4 @@
-import { Then } from "cypress-cucumber-preprocessor/steps";
+import { Then } from "@badeball/cypress-cucumber-preprocessor";
 
 Then("see {int} unread notifications in the top menu", count => {
   cy.get(".notifications-menu")

cypress/support/step_definitions/Notification.Mention/the_notification_menu_button_links_to_the_all_notifications_page.js

@@ -1,4 +1,4 @@
-import { Then } from "cypress-cucumber-preprocessor/steps";
+import { Then } from "@badeball/cypress-cucumber-preprocessor";
 
 Then("the notification menu button links to the all notifications page", () => {
   cy.get(".notifications-menu")

cypress/support/step_definitions/Notification.Mention/the_unread_counter_is_removed.js

@@ -1,4 +1,4 @@
-import { Then } from "cypress-cucumber-preprocessor/steps";
+import { Then } from "@badeball/cypress-cucumber-preprocessor";
 
 Then("the unread counter is removed", () => {
   cy.get('.notifications-menu .counter-icon')

cypress/support/step_definitions/Post.Comment/I_comment_the_following.js

@@ -1,4 +1,4 @@
-import { When } from "cypress-cucumber-preprocessor/steps";
+import { When } from "@badeball/cypress-cucumber-preprocessor";
 
 When("I comment the following:", async text => {
   const comment = text.replace("\n", " ")

cypress/support/step_definitions/Post.Comment/I_should_see_an_abbreviated_version_of_my_comment.js

@@ -1,4 +1,4 @@
-import { Then } from "cypress-cucumber-preprocessor/steps";
+import { Then } from "@badeball/cypress-cucumber-preprocessor";
 
 Then("I should see an abbreviated version of my comment", () => {
   cy.get("article.comment-card")

cypress/support/step_definitions/Post.Comment/I_should_see_my_comment.js

@@ -1,4 +1,4 @@
-import { Then } from "cypress-cucumber-preprocessor/steps";
+import { Then } from "@badeball/cypress-cucumber-preprocessor";
 
 Then("I should see my comment", () => {
   cy.get("article.comment-card p")

cypress/support/step_definitions/Post.Comment/I_should_see_the_entirety_of_my_comment.js

@@ -1,4 +1,4 @@
-import { Then } from "cypress-cucumber-preprocessor/steps";
+import { Then } from "@badeball/cypress-cucumber-preprocessor";
 
 Then("I should see the entirety of my comment", () => {
   cy.get("article.comment-card")

cypress/support/step_definitions/Post.Comment/I_type_in_a_comment_with_{int}_characters.js

@@ -1,4 +1,4 @@
-import { When } from "cypress-cucumber-preprocessor/steps";
+import { When } from "@badeball/cypress-cucumber-preprocessor";
 
 When("I type in a comment with {int} characters", size => {
   var c="";

cypress/support/step_definitions/Post.Comment/it_should_create_a_mention_in_the_CommentForm.js

@@ -1,4 +1,4 @@
-import { Then } from "cypress-cucumber-preprocessor/steps";
+import { Then } from "@badeball/cypress-cucumber-preprocessor";
 
 Then("it should create a mention in the CommentForm", () => {
   cy.get(".ProseMirror a")

cypress/support/step_definitions/Post.Comment/my_comment_should_be_successfully_created.js

@@ -1,4 +1,4 @@
-import { Then } from "cypress-cucumber-preprocessor/steps";
+import { Then } from "@badeball/cypress-cucumber-preprocessor";
 
 Then("my comment should be successfully created", () => {
   cy.get(".iziToast-message").contains("Comment submitted!");

cypress/support/step_definitions/Post.Comment/the_editor_should_be_cleared.js

@@ -1,4 +1,4 @@
-import { Then } from "cypress-cucumber-preprocessor/steps";
+import { Then } from "@badeball/cypress-cucumber-preprocessor";
 
 Then("the editor should be cleared", () => {
   cy.get(".ProseMirror p").should("have.class", "is-empty");

cypress/support/step_definitions/Post.Create/I_choose_{string}_as_the_title.js

@@ -1,4 +1,4 @@
-import { When } from "cypress-cucumber-preprocessor/steps";
+import { When } from "@badeball/cypress-cucumber-preprocessor";
 
 When("I choose {string} as the title", async title => {
   const lastPost = {}

cypress/support/step_definitions/Post.Create/the_post_was_saved_successfully.js

@@ -1,4 +1,4 @@
-import { Then } from "cypress-cucumber-preprocessor/steps";
+import { Then } from "@badeball/cypress-cucumber-preprocessor";
 
 Then("the post was saved successfully", async () => {
   cy.task('getValue', 'lastPost').then(lastPost => {

cypress/support/step_definitions/Post.Images/I_add_all_required_fields.js

@@ -1,4 +1,4 @@
-import { Then } from "cypress-cucumber-preprocessor/steps";
+import { Then } from "@badeball/cypress-cucumber-preprocessor";
 
 Then("I add all required fields", () => {
   cy.get('input[name="title"]')

cypress/support/step_definitions/Post.Images/I_should_be_able_to_{string}_a_teaser_image.js

@@ -1,4 +1,4 @@
-import { Then } from "cypress-cucumber-preprocessor/steps";
+import { Then } from "@badeball/cypress-cucumber-preprocessor";
 
 Then("I should be able to {string} a teaser image", condition => {
   // cy.reload()

cypress/support/step_definitions/Post.Images/my_post_has_a_teaser_image.js

@@ -1,4 +1,4 @@
-import { When } from "cypress-cucumber-preprocessor/steps";
+import { When } from "@badeball/cypress-cucumber-preprocessor";
 
 When('my post has a teaser image', () => {
   cy.get('.contribution-form .image')

cypress/support/step_definitions/Post.Images/the_first_image_should_not_be_displayed_anymore.js

@@ -1,4 +1,4 @@
-import { Then } from "cypress-cucumber-preprocessor/steps";
+import { Then } from "@badeball/cypress-cucumber-preprocessor";
 
 Then("the first image should not be displayed anymore", () => {
   cy.get(".hero-image")

cypress/support/step_definitions/Post.Images/the_post_was_saved_successfully_with_the_{string}_teaser_image.js

@@ -1,4 +1,4 @@
-import { Then } from "cypress-cucumber-preprocessor/steps";
+import { Then } from "@badeball/cypress-cucumber-preprocessor";
 
 Then("the post was saved successfully with the {string} teaser image", condition => {
   cy.get(".base-card > .title")

cypress/support/step_definitions/Post.Images/the_{string}_post_was_saved_successfully_without_a_teaser_image.js

@@ -1,4 +1,4 @@
-import { Then } from "cypress-cucumber-preprocessor/steps";
+import { Then } from "@badeball/cypress-cucumber-preprocessor";
 
 Then('the {string} post was saved successfully without a teaser image', condition => {
   cy.get(".base-card > .title")

cypress/support/step_definitions/Post/the_post_shows_up_on_the_newsfeed_at_position_{int}.js

@@ -1,4 +1,4 @@
-import { Then } from "cypress-cucumber-preprocessor/steps";
+import { Then } from "@badeball/cypress-cucumber-preprocessor";
 
 Then("the post shows up on the newsfeed at position {int}", index => {
   const selector = `.post-teaser:nth-child(${index}) > .base-card`;

cypress/support/step_definitions/Search/I_select_a_post_entry.js

@@ -1,4 +1,4 @@
-import { When } from "cypress-cucumber-preprocessor/steps";
+import { When } from "@badeball/cypress-cucumber-preprocessor";
 
 When("I select a post entry", () => {
   cy.get(".searchable-input .search-post")

cypress/support/step_definitions/Search/I_select_a_user_entry.js

@@ -1,4 +1,4 @@
-import { Then } from "cypress-cucumber-preprocessor/steps";
+import { Then } from "@badeball/cypress-cucumber-preprocessor";
 
 Then("I select a user entry", () => {
   cy.get(".searchable-input .user-teaser")

cypress/support/step_definitions/Search/I_should_have_one_item_in_the_select_dropdown.js

@@ -1,4 +1,4 @@
-import { Then } from "cypress-cucumber-preprocessor/steps";
+import { Then } from "@badeball/cypress-cucumber-preprocessor";
 
 Then("I should have one item in the select dropdown", () => {
   cy.get(".searchable-input .ds-select-dropdown").should($li => {

cypress/support/step_definitions/Search/I_should_not_see_posts_without_the_searched-for_term_in_the_select_dropdown.js

@@ -1,4 +1,4 @@
-import { Then } from "cypress-cucumber-preprocessor/steps";
+import { Then } from "@badeball/cypress-cucumber-preprocessor";
 
 Then("I should not see posts without the searched-for term in the select dropdown", () => {
   cy.get(".ds-select-dropdown")

cypress/support/step_definitions/Search/I_should_see_posts_with_the_searched-for_term_in_the_select_dropdown.js

@@ -1,4 +1,4 @@
-import { Then } from "cypress-cucumber-preprocessor/steps";
+import { Then } from "@badeball/cypress-cucumber-preprocessor";
 
 Then("I should see posts with the searched-for term in the select dropdown", () => {
   cy.get(".ds-select-dropdown")

cypress/support/step_definitions/Search/I_should_see_the_following_posts_on_the_search_results_page.js

@@ -1,4 +1,4 @@
-import { Then } from "cypress-cucumber-preprocessor/steps";
+import { Then } from "@badeball/cypress-cucumber-preprocessor";
 
 Then("I should see the following posts on the search results page:", table => {
   table.hashes().forEach(({ title }) => {  

cypress/support/step_definitions/Search/I_should_see_the_following_users_in_the_select_dropdown.js

@@ -1,4 +1,4 @@
-import { Then } from "cypress-cucumber-preprocessor/steps";
+import { Then } from "@badeball/cypress-cucumber-preprocessor";
 
 Then("I should see the following users in the select dropdown:", table => {
   cy.get(".search-heading").should("contain", "Users");

cypress/support/step_definitions/Search/I_type_{string}_and_press_Enter.js

@@ -1,4 +1,4 @@
-import { When } from "cypress-cucumber-preprocessor/steps";
+import { When } from "@badeball/cypress-cucumber-preprocessor";
 
 When("I type {string} and press Enter", value => {
   cy.get(".searchable-input .ds-select input")

cypress/support/step_definitions/Search/I_type_{string}_and_press_escape.js

@@ -1,4 +1,4 @@
-import { When } from "cypress-cucumber-preprocessor/steps";
+import { When } from "@badeball/cypress-cucumber-preprocessor";
 
 When("I type {string} and press escape", value => {
   cy.get(".searchable-input .ds-select input")

cypress/support/step_definitions/Search/the_search_field_should_clear.js

@@ -1,4 +1,4 @@
-import { Then } from "cypress-cucumber-preprocessor/steps";
+import { Then } from "@badeball/cypress-cucumber-preprocessor";
 
 Then("the search field should clear", () => {
   cy.get(".searchable-input .ds-select input")

cypress/support/step_definitions/Search/the_search_parameter_equals_{string}.js

@@ -1,4 +1,4 @@
-import { Then } from "cypress-cucumber-preprocessor/steps";
+import { Then } from "@badeball/cypress-cucumber-preprocessor";
 
 Then("the search parameter equals {string}", search => {
   cy.location("search")

cypress/support/step_definitions/User.Authentication/I_am_logged_in_with_username_{string}.js

@@ -1,4 +1,4 @@
-import { Then } from "cypress-cucumber-preprocessor/steps";
+import { Then } from "@badeball/cypress-cucumber-preprocessor";
 
 Then("I am logged in with username {string}", name => {
   cy.get(".avatar-menu").click();

cypress/support/step_definitions/User.Block/I_block_the_user_{string}.js

@@ -1,11 +1,11 @@
-import { When } from "cypress-cucumber-preprocessor/steps";
+import { When } from "@badeball/cypress-cucumber-preprocessor";
 
 When("I block the user {string}", name => {
   cy.neode()
-    .first("User", { name })
+    .firstOf("User", { name })
     .then(blockedUser => {
       cy.neode()
-        .first("User", {id: "id-of-peter-pan"})
+        .firstOf("User", {id: "id-of-peter-pan"})
         .relateTo(blockedUser, "blocked");
     });
 });

cypress/support/step_definitions/User.Block/I_should_not_see_{string}_button.js

@@ -1,4 +1,4 @@
-import { Then } from "cypress-cucumber-preprocessor/steps";
+import { Then } from "@badeball/cypress-cucumber-preprocessor";
 
 Then('I should not see {string} button', button => {
   cy.get('.base-card .action-buttons')

cypress/support/step_definitions/User.Block/I_should_see_no_users_in_my_blocked_users_list.js

@@ -1,4 +1,4 @@
-import { Then } from "cypress-cucumber-preprocessor/steps";
+import { Then } from "@badeball/cypress-cucumber-preprocessor";
 
 Then("I should see no users in my blocked users list", () => {
   cy.get('.ds-placeholder')