From 1acf109dbac117d08b845aec6fa803acb50379e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Wed, 15 May 2019 16:48:50 +0200
Subject: [PATCH 01/20] Implemented Menus, Unit Tests and created and
 refactored localisations

---
 webapp/components/ContentMenu.vue           | 20 ++++--
 webapp/components/Modal/DeleteModal.spec.js | 73 +++++++++++++++++----
 webapp/components/Modal/DeleteModal.vue     | 42 ++++++++----
 webapp/locales/de.json                      | 40 +++++++----
 webapp/locales/en.json                      | 46 ++++++++-----
 5 files changed, 163 insertions(+), 58 deletions(-)

diff --git a/webapp/components/ContentMenu.vue b/webapp/components/ContentMenu.vue
index 29473d6b2..effc801ea 100644
--- a/webapp/components/ContentMenu.vue
+++ b/webapp/components/ContentMenu.vue
@@ -68,7 +68,7 @@ export default {
 
       if (this.isOwner && this.resourceType === 'contribution') {
         routes.push({
-          name: this.$t(`contribution.edit`),
+          name: this.$t(`post.menu.edit`),
           path: this.$router.resolve({
             name: 'post-edit-id',
             params: {
@@ -78,21 +78,29 @@ export default {
           icon: 'edit'
         })
         routes.push({
-          name: this.$t(`post.delete.title`),
+          name: this.$t(`post.menu.delete`),
           callback: () => {
             this.openModal('delete')
           },
           icon: 'trash'
         })
       }
+
       if (this.isOwner && this.resourceType === 'comment') {
+        // routes.push({
+        //   name: this.$t(`comment.menu.edit`),
+        //   callback: () => {
+        //     /* eslint-disable-next-line no-console */
+        //     console.log('EDIT COMMENT')
+        //   },
+        //   icon: 'edit'
+        // })
         routes.push({
-          name: this.$t(`comment.edit`),
+          name: this.$t(`comment.menu.delete`),
           callback: () => {
-            /* eslint-disable-next-line no-console */
-            console.log('EDIT COMMENT')
+            this.openModal('delete')
           },
-          icon: 'edit'
+          icon: 'trash'
         })
       }
 
diff --git a/webapp/components/Modal/DeleteModal.spec.js b/webapp/components/Modal/DeleteModal.spec.js
index e52c252ca..6127607a9 100644
--- a/webapp/components/Modal/DeleteModal.spec.js
+++ b/webapp/components/Modal/DeleteModal.spec.js
@@ -22,7 +22,7 @@ describe('DeleteModal.vue', () => {
   beforeEach(() => {
     propsData = {
       type: 'contribution',
-      id: 'c300'
+      id: 'p23'
     }
     mocks = {
       $t: jest.fn(),
@@ -40,7 +40,7 @@ describe('DeleteModal.vue', () => {
   })
 
   describe('shallowMount', () => {
-    const Wrapper = () => {
+    Wrapper = () => {
       return shallowMount(DeleteModal, { propsData, mocks, localVue, router })
     }
 
@@ -57,8 +57,8 @@ describe('DeleteModal.vue', () => {
     describe('given a post', () => {
       beforeEach(() => {
         propsData = {
+          type: 'contribution',
           id: 'p23',
-          type: 'post',
           name: 'It is a post'
         }
       })
@@ -66,14 +66,35 @@ describe('DeleteModal.vue', () => {
       it('mentions post title', () => {
         Wrapper()
         const calls = mocks.$t.mock.calls
-        const expected = [['post.delete.message', { name: 'It is a post' }]]
+        const expected = [
+          ['delete.contribution.message', { name: 'It is a post' }]
+        ]
+        expect(calls).toEqual(expect.arrayContaining(expected))
+      })
+    })
+
+    describe('given a comment', () => {
+      beforeEach(() => {
+        propsData = {
+          type: 'comment',
+          id: 'c3',
+          name: 'It is the user of the comment'
+        }
+      })
+
+      it('mentions comments user name', () => {
+        Wrapper()
+        const calls = mocks.$t.mock.calls
+        const expected = [
+          ['delete.comment.message', { name: 'It is the user of the comment' }]
+        ]
         expect(calls).toEqual(expect.arrayContaining(expected))
       })
     })
   })
 
   describe('mount', () => {
-    const Wrapper = () => {
+    Wrapper = () => {
       return mount(DeleteModal, { propsData, mocks, localVue, router })
     }
 
@@ -83,16 +104,16 @@ describe('DeleteModal.vue', () => {
       expect(Wrapper().is('div')).toBe(true)
     })
 
-    describe('given id', () => {
+    describe('given post id', () => {
       beforeEach(() => {
         propsData = {
-          type: 'user',
-          id: 'u3'
+          type: 'contribution',
+          id: 'p23'
         }
         wrapper = Wrapper()
       })
 
-      describe('click cancel button', () => {
+      describe('click cancel button and do not delete the post', () => {
         beforeEach(() => {
           wrapper = Wrapper()
           wrapper.find('button.cancel').trigger('click')
@@ -115,7 +136,7 @@ describe('DeleteModal.vue', () => {
         })
       })
 
-      describe('click confirm button', () => {
+      describe('click confirm button and delete the post', () => {
         beforeEach(() => {
           wrapper.find('button.confirm').trigger('click')
         })
@@ -130,7 +151,7 @@ describe('DeleteModal.vue', () => {
 
         it('displays a success message', () => {
           const calls = mocks.$t.mock.calls
-          const expected = [['post.delete.success']]
+          const expected = [['delete.contribution.success']]
           expect(calls).toEqual(expect.arrayContaining(expected))
         })
 
@@ -151,5 +172,35 @@ describe('DeleteModal.vue', () => {
         })
       })
     })
+
+    describe('given comment id', () => {
+      beforeEach(() => {
+        propsData = {
+          type: 'comment',
+          id: 'c3'
+        }
+        wrapper = Wrapper()
+      })
+
+      describe('click confirm button and delete the comment', () => {
+        beforeEach(() => {
+          wrapper.find('button.confirm').trigger('click')
+        })
+
+        it('calls delete mutation', () => {
+          expect(mocks.$apollo.mutate).toHaveBeenCalled()
+        })
+
+        it('sets success', () => {
+          expect(wrapper.vm.success).toBe(true)
+        })
+
+        it('displays a success message', () => {
+          const calls = mocks.$t.mock.calls
+          const expected = [['delete.comment.success']]
+          expect(calls).toEqual(expect.arrayContaining(expected))
+        })
+      })
+    })
   })
 })
diff --git a/webapp/components/Modal/DeleteModal.vue b/webapp/components/Modal/DeleteModal.vue
index 0f9fc0d7b..8154937db 100644
--- a/webapp/components/Modal/DeleteModal.vue
+++ b/webapp/components/Modal/DeleteModal.vue
@@ -25,7 +25,7 @@
         icon="close"
         @click="cancel"
       >
-        {{ $t('post.delete.cancel') }}
+        {{ $t(`delete.cancel`) }}
       </ds-button>
 
       <ds-button
@@ -35,7 +35,7 @@
         :loading="loading"
         @click="confirm"
       >
-        {{ $t('post.delete.submit') }}
+        {{ $t(`delete.submit`) }}
       </ds-button>
     </template>
   </ds-modal>
@@ -64,11 +64,11 @@ export default {
   },
   computed: {
     title() {
-      return this.$t(`post.delete.title`)
+      return this.$t(`delete.${this.type}.title`)
     },
     message() {
       const name = this.$filters.truncate(this.name, 30)
-      return this.$t(`post.delete.message`, { name })
+      return this.$t(`delete.${this.type}.message`, { name })
     }
   },
   methods: {
@@ -79,22 +79,40 @@ export default {
       }, 1000)
     },
     async confirm() {
+      var gqlMutation
+
       this.loading = true
       try {
-        await this.$apollo.mutate({
-          mutation: gql`
-            mutation($id: ID!) {
-              DeletePost(id: $id) {
-                id
+        switch (this.type) {
+          case 'contribution':
+            gqlMutation = gql`
+              mutation($id: ID!) {
+                DeletePost(id: $id) {
+                  id
+                }
               }
-            }
-          `,
+            `
+            break
+          case 'comment':
+            // XXX Make custom mutation and tests in the Backend !!!
+            gqlMutation = gql`
+              mutation($id: ID!) {
+                DeleteComment(id: $id) {
+                  id
+                }
+              }
+            `
+            break
+        }
+        await this.$apollo.mutate({
+          mutation: gqlMutation,
           variables: { id: this.id }
         })
         this.success = true
-        this.$toast.success(this.$t('post.delete.success'))
+        this.$toast.success(this.$t(`delete.${this.type}.success`))
         setTimeout(() => {
           this.isOpen = false
+          // XXX For comment just reload the page !!!
           setTimeout(() => {
             this.success = false
             this.$emit('close')
diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index 96f87cd9d..8b20f763f 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -135,11 +135,24 @@
     "takeAction": {
       "name": "Aktiv werden"
     },
+    "menu": {
+      "edit": "Beitrag bearbeiten",
+      "delete": "Beitrag löschen"
+    },
     "comment": {
       "submit": "Kommentiere",
       "submitted": "Kommentar Gesendet"
     }
   },
+  "comment": {
+    "content": {
+      "unavailable-placeholder": "...dieser Kommentar ist nicht mehr verfügbar"
+    },
+    "menu": {
+      "edit": "Kommentar bearbeiten",
+      "delete": "Kommentar löschen"
+    }
+  },
   "quotes": {
     "african": {
       "quote": "Viele kleine Leute an vielen kleinen Orten, die viele kleine Dinge tun, werden das Antlitz dieser Welt verändern.",
@@ -202,6 +215,22 @@
       "message": "Bist du sicher, dass du den Kommentar \"<b>{name}</b>\" deaktivieren möchtest?"
     }
   },
+  "delete": {
+    "submit": "Löschen",
+    "cancel": "Abbrechen",
+    "contribution": {
+      "title": "Lösche Beitrag",
+      "type": "Contribution",
+      "message": "Bist du sicher, dass du den Beitrag \"<b>{name}</b>\" löschen möchtest?",
+      "success": "Beitrag erfolgreich gelöscht!"
+    },
+    "comment": {
+      "title": "Lösche Kommentar",
+      "type": "Comment",
+      "message": "Bist du sicher, dass du den Kommentar von \"<b>{name}</b>\" löschen möchtest?",
+      "success": "Kommentar erfolgreich gelöscht!"
+    }
+  },
   "report": {
     "submit": "Melden",
     "cancel": "Abbrechen",
@@ -222,17 +251,6 @@
       "message": "Bist du sicher, dass du den Kommentar von \"<b>{name}</b>\" melden möchtest?"
     }
   },
-  "contribution": {
-    "edit": "Beitrag bearbeiten",
-    "delete": "Beitrag löschen"
-  },
-  "comment": {
-    "edit": "Kommentar bearbeiten",
-    "delete": "Kommentar löschen",
-    "content": {
-      "unavailable-placeholder": "...dieser Kommentar ist nicht mehr verfügbar"
-    }
-  },
   "followButton": {
     "follow": "Folgen",
     "following": "Folge Ich"
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index 186b31d41..c043905d0 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -135,19 +135,24 @@
     "takeAction": {
       "name": "Take action"
     },
-    "delete": {
-      "submit": "Delete",
-      "cancel": "Cancel",
-      "success": "Post deleted successfully",
-      "title": "Delete Post",
-      "type": "Contribution",
-      "message": "Do you really want to delete the post \"<b>{name}</b>\"?"
+    "menu": {
+      "edit": "Edit Post",
+      "delete": "Delete Post"
     },
     "comment": {
       "submit": "Comment",
       "submitted": "Comment Submitted"
     }
   },
+  "comment": {
+    "content": {
+      "unavailable-placeholder": "...this comment is not available anymore"
+    },
+    "menu": {
+      "edit": "Edit Comment",
+      "delete": "Delete Comment"
+    }
+  },
   "quotes": {
     "african": {
       "quote": "Many small people in many small places do many small things, that can alter the face of the world.",
@@ -210,6 +215,22 @@
       "message": "Do you really want to disable the comment from \"<b>{name}</b>\"?"
     }
   },
+  "delete": {
+    "submit": "Delete",
+    "cancel": "Cancel",
+    "contribution": {
+      "title": "Delete Post",
+      "type": "Contribution",
+      "message": "Do you really want to delete the post \"<b>{name}</b>\"?",
+      "success": "Post successfully deleted!"
+    },
+    "comment": {
+      "title": "Delete Comment",
+      "type": "Comment",
+      "message": "Do you really want to delete the comment from \"<b>{name}</b>\"?",
+      "success": "Comment successfully deleted!"
+    }
+  },
   "report": {
     "submit": "Report",
     "cancel": "Cancel",
@@ -230,17 +251,6 @@
       "message": "Do you really want to report the comment from \"<b>{name}</b>\"?"
     }
   },
-  "contribution": {
-    "edit": "Edit Contribution",
-    "delete": "Delete Contribution"
-  },
-  "comment": {
-    "edit": "Edit Comment",
-    "delete": "Delete Comment",
-    "content": {
-      "unavailable-placeholder": "...this comment is not available anymore"
-    }
-  },
   "followButton": {
     "follow": "Follow",
     "following": "Following"

From 8033556145474aa6f1013406b5a41453113a9238 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Sat, 18 May 2019 07:35:45 +0200
Subject: [PATCH 02/20] Investigation how to update the Comments List
 intelligent

---
 webapp/components/Comment.vue                 |  4 +++
 webapp/components/Modal.vue                   |  5 ++++
 webapp/components/Modal/DeleteModal.vue       | 25 ++++++++++++++-----
 .../components/comments/CommentList/index.vue | 14 ++++++++++-
 4 files changed, 41 insertions(+), 7 deletions(-)

diff --git a/webapp/components/Comment.vue b/webapp/components/Comment.vue
index 13edc9c0d..5e9c4faca 100644
--- a/webapp/components/Comment.vue
+++ b/webapp/components/Comment.vue
@@ -19,6 +19,7 @@
       <content-menu
         placement="bottom-end"
         resource-type="comment"
+        :deleteCallback="deleteCallback"
         :resource="comment"
         style="float-right"
         :is-owner="isAuthor(author.id)"
@@ -69,6 +70,9 @@ export default {
   methods: {
     isAuthor(id) {
       return this.user.id === id
+    },
+    deleteCallback() {
+      console.log('"deleteCallback" was called !!!')
     }
   }
 }
diff --git a/webapp/components/Modal.vue b/webapp/components/Modal.vue
index 2ea482190..0cbe52135 100644
--- a/webapp/components/Modal.vue
+++ b/webapp/components/Modal.vue
@@ -18,6 +18,7 @@
       v-if="open === 'delete'"
       :id="data.resource.id"
       :type="data.type"
+      :deleteCallback="deleteCallback"
       :name="name"
       @close="close"
     />
@@ -37,6 +38,10 @@ export default {
     ReportModal,
     DeleteModal
   },
+  props: {
+    deleteCallback: { type: Function, required: true },
+    cancelCallback: { type: Function, default: null }
+  },
   computed: {
     ...mapGetters({
       data: 'modal/data',
diff --git a/webapp/components/Modal/DeleteModal.vue b/webapp/components/Modal/DeleteModal.vue
index 8154937db..5a145008d 100644
--- a/webapp/components/Modal/DeleteModal.vue
+++ b/webapp/components/Modal/DeleteModal.vue
@@ -53,6 +53,8 @@ export default {
   props: {
     name: { type: String, default: '' },
     type: { type: String, required: true },
+    deleteCallback: { type: Function, required: true },
+    cancelCallback: { type: Function, default: null },
     id: { type: String, required: true }
   },
   data() {
@@ -116,12 +118,23 @@ export default {
           setTimeout(() => {
             this.success = false
             this.$emit('close')
-            if (this.$router.history.current.name === 'post-id-slug') {
-              // redirect to index
-              this.$router.history.push('/')
-            } else {
-              // reload the page (when deleting from profile or index)
-              window.location.assign(window.location.href)
+            switch (this.type) {
+              case 'contribution':
+                if (this.$router.history.current.name === 'post-id-slug') {
+                  // redirect to index
+                  this.$router.history.push('/')
+                } else {
+                  // reload the page (when deleting from profile or index)
+                  window.location.assign(window.location.href)
+                }
+                break
+              case 'comment':
+                // reload the page
+                // window.location.assign(window.location.href)
+                console.log('Remove comment emit !!!')
+                // this.$parent.$parent.$emit('deleteComment')
+                this.deleteCallback()
+                break
             }
           }, 500)
         }, 1500)
diff --git a/webapp/components/comments/CommentList/index.vue b/webapp/components/comments/CommentList/index.vue
index 57b720087..b77a4cf12 100644
--- a/webapp/components/comments/CommentList/index.vue
+++ b/webapp/components/comments/CommentList/index.vue
@@ -19,10 +19,18 @@
       class="comments"
     >
       <comment
-        v-for="comment in comments"
+        v-for="(comment, index) in comments"
         :key="comment.id"
         :comment="comment"
+        @deleteComment="deleteComment(index)"
       />
+      <!-- <comment
+        is="comment-item"
+        v-for="(comment, index) in comments"
+        :key="comment.id"
+        :comment="comment"
+        v-on:remove="comments.splice(index, 1)"
+      /> -->
     </div>
     <hc-empty
       v-else
@@ -61,6 +69,10 @@ export default {
   methods: {
     refetchPostComments(comment) {
       this.$apollo.queries.Post.refetch()
+    },
+    deleteComment(index) {
+      console.log('Remove comment event !!!')
+      this.comments.splice(index, 1)
     }
   },
   apollo: {

From 9af8c2b46c46a047b5443c74f2e3323e29e81cff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Sat, 18 May 2019 12:58:51 +0200
Subject: [PATCH 03/20] Refactored handling of DeleteModal in Comments and
 Posts

---
 webapp/components/Comment.vue           | 26 ++++++++++--
 webapp/components/ContentMenu.vue       |  6 ++-
 webapp/components/Modal.vue             |  7 +---
 webapp/components/Modal/DeleteModal.vue | 56 +++++++++++--------------
 webapp/components/PostCard/index.vue    |  3 ++
 webapp/mixins/Post.js                   | 25 +++++++++++
 webapp/pages/post/_id/_slug/index.vue   |  3 ++
 webapp/pages/profile/_id/_slug.vue      |  3 ++
 8 files changed, 88 insertions(+), 41 deletions(-)
 create mode 100644 webapp/mixins/Post.js

diff --git a/webapp/components/Comment.vue b/webapp/components/Comment.vue
index 5e9c4faca..1d52db082 100644
--- a/webapp/components/Comment.vue
+++ b/webapp/components/Comment.vue
@@ -19,8 +19,8 @@
       <content-menu
         placement="bottom-end"
         resource-type="comment"
-        :deleteCallback="deleteCallback"
         :resource="comment"
+        :callbacks="{ confirmCallback, cancelCallback: null }"
         style="float-right"
         :is-owner="isAuthor(author.id)"
       />
@@ -37,6 +37,7 @@
 </template>
 
 <script>
+import gql from 'graphql-tag'
 import { mapGetters } from 'vuex'
 import HcUser from '~/components/User'
 import ContentMenu from '~/components/ContentMenu'
@@ -71,8 +72,27 @@ export default {
     isAuthor(id) {
       return this.user.id === id
     },
-    deleteCallback() {
-      console.log('"deleteCallback" was called !!!')
+    async confirmCallback() {
+      console.log('"confirmCallback" was called !!! ', this.comment.id)
+
+      try {
+        // XXX Make custom mutation and tests in the Backend !!!
+        var gqlMutation = gql`
+          mutation($id: ID!) {
+            DeleteComment(id: $id) {
+              id
+            }
+          }
+        `
+        await this.$apollo.mutate({
+          mutation: gqlMutation,
+          variables: { id: this.comment.id }
+        })
+        this.$toast.success(this.$t(`delete.comment.success`))
+        this.$emit('deleteComment')
+      } catch (err) {
+        this.$toast.error(err.message)
+      }
     }
   }
 }
diff --git a/webapp/components/ContentMenu.vue b/webapp/components/ContentMenu.vue
index effc801ea..6ab42453c 100644
--- a/webapp/components/ContentMenu.vue
+++ b/webapp/components/ContentMenu.vue
@@ -60,7 +60,8 @@ export default {
       validator: value => {
         return value.match(/(contribution|comment|organization|user)/)
       }
-    }
+    },
+    callbacks: { type: Object, default: () => {} }
   },
   computed: {
     routes() {
@@ -151,7 +152,8 @@ export default {
         name: dialog,
         data: {
           type: this.resourceType,
-          resource: this.resource
+          resource: this.resource,
+          callbacks: this.callbacks
         }
       })
     }
diff --git a/webapp/components/Modal.vue b/webapp/components/Modal.vue
index 0cbe52135..dcde08e21 100644
--- a/webapp/components/Modal.vue
+++ b/webapp/components/Modal.vue
@@ -18,7 +18,8 @@
       v-if="open === 'delete'"
       :id="data.resource.id"
       :type="data.type"
-      :deleteCallback="deleteCallback"
+      :confirm-callback="data.callbacks.confirmCallback"
+      :cancel-callback="!!data.callbacks.cancelCallback ? data.callbacks.cancelCallback : null"
       :name="name"
       @close="close"
     />
@@ -38,10 +39,6 @@ export default {
     ReportModal,
     DeleteModal
   },
-  props: {
-    deleteCallback: { type: Function, required: true },
-    cancelCallback: { type: Function, default: null }
-  },
   computed: {
     ...mapGetters({
       data: 'modal/data',
diff --git a/webapp/components/Modal/DeleteModal.vue b/webapp/components/Modal/DeleteModal.vue
index 5a145008d..531c4c98c 100644
--- a/webapp/components/Modal/DeleteModal.vue
+++ b/webapp/components/Modal/DeleteModal.vue
@@ -53,7 +53,7 @@ export default {
   props: {
     name: { type: String, default: '' },
     type: { type: String, required: true },
-    deleteCallback: { type: Function, required: true },
+    confirmCallback: { type: Function, required: true },
     cancelCallback: { type: Function, default: null },
     id: { type: String, required: true }
   },
@@ -78,6 +78,9 @@ export default {
       this.isOpen = false
       setTimeout(() => {
         this.$emit('close')
+        if (!!this.cancelCallback) {
+          this.cancelCallback()
+        }
       }, 1000)
     },
     async confirm() {
@@ -87,34 +90,28 @@ export default {
       try {
         switch (this.type) {
           case 'contribution':
-            gqlMutation = gql`
-              mutation($id: ID!) {
-                DeletePost(id: $id) {
-                  id
-                }
-              }
-            `
+            // gqlMutation = gql`
+            //   mutation($id: ID!) {
+            //     DeletePost(id: $id) {
+            //       id
+            //     }
+            //   }
+            // `
+            // await this.$apollo.mutate({
+            //   mutation: gqlMutation,
+            //   variables: { id: this.id }
+            // })
+            // this.$toast.success(this.$t(`delete.${this.type}.success`))
+            await this.confirmCallback()
             break
           case 'comment':
             // XXX Make custom mutation and tests in the Backend !!!
-            gqlMutation = gql`
-              mutation($id: ID!) {
-                DeleteComment(id: $id) {
-                  id
-                }
-              }
-            `
+            await this.confirmCallback()
             break
         }
-        await this.$apollo.mutate({
-          mutation: gqlMutation,
-          variables: { id: this.id }
-        })
         this.success = true
-        this.$toast.success(this.$t(`delete.${this.type}.success`))
         setTimeout(() => {
           this.isOpen = false
-          // XXX For comment just reload the page !!!
           setTimeout(() => {
             this.success = false
             this.$emit('close')
@@ -122,25 +119,22 @@ export default {
               case 'contribution':
                 if (this.$router.history.current.name === 'post-id-slug') {
                   // redirect to index
-                  this.$router.history.push('/')
+                  // this.$router.history.push('/')
                 } else {
                   // reload the page (when deleting from profile or index)
-                  window.location.assign(window.location.href)
+                  // window.location.assign(window.location.href)
                 }
                 break
-              case 'comment':
-                // reload the page
-                // window.location.assign(window.location.href)
-                console.log('Remove comment emit !!!')
-                // this.$parent.$parent.$emit('deleteComment')
-                this.deleteCallback()
-                break
             }
           }, 500)
         }, 1500)
       } catch (err) {
         this.success = false
-        this.$toast.error(err.message)
+        // switch (this.type) {
+        //   case 'contribution':
+        //     this.$toast.error(err.message)
+        //     break
+        // }
       } finally {
         this.loading = false
       }
diff --git a/webapp/components/PostCard/index.vue b/webapp/components/PostCard/index.vue
index acddba5d6..36dd48b55 100644
--- a/webapp/components/PostCard/index.vue
+++ b/webapp/components/PostCard/index.vue
@@ -64,6 +64,7 @@
           <content-menu
             resource-type="contribution"
             :resource="post"
+            :callbacks="{ confirmCallback, cancelCallback: null }"
             :is-owner="isAuthor"
           />
         </no-ssr>
@@ -77,6 +78,7 @@ import HcUser from '~/components/User'
 import ContentMenu from '~/components/ContentMenu'
 import { randomBytes } from 'crypto'
 import { mapGetters } from 'vuex'
+import Post from '~/mixins/Post'
 
 export default {
   name: 'HcPostCard',
@@ -84,6 +86,7 @@ export default {
     HcUser,
     ContentMenu
   },
+  mixins: [Post],
   props: {
     post: {
       type: Object,
diff --git a/webapp/mixins/Post.js b/webapp/mixins/Post.js
new file mode 100644
index 000000000..e2d59556f
--- /dev/null
+++ b/webapp/mixins/Post.js
@@ -0,0 +1,25 @@
+import gql from 'graphql-tag'
+
+export default {
+  methods: {
+    async confirmCallback() {
+      try {
+        var gqlMutation = gql`
+          mutation($id: ID!) {
+            DeletePost(id: $id) {
+              id
+            }
+          }
+        `
+        await this.$apollo.mutate({
+          mutation: gqlMutation,
+          variables: { id: this.post.id }
+        })
+        this.$toast.success(this.$t(`delete.contribution.success`))
+        // this.$emit('deletePost')
+      } catch (err) {
+        this.$toast.error(err.message)
+      }
+    }
+  }
+}
diff --git a/webapp/pages/post/_id/_slug/index.vue b/webapp/pages/post/_id/_slug/index.vue
index 87538eb6d..67c314e90 100644
--- a/webapp/pages/post/_id/_slug/index.vue
+++ b/webapp/pages/post/_id/_slug/index.vue
@@ -18,6 +18,7 @@
           placement="bottom-end"
           resource-type="contribution"
           :resource="post"
+          :callbacks="{ confirmCallback, cancelCallback: null }"
           :is-owner="isAuthor(post.author.id)"
         />
       </no-ssr>
@@ -114,6 +115,7 @@ import HcUser from '~/components/User'
 import HcShoutButton from '~/components/ShoutButton.vue'
 import HcCommentForm from '~/components/comments/CommentForm'
 import HcCommentList from '~/components/comments/CommentList'
+import Post from '~/mixins/Post'
 
 export default {
   transition: {
@@ -129,6 +131,7 @@ export default {
     HcCommentForm,
     HcCommentList
   },
+  mixins: [Post],
   head() {
     return {
       title: this.title
diff --git a/webapp/pages/profile/_id/_slug.vue b/webapp/pages/profile/_id/_slug.vue
index ecb0baa9d..0b4f471ec 100644
--- a/webapp/pages/profile/_id/_slug.vue
+++ b/webapp/pages/profile/_id/_slug.vue
@@ -25,6 +25,7 @@
               placement="bottom-end"
               resource-type="user"
               :resource="user"
+              :callbacks="{ confirmCallback, cancelCallback: null }"
               :is-owner="myProfile"
               class="user-content-menu"
             />
@@ -327,6 +328,7 @@ import HcBadges from '~/components/Badges.vue'
 import HcLoadMore from '~/components/LoadMore.vue'
 import HcEmpty from '~/components/Empty.vue'
 import ContentMenu from '~/components/ContentMenu'
+import Post from '~/mixins/Post'
 
 export default {
   components: {
@@ -339,6 +341,7 @@ export default {
     HcEmpty,
     ContentMenu
   },
+  mixins: [Post],
   transition: {
     name: 'slide-up',
     mode: 'out-in'

From 388e9ff6b212b0f5a97be30dbc0af7da05f0a31d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Sat, 18 May 2019 15:56:07 +0200
Subject: [PATCH 04/20] Go ahead with refactoring of DeleteModal in Comments
 and Posts

---
 webapp/components/PostCard/index.vue      | 138 ++++++++++++----------
 webapp/mixins/Post.js                     |   2 +-
 webapp/pages/index.vue                    |  18 ++-
 webapp/pages/post/_id/_slug/more-info.vue |  16 ++-
 webapp/pages/profile/_id/_slug.vue        |  17 ++-
 5 files changed, 110 insertions(+), 81 deletions(-)

diff --git a/webapp/components/PostCard/index.vue b/webapp/components/PostCard/index.vue
index 36dd48b55..f68c1c2b9 100644
--- a/webapp/components/PostCard/index.vue
+++ b/webapp/components/PostCard/index.vue
@@ -1,76 +1,80 @@
 <template>
-  <ds-card
-    :header="post.title"
-    :image="post.image"
-    :class="{'post-card': true, 'disabled-content': post.disabled}"
+  <ds-flex-item
+    :width="width"
   >
-    <nuxt-link
-      class="post-link"
-      :to="{ name: 'post-id-slug', params: { id: post.id, slug: post.slug } }"
+    <ds-card
+      :header="post.title"
+      :image="post.image"
+      :class="{'post-card': true, 'disabled-content': post.disabled}"
     >
-      {{ post.title }}
-    </nuxt-link>
-    <!-- eslint-disable vue/no-v-html -->
-    <!-- TODO: replace editor content with tiptap render view -->
-    <ds-space margin-bottom="large">
-      <div
-        class="hc-editor-content"
-        v-html="excerpt"
-      />
-    </ds-space>
-    <!-- eslint-enable vue/no-v-html -->
-    <ds-space>
-      <ds-text
-        v-if="post.createdAt"
-        align="right"
-        size="small"
-        color="soft"
+      <nuxt-link
+        class="post-link"
+        :to="{ name: 'post-id-slug', params: { id: post.id, slug: post.slug } }"
       >
-        {{ post.createdAt | dateTime('dd. MMMM yyyy HH:mm') }}
-      </ds-text>
-    </ds-space>
-    <ds-space
-      margin="small"
-      style="position: absolute; bottom: 44px;"
-    >
-      <!-- TODO: find better solution for rendering errors -->
-      <no-ssr>
-        <hc-user
-          :user="post.author"
-          :trunc="35"
+        {{ post.title }}
+      </nuxt-link>
+      <!-- eslint-disable vue/no-v-html -->
+      <!-- TODO: replace editor content with tiptap render view -->
+      <ds-space margin-bottom="large">
+        <div
+          class="hc-editor-content"
+          v-html="excerpt"
         />
-      </no-ssr>
-    </ds-space>
-    <template slot="footer">
-      <div style="display: inline-block; opacity: .5;">
-        <ds-icon
-          v-for="category in post.categories"
-          :key="category.id"
-          v-tooltip="{content: category.name, placement: 'bottom-start', delay: { show: 500 }}"
-          :name="category.icon"
-        />&nbsp;
-      </div>
-      <div style="display: inline-block; float: right">
-        <span :style="{ opacity: post.shoutedCount ? 1 : .5 }">
-          <ds-icon name="bullhorn" />
-          <small>{{ post.shoutedCount }}</small>
-        </span>
-        &nbsp;
-        <span :style="{ opacity: post.commentsCount ? 1 : .5 }">
-          <ds-icon name="comments" />
-          <small>{{ post.commentsCount }}</small>
-        </span>
+      </ds-space>
+      <!-- eslint-enable vue/no-v-html -->
+      <ds-space>
+        <ds-text
+          v-if="post.createdAt"
+          align="right"
+          size="small"
+          color="soft"
+        >
+          {{ post.createdAt | dateTime('dd. MMMM yyyy HH:mm') }}
+        </ds-text>
+      </ds-space>
+      <ds-space
+        margin="small"
+        style="position: absolute; bottom: 44px;"
+      >
+        <!-- TODO: find better solution for rendering errors -->
         <no-ssr>
-          <content-menu
-            resource-type="contribution"
-            :resource="post"
-            :callbacks="{ confirmCallback, cancelCallback: null }"
-            :is-owner="isAuthor"
+          <hc-user
+            :user="post.author"
+            :trunc="35"
           />
         </no-ssr>
-      </div>
-    </template>
-  </ds-card>
+      </ds-space>
+      <template slot="footer">
+        <div style="display: inline-block; opacity: .5;">
+          <ds-icon
+            v-for="category in post.categories"
+            :key="category.id"
+            v-tooltip="{content: category.name, placement: 'bottom-start', delay: { show: 500 }}"
+            :name="category.icon"
+          />&nbsp;
+        </div>
+        <div style="display: inline-block; float: right">
+          <span :style="{ opacity: post.shoutedCount ? 1 : .5 }">
+            <ds-icon name="bullhorn" />
+            <small>{{ post.shoutedCount }}</small>
+          </span>
+          &nbsp;
+          <span :style="{ opacity: post.commentsCount ? 1 : .5 }">
+            <ds-icon name="comments" />
+            <small>{{ post.commentsCount }}</small>
+          </span>
+          <no-ssr>
+            <content-menu
+              resource-type="contribution"
+              :resource="post"
+              :callbacks="{ confirmCallback, cancelCallback: null }"
+              :is-owner="isAuthor"
+            />
+          </no-ssr>
+        </div>
+      </template>
+    </ds-card>
+  </ds-flex-item>
 </template>
 
 <script>
@@ -91,6 +95,10 @@ export default {
     post: {
       type: Object,
       required: true
+    },
+    width: {
+      type: Object,
+      required: true
     }
   },
   computed: {
diff --git a/webapp/mixins/Post.js b/webapp/mixins/Post.js
index e2d59556f..ca94826b3 100644
--- a/webapp/mixins/Post.js
+++ b/webapp/mixins/Post.js
@@ -16,7 +16,7 @@ export default {
           variables: { id: this.post.id }
         })
         this.$toast.success(this.$t(`delete.contribution.success`))
-        // this.$emit('deletePost')
+        this.$emit('delete')
       } catch (err) {
         this.$toast.error(err.message)
       }
diff --git a/webapp/pages/index.vue b/webapp/pages/index.vue
index 26ff6296d..dbc5a3fc2 100644
--- a/webapp/pages/index.vue
+++ b/webapp/pages/index.vue
@@ -5,13 +5,13 @@
       :width="{ base: '100%' }"
       gutter="base"
     >
-      <ds-flex-item
-        v-for="post in uniq(Post)"
+      <hc-post-card
+        v-for="(post, index) in uniq(Post)"
         :key="post.id"
+        :post="post"
         :width="{ base: '100%', xs: '100%', md: '50%', xl: '33%' }"
-      >
-        <hc-post-card :post="post" />
-      </ds-flex-item>
+        @delete="deletePost(index, post.id)"
+      />
     </ds-flex>
     <no-ssr>
       <ds-button
@@ -85,6 +85,14 @@ export default {
         },
         fetchPolicy: 'cache-and-network'
       })
+    },
+    deletePost(_index, postId) {
+      console.log('Pages/index.vue: Post item deleted !!!')
+      this.Post = this.Post.filter((post) => {
+        return post.id !== postId
+      })
+      // Ideal sulution:
+      // this.Post.splice(index, 1)
     }
   },
   apollo: {
diff --git a/webapp/pages/post/_id/_slug/more-info.vue b/webapp/pages/post/_id/_slug/more-info.vue
index ae03fe658..6e068c1b8 100644
--- a/webapp/pages/post/_id/_slug/more-info.vue
+++ b/webapp/pages/post/_id/_slug/more-info.vue
@@ -35,13 +35,13 @@
         v-if="post.relatedContributions && post.relatedContributions.length"
         gutter="small"
       >
-        <ds-flex-item
-          v-for="relatedPost in post.relatedContributions"
+        <hc-post-card
+          v-for="(relatedPost, index) in post.relatedContributions"
           :key="relatedPost.id"
           :width="{ base: '100%', lg: 1 }"
-        >
-          <hc-post-card :post="relatedPost" />
-        </ds-flex-item>
+          :post="relatedPost"
+          @delete="deletePost(index)"
+        />
       </ds-flex>
       <hc-empty
         v-else
@@ -73,6 +73,12 @@ export default {
       return this.Post ? this.Post[0] || {} : {}
     }
   },
+  methods: {
+    deletePost(index) {
+      console.log('Post/more-info.vue: Post item deleted !!!')
+      this.post.relatedContributions.splice(index, 1)
+    }
+  },
   apollo: {
     Post: {
       query() {
diff --git a/webapp/pages/profile/_id/_slug.vue b/webapp/pages/profile/_id/_slug.vue
index 0b4f471ec..587ced943 100644
--- a/webapp/pages/profile/_id/_slug.vue
+++ b/webapp/pages/profile/_id/_slug.vue
@@ -290,13 +290,13 @@
             />
           </ds-flex-item>
           <template v-if="activePosts.length">
-            <ds-flex-item
-              v-for="post in activePosts"
+            <hc-post-card
+              v-for="(post, index) in activePosts"
               :key="post.id"
+              :post="post"
               :width="{ base: '100%', md: '100%', xl: '50%' }"
-            >
-              <hc-post-card :post="post" />
-            </ds-flex-item>
+              @delete="deletePost(index)"
+            />
           </template>
           <template v-else>
             <ds-flex-item :width="{ base: '100%' }">
@@ -404,6 +404,9 @@ export default {
         throw new Error('User not found!')
       }
     }
+    // activePosts(activePosts) {
+    //   this.activePosts = activePosts || []
+    // }
   },
   methods: {
     uniq(items, field = 'id') {
@@ -434,6 +437,10 @@ export default {
         },
         fetchPolicy: 'cache-and-network'
       })
+    },
+    deletePost(index) {
+      this.user.contributions.splice(index, 1)
+      // this.$router.history.push('/')
     }
   },
   apollo: {

From 2016a9445b9537d0640c4c85574e4f01a3093c5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Sun, 19 May 2019 07:42:55 +0200
Subject: [PATCH 05/20] Rename confirm callbacks

---
 webapp/components/Comment.vue             | 6 ++----
 webapp/components/Modal.vue               | 4 ++--
 webapp/components/PostCard/index.vue      | 2 +-
 webapp/mixins/Post.js                     | 2 +-
 webapp/pages/index.vue                    | 3 +--
 webapp/pages/post/_id/_slug/index.vue     | 2 +-
 webapp/pages/post/_id/_slug/more-info.vue | 3 +--
 webapp/pages/profile/_id/_slug.vue        | 6 +-----
 8 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/webapp/components/Comment.vue b/webapp/components/Comment.vue
index 1d52db082..85e38dbd8 100644
--- a/webapp/components/Comment.vue
+++ b/webapp/components/Comment.vue
@@ -20,7 +20,7 @@
         placement="bottom-end"
         resource-type="comment"
         :resource="comment"
-        :callbacks="{ confirmCallback, cancelCallback: null }"
+        :callbacks="{ confirm: deleteCommentCallback, cancel: null }"
         style="float-right"
         :is-owner="isAuthor(author.id)"
       />
@@ -72,9 +72,7 @@ export default {
     isAuthor(id) {
       return this.user.id === id
     },
-    async confirmCallback() {
-      console.log('"confirmCallback" was called !!! ', this.comment.id)
-
+    async deleteCommentCallback() {
       try {
         // XXX Make custom mutation and tests in the Backend !!!
         var gqlMutation = gql`
diff --git a/webapp/components/Modal.vue b/webapp/components/Modal.vue
index dcde08e21..efb9cad0e 100644
--- a/webapp/components/Modal.vue
+++ b/webapp/components/Modal.vue
@@ -18,8 +18,8 @@
       v-if="open === 'delete'"
       :id="data.resource.id"
       :type="data.type"
-      :confirm-callback="data.callbacks.confirmCallback"
-      :cancel-callback="!!data.callbacks.cancelCallback ? data.callbacks.cancelCallback : null"
+      :confirmCallback="data.callbacks.confirm"
+      :cancelCallback="!!data.callbacks.cancel ? data.callbacks.cancel : null"
       :name="name"
       @close="close"
     />
diff --git a/webapp/components/PostCard/index.vue b/webapp/components/PostCard/index.vue
index f68c1c2b9..dfee29c8f 100644
--- a/webapp/components/PostCard/index.vue
+++ b/webapp/components/PostCard/index.vue
@@ -67,7 +67,7 @@
             <content-menu
               resource-type="contribution"
               :resource="post"
-              :callbacks="{ confirmCallback, cancelCallback: null }"
+              :callbacks="{ confirm: deletePostCallback, cancel: null }"
               :is-owner="isAuthor"
             />
           </no-ssr>
diff --git a/webapp/mixins/Post.js b/webapp/mixins/Post.js
index ca94826b3..dde3f6ee3 100644
--- a/webapp/mixins/Post.js
+++ b/webapp/mixins/Post.js
@@ -2,7 +2,7 @@ import gql from 'graphql-tag'
 
 export default {
   methods: {
-    async confirmCallback() {
+    async deletePostCallback() {
       try {
         var gqlMutation = gql`
           mutation($id: ID!) {
diff --git a/webapp/pages/index.vue b/webapp/pages/index.vue
index dbc5a3fc2..fa5907213 100644
--- a/webapp/pages/index.vue
+++ b/webapp/pages/index.vue
@@ -87,11 +87,10 @@ export default {
       })
     },
     deletePost(_index, postId) {
-      console.log('Pages/index.vue: Post item deleted !!!')
       this.Post = this.Post.filter((post) => {
         return post.id !== postId
       })
-      // Ideal sulution:
+      // Ideal solution:
       // this.Post.splice(index, 1)
     }
   },
diff --git a/webapp/pages/post/_id/_slug/index.vue b/webapp/pages/post/_id/_slug/index.vue
index 67c314e90..0225334fa 100644
--- a/webapp/pages/post/_id/_slug/index.vue
+++ b/webapp/pages/post/_id/_slug/index.vue
@@ -18,7 +18,7 @@
           placement="bottom-end"
           resource-type="contribution"
           :resource="post"
-          :callbacks="{ confirmCallback, cancelCallback: null }"
+          :callbacks="{ confirm: deletePostCallback, cancel: null }"
           :is-owner="isAuthor(post.author.id)"
         />
       </no-ssr>
diff --git a/webapp/pages/post/_id/_slug/more-info.vue b/webapp/pages/post/_id/_slug/more-info.vue
index 6e068c1b8..4fc94e274 100644
--- a/webapp/pages/post/_id/_slug/more-info.vue
+++ b/webapp/pages/post/_id/_slug/more-info.vue
@@ -38,8 +38,8 @@
         <hc-post-card
           v-for="(relatedPost, index) in post.relatedContributions"
           :key="relatedPost.id"
-          :width="{ base: '100%', lg: 1 }"
           :post="relatedPost"
+          :width="{ base: '100%', lg: 1 }"
           @delete="deletePost(index)"
         />
       </ds-flex>
@@ -75,7 +75,6 @@ export default {
   },
   methods: {
     deletePost(index) {
-      console.log('Post/more-info.vue: Post item deleted !!!')
       this.post.relatedContributions.splice(index, 1)
     }
   },
diff --git a/webapp/pages/profile/_id/_slug.vue b/webapp/pages/profile/_id/_slug.vue
index 587ced943..a034f3a61 100644
--- a/webapp/pages/profile/_id/_slug.vue
+++ b/webapp/pages/profile/_id/_slug.vue
@@ -25,7 +25,7 @@
               placement="bottom-end"
               resource-type="user"
               :resource="user"
-              :callbacks="{ confirmCallback, cancelCallback: null }"
+              :callbacks="{ confirm: deletePostCallback, cancel: null }"
               :is-owner="myProfile"
               class="user-content-menu"
             />
@@ -404,9 +404,6 @@ export default {
         throw new Error('User not found!')
       }
     }
-    // activePosts(activePosts) {
-    //   this.activePosts = activePosts || []
-    // }
   },
   methods: {
     uniq(items, field = 'id') {
@@ -440,7 +437,6 @@ export default {
     },
     deletePost(index) {
       this.user.contributions.splice(index, 1)
-      // this.$router.history.push('/')
     }
   },
   apollo: {

From 7f83f775a79141ebcaba8201ec393f1f9f8324fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Sun, 19 May 2019 08:23:51 +0200
Subject: [PATCH 06/20] Clean up the delete-menu stuff for Comments and Posts

---
 webapp/components/Modal.vue                   |  1 +
 webapp/components/Modal/DeleteModal.vue       | 46 ++-----------------
 .../components/comments/CommentList/index.vue |  1 -
 webapp/mixins/Post.js                         |  2 +-
 webapp/pages/index.vue                        |  2 +-
 webapp/pages/post/_id/_slug/more-info.vue     |  2 +-
 webapp/pages/profile/_id/_slug.vue            |  2 +-
 7 files changed, 9 insertions(+), 47 deletions(-)

diff --git a/webapp/components/Modal.vue b/webapp/components/Modal.vue
index efb9cad0e..fd11414d0 100644
--- a/webapp/components/Modal.vue
+++ b/webapp/components/Modal.vue
@@ -1,5 +1,6 @@
 <template>
   <div class="modal-wrapper">
+    <!-- Todo: Put all modals with 2 buttons and equal properties in one customiced 'danger-action-modal' -->
     <disable-modal
       v-if="open === 'disable'"
       :id="data.resource.id"
diff --git a/webapp/components/Modal/DeleteModal.vue b/webapp/components/Modal/DeleteModal.vue
index 531c4c98c..ace5d9097 100644
--- a/webapp/components/Modal/DeleteModal.vue
+++ b/webapp/components/Modal/DeleteModal.vue
@@ -75,66 +75,28 @@ export default {
   },
   methods: {
     async cancel() {
+      if (!!this.cancelCallback) {
+        await this.cancelCallback()
+      }
       this.isOpen = false
       setTimeout(() => {
         this.$emit('close')
-        if (!!this.cancelCallback) {
-          this.cancelCallback()
-        }
       }, 1000)
     },
     async confirm() {
-      var gqlMutation
-
       this.loading = true
       try {
-        switch (this.type) {
-          case 'contribution':
-            // gqlMutation = gql`
-            //   mutation($id: ID!) {
-            //     DeletePost(id: $id) {
-            //       id
-            //     }
-            //   }
-            // `
-            // await this.$apollo.mutate({
-            //   mutation: gqlMutation,
-            //   variables: { id: this.id }
-            // })
-            // this.$toast.success(this.$t(`delete.${this.type}.success`))
-            await this.confirmCallback()
-            break
-          case 'comment':
-            // XXX Make custom mutation and tests in the Backend !!!
-            await this.confirmCallback()
-            break
-        }
+        await this.confirmCallback()
         this.success = true
         setTimeout(() => {
           this.isOpen = false
           setTimeout(() => {
             this.success = false
             this.$emit('close')
-            switch (this.type) {
-              case 'contribution':
-                if (this.$router.history.current.name === 'post-id-slug') {
-                  // redirect to index
-                  // this.$router.history.push('/')
-                } else {
-                  // reload the page (when deleting from profile or index)
-                  // window.location.assign(window.location.href)
-                }
-                break
-            }
           }, 500)
         }, 1500)
       } catch (err) {
         this.success = false
-        // switch (this.type) {
-        //   case 'contribution':
-        //     this.$toast.error(err.message)
-        //     break
-        // }
       } finally {
         this.loading = false
       }
diff --git a/webapp/components/comments/CommentList/index.vue b/webapp/components/comments/CommentList/index.vue
index b77a4cf12..04a4a95db 100644
--- a/webapp/components/comments/CommentList/index.vue
+++ b/webapp/components/comments/CommentList/index.vue
@@ -71,7 +71,6 @@ export default {
       this.$apollo.queries.Post.refetch()
     },
     deleteComment(index) {
-      console.log('Remove comment event !!!')
       this.comments.splice(index, 1)
     }
   },
diff --git a/webapp/mixins/Post.js b/webapp/mixins/Post.js
index dde3f6ee3..87c1461cf 100644
--- a/webapp/mixins/Post.js
+++ b/webapp/mixins/Post.js
@@ -16,7 +16,7 @@ export default {
           variables: { id: this.post.id }
         })
         this.$toast.success(this.$t(`delete.contribution.success`))
-        this.$emit('delete')
+        this.$emit('deletePost')
       } catch (err) {
         this.$toast.error(err.message)
       }
diff --git a/webapp/pages/index.vue b/webapp/pages/index.vue
index fa5907213..d3e0feaca 100644
--- a/webapp/pages/index.vue
+++ b/webapp/pages/index.vue
@@ -10,7 +10,7 @@
         :key="post.id"
         :post="post"
         :width="{ base: '100%', xs: '100%', md: '50%', xl: '33%' }"
-        @delete="deletePost(index, post.id)"
+        @deletePost="deletePost(index, post.id)"
       />
     </ds-flex>
     <no-ssr>
diff --git a/webapp/pages/post/_id/_slug/more-info.vue b/webapp/pages/post/_id/_slug/more-info.vue
index 4fc94e274..b565d5673 100644
--- a/webapp/pages/post/_id/_slug/more-info.vue
+++ b/webapp/pages/post/_id/_slug/more-info.vue
@@ -40,7 +40,7 @@
           :key="relatedPost.id"
           :post="relatedPost"
           :width="{ base: '100%', lg: 1 }"
-          @delete="deletePost(index)"
+          @deletePost="deletePost(index)"
         />
       </ds-flex>
       <hc-empty
diff --git a/webapp/pages/profile/_id/_slug.vue b/webapp/pages/profile/_id/_slug.vue
index a034f3a61..d4db41fb5 100644
--- a/webapp/pages/profile/_id/_slug.vue
+++ b/webapp/pages/profile/_id/_slug.vue
@@ -295,7 +295,7 @@
               :key="post.id"
               :post="post"
               :width="{ base: '100%', md: '100%', xl: '50%' }"
-              @delete="deletePost(index)"
+              @deletePost="deletePost(index)"
             />
           </template>
           <template v-else>

From f5d9bc9ae4ea0bb64356f401e21af80879ad8878 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Sun, 19 May 2019 12:54:25 +0200
Subject: [PATCH 07/20] First proof of functionality for Delete Comment and
 Post via DeleteModal

---
 webapp/components/Modal.vue             |  4 ++--
 webapp/components/Modal/DeleteModal.vue |  4 ++++
 webapp/mixins/Post.js                   | 10 ++++++++--
 webapp/pages/index.vue                  |  2 +-
 webapp/pages/post/_id/_slug/index.vue   |  5 ++++-
 5 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/webapp/components/Modal.vue b/webapp/components/Modal.vue
index fd11414d0..0db4b74fd 100644
--- a/webapp/components/Modal.vue
+++ b/webapp/components/Modal.vue
@@ -19,8 +19,8 @@
       v-if="open === 'delete'"
       :id="data.resource.id"
       :type="data.type"
-      :confirmCallback="data.callbacks.confirm"
-      :cancelCallback="!!data.callbacks.cancel ? data.callbacks.cancel : null"
+      :confirm-callback="data.callbacks.confirm"
+      :cancel-callback="!!data.callbacks.cancel ? data.callbacks.cancel : null"
       :name="name"
       @close="close"
     />
diff --git a/webapp/components/Modal/DeleteModal.vue b/webapp/components/Modal/DeleteModal.vue
index ace5d9097..8f6c6400b 100644
--- a/webapp/components/Modal/DeleteModal.vue
+++ b/webapp/components/Modal/DeleteModal.vue
@@ -84,9 +84,13 @@ export default {
       }, 1000)
     },
     async confirm() {
+      console.log('"confirm" was reached !!!')
       this.loading = true
       try {
+        console.log('"confirmCallback" is: ', this.confirmCallback)
         await this.confirmCallback()
+        // this.confirmCallback()
+        console.log('"confirmCallback" was exec !!!')
         this.success = true
         setTimeout(() => {
           this.isOpen = false
diff --git a/webapp/mixins/Post.js b/webapp/mixins/Post.js
index 87c1461cf..69c1b5426 100644
--- a/webapp/mixins/Post.js
+++ b/webapp/mixins/Post.js
@@ -2,7 +2,7 @@ import gql from 'graphql-tag'
 
 export default {
   methods: {
-    async deletePostCallback() {
+    async deletePostCallback(listPageType = true) {
       try {
         var gqlMutation = gql`
           mutation($id: ID!) {
@@ -16,7 +16,13 @@ export default {
           variables: { id: this.post.id }
         })
         this.$toast.success(this.$t(`delete.contribution.success`))
-        this.$emit('deletePost')
+        if (listPageType) {
+          console.log('Emit "deletePost" !!!')
+          this.$emit('deletePost')
+        } else {
+          console.log('Redirect to index !!!')
+          this.$router.history.push('/') // Single page type: redirect to index
+        }
       } catch (err) {
         this.$toast.error(err.message)
       }
diff --git a/webapp/pages/index.vue b/webapp/pages/index.vue
index d3e0feaca..135c96735 100644
--- a/webapp/pages/index.vue
+++ b/webapp/pages/index.vue
@@ -87,7 +87,7 @@ export default {
       })
     },
     deletePost(_index, postId) {
-      this.Post = this.Post.filter((post) => {
+      this.Post = this.Post.filter(post => {
         return post.id !== postId
       })
       // Ideal solution:
diff --git a/webapp/pages/post/_id/_slug/index.vue b/webapp/pages/post/_id/_slug/index.vue
index 0225334fa..bede9c1c8 100644
--- a/webapp/pages/post/_id/_slug/index.vue
+++ b/webapp/pages/post/_id/_slug/index.vue
@@ -18,7 +18,7 @@
           placement="bottom-end"
           resource-type="contribution"
           :resource="post"
-          :callbacks="{ confirm: deletePostCallback, cancel: null }"
+          :callbacks="{ confirm: deletePostOptionsCallback, cancel: null }"
           :is-owner="isAuthor(post.author.id)"
         />
       </no-ssr>
@@ -256,6 +256,9 @@ export default {
   methods: {
     isAuthor(id) {
       return this.$store.getters['auth/user'].id === id
+    },
+    async deletePostOptionsCallback() {
+      await deletePostCallback(true)
     }
   }
 }

From 7e922fa0b0c4f3d08615dfcc305005e9c3505f02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Mon, 20 May 2019 07:00:33 +0200
Subject: [PATCH 08/20] Got the go to Index Page to work on Post Page deletion

---
 webapp/components/Modal/DeleteModal.vue |  4 ----
 webapp/mixins/Post.js                   | 15 ++++++++-------
 webapp/pages/post/_id/_slug/index.vue   |  5 +----
 3 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/webapp/components/Modal/DeleteModal.vue b/webapp/components/Modal/DeleteModal.vue
index 8f6c6400b..ace5d9097 100644
--- a/webapp/components/Modal/DeleteModal.vue
+++ b/webapp/components/Modal/DeleteModal.vue
@@ -84,13 +84,9 @@ export default {
       }, 1000)
     },
     async confirm() {
-      console.log('"confirm" was reached !!!')
       this.loading = true
       try {
-        console.log('"confirmCallback" is: ', this.confirmCallback)
         await this.confirmCallback()
-        // this.confirmCallback()
-        console.log('"confirmCallback" was exec !!!')
         this.success = true
         setTimeout(() => {
           this.isOpen = false
diff --git a/webapp/mixins/Post.js b/webapp/mixins/Post.js
index 69c1b5426..24779bab1 100644
--- a/webapp/mixins/Post.js
+++ b/webapp/mixins/Post.js
@@ -2,7 +2,7 @@ import gql from 'graphql-tag'
 
 export default {
   methods: {
-    async deletePostCallback(listPageType = true) {
+    async deletePostCallback(postDisplayType = 'list') {
       try {
         var gqlMutation = gql`
           mutation($id: ID!) {
@@ -16,12 +16,13 @@ export default {
           variables: { id: this.post.id }
         })
         this.$toast.success(this.$t(`delete.contribution.success`))
-        if (listPageType) {
-          console.log('Emit "deletePost" !!!')
-          this.$emit('deletePost')
-        } else {
-          console.log('Redirect to index !!!')
-          this.$router.history.push('/') // Single page type: redirect to index
+        switch (postDisplayType) {
+          case 'list':
+            this.$emit('deletePost')
+            break
+          default:
+            this.$router.history.push('/') // Single page type: Redirect to index
+            break
         }
       } catch (err) {
         this.$toast.error(err.message)
diff --git a/webapp/pages/post/_id/_slug/index.vue b/webapp/pages/post/_id/_slug/index.vue
index bede9c1c8..102d9007c 100644
--- a/webapp/pages/post/_id/_slug/index.vue
+++ b/webapp/pages/post/_id/_slug/index.vue
@@ -18,7 +18,7 @@
           placement="bottom-end"
           resource-type="contribution"
           :resource="post"
-          :callbacks="{ confirm: deletePostOptionsCallback, cancel: null }"
+          :callbacks="{ confirm: () => deletePostCallback('page'), cancel: null }"
           :is-owner="isAuthor(post.author.id)"
         />
       </no-ssr>
@@ -256,9 +256,6 @@ export default {
   methods: {
     isAuthor(id) {
       return this.$store.getters['auth/user'].id === id
-    },
-    async deletePostOptionsCallback() {
-      await deletePostCallback(true)
     }
   }
 }

From 8bcb250951e626bbc7f7bc6e4af08f435a1e0609 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Thu, 23 May 2019 10:22:36 +0200
Subject: [PATCH 09/20] Started to rewrite the tests of DeleteModal.vue

---
 webapp/components/ContentMenu.vue             |   2 +-
 webapp/components/Modal.vue                   |   5 +-
 webapp/components/Modal/DeleteModal.spec.js   |  31 ++-
 webapp/components/Modal/DeleteModal.vue       |  11 +-
 webapp/components/Modal/DisableModal.spec.js  |   1 +
 webapp/components/Modal/DisableModal.vue      |   9 +-
 webapp/components/Modal/ReportModal.spec.js   |  12 +-
 webapp/components/Modal/ReportModal.vue       |   7 +
 webapp/components/PostCard/index.vue          |   6 +-
 .../{Post.js => PostMutationHelpers.js}       |   3 +
 webapp/mixins/PostMutationHelpers.spec.js     |  71 +++++
 webapp/package.json                           |   1 -
 webapp/pages/post/_id/_slug/index.vue         |   4 +-
 webapp/pages/profile/_id/_slug.spec.js        | 243 ++++++++++++++++++
 webapp/pages/profile/_id/_slug.vue            |   4 +-
 15 files changed, 384 insertions(+), 26 deletions(-)
 rename webapp/mixins/{Post.js => PostMutationHelpers.js} (84%)
 create mode 100644 webapp/mixins/PostMutationHelpers.spec.js
 create mode 100644 webapp/pages/profile/_id/_slug.spec.js

diff --git a/webapp/components/ContentMenu.vue b/webapp/components/ContentMenu.vue
index 6ab42453c..2aaaafc13 100644
--- a/webapp/components/ContentMenu.vue
+++ b/webapp/components/ContentMenu.vue
@@ -61,7 +61,7 @@ export default {
         return value.match(/(contribution|comment|organization|user)/)
       }
     },
-    callbacks: { type: Object, default: () => {} }
+    callbacks: { type: Object, required: true }
   },
   computed: {
     routes() {
diff --git a/webapp/components/Modal.vue b/webapp/components/Modal.vue
index 0db4b74fd..6c0d33aba 100644
--- a/webapp/components/Modal.vue
+++ b/webapp/components/Modal.vue
@@ -6,6 +6,7 @@
       :id="data.resource.id"
       :type="data.type"
       :name="name"
+      :callbacks="data.callbacks"
       @close="close"
     />
     <report-modal
@@ -13,15 +14,15 @@
       :id="data.resource.id"
       :type="data.type"
       :name="name"
+      :callbacks="data.callbacks"
       @close="close"
     />
     <delete-modal
       v-if="open === 'delete'"
       :id="data.resource.id"
       :type="data.type"
-      :confirm-callback="data.callbacks.confirm"
-      :cancel-callback="!!data.callbacks.cancel ? data.callbacks.cancel : null"
       :name="name"
+      :callbacks="data.callbacks"
       @close="close"
     />
   </div>
diff --git a/webapp/components/Modal/DeleteModal.spec.js b/webapp/components/Modal/DeleteModal.spec.js
index 6127607a9..037e21351 100644
--- a/webapp/components/Modal/DeleteModal.spec.js
+++ b/webapp/components/Modal/DeleteModal.spec.js
@@ -1,4 +1,5 @@
 import { shallowMount, mount, createLocalVue } from '@vue/test-utils'
+import PostMutationHelpers from '~/mixins/PostMutationHelpers'
 import DeleteModal from './DeleteModal.vue'
 import Vue from 'vue'
 import Vuex from 'vuex'
@@ -22,7 +23,11 @@ describe('DeleteModal.vue', () => {
   beforeEach(() => {
     propsData = {
       type: 'contribution',
-      id: 'p23'
+      id: 'p23',
+      callbacks: {
+        confirm: () => Post.methods.deletePostCallback('list'),
+        cancel: null
+      }
     }
     mocks = {
       $t: jest.fn(),
@@ -59,7 +64,11 @@ describe('DeleteModal.vue', () => {
         propsData = {
           type: 'contribution',
           id: 'p23',
-          name: 'It is a post'
+          name: 'It is a post',
+          callbacks: {
+            confirm: () => Post.methods.deletePostCallback('list'),
+            cancel: null
+          }
         }
       })
 
@@ -78,7 +87,11 @@ describe('DeleteModal.vue', () => {
         propsData = {
           type: 'comment',
           id: 'c3',
-          name: 'It is the user of the comment'
+          name: 'It is the user of the comment',
+          callbacks: {
+            confirm: () => Post.methods.deletePostCallback('list'),
+            cancel: null
+          }
         }
       })
 
@@ -108,7 +121,11 @@ describe('DeleteModal.vue', () => {
       beforeEach(() => {
         propsData = {
           type: 'contribution',
-          id: 'p23'
+          id: 'p23',
+          callbacks: {
+            confirm: () => Post.methods.deletePostCallback('list'),
+            cancel: null
+          }
         }
         wrapper = Wrapper()
       })
@@ -177,7 +194,11 @@ describe('DeleteModal.vue', () => {
       beforeEach(() => {
         propsData = {
           type: 'comment',
-          id: 'c3'
+          id: 'c3',
+          callbacks: {
+            confirm: () => Post.methods.deletePostCallback('list'),
+            cancel: null
+          }
         }
         wrapper = Wrapper()
       })
diff --git a/webapp/components/Modal/DeleteModal.vue b/webapp/components/Modal/DeleteModal.vue
index ace5d9097..d0ff2b791 100644
--- a/webapp/components/Modal/DeleteModal.vue
+++ b/webapp/components/Modal/DeleteModal.vue
@@ -53,8 +53,7 @@ export default {
   props: {
     name: { type: String, default: '' },
     type: { type: String, required: true },
-    confirmCallback: { type: Function, required: true },
-    cancelCallback: { type: Function, default: null },
+    callbacks: { type: Object, required: true },
     id: { type: String, required: true }
   },
   data() {
@@ -75,8 +74,8 @@ export default {
   },
   methods: {
     async cancel() {
-      if (!!this.cancelCallback) {
-        await this.cancelCallback()
+      if (!!this.callbacks.cancel) {
+        await this.callbacks.cancel()
       }
       this.isOpen = false
       setTimeout(() => {
@@ -86,7 +85,9 @@ export default {
     async confirm() {
       this.loading = true
       try {
-        await this.confirmCallback()
+        if (!!this.callbacks.confirm) {
+          await this.callbacks.confirm()
+        }
         this.success = true
         setTimeout(() => {
           this.isOpen = false
diff --git a/webapp/components/Modal/DisableModal.spec.js b/webapp/components/Modal/DisableModal.spec.js
index e4debdc70..69c549833 100644
--- a/webapp/components/Modal/DisableModal.spec.js
+++ b/webapp/components/Modal/DisableModal.spec.js
@@ -17,6 +17,7 @@ describe('DisableModal.vue', () => {
     propsData = {
       type: 'contribution',
       name: 'blah',
+      callbacks: { confirm: null, cancel: null },
       id: 'c42'
     }
     mocks = {
diff --git a/webapp/components/Modal/DisableModal.vue b/webapp/components/Modal/DisableModal.vue
index 4ab0293cd..19ac0f9b7 100644
--- a/webapp/components/Modal/DisableModal.vue
+++ b/webapp/components/Modal/DisableModal.vue
@@ -34,6 +34,7 @@ export default {
   props: {
     name: { type: String, default: '' },
     type: { type: String, required: true },
+    callbacks: { type: Object, required: true },
     id: { type: String, required: true }
   },
   data() {
@@ -53,7 +54,10 @@ export default {
     }
   },
   methods: {
-    cancel() {
+    async cancel() {
+      if (!!this.callbacks.cancel) {
+        await this.callbacks.cancel()
+      }
       this.isOpen = false
       setTimeout(() => {
         this.$emit('close')
@@ -61,6 +65,9 @@ export default {
     },
     async confirm() {
       try {
+        if (!!this.callbacks.confirm) {
+          await this.callbacks.confirm()
+        }
         await this.$apollo.mutate({
           mutation: gql`
             mutation($id: ID!) {
diff --git a/webapp/components/Modal/ReportModal.spec.js b/webapp/components/Modal/ReportModal.spec.js
index 865348512..f9326e2d9 100644
--- a/webapp/components/Modal/ReportModal.spec.js
+++ b/webapp/components/Modal/ReportModal.spec.js
@@ -18,7 +18,8 @@ describe('ReportModal.vue', () => {
   beforeEach(() => {
     propsData = {
       type: 'contribution',
-      id: 'c43'
+      id: 'c43',
+      callbacks: { confirm: null, cancel: null }
     }
     mocks = {
       $t: jest.fn(),
@@ -55,7 +56,8 @@ describe('ReportModal.vue', () => {
         propsData = {
           type: 'user',
           id: 'u4',
-          name: 'Bob Ross'
+          name: 'Bob Ross',
+          callbacks: { confirm: null, cancel: null }
         }
       })
 
@@ -72,7 +74,8 @@ describe('ReportModal.vue', () => {
         propsData = {
           id: 'p23',
           type: 'post',
-          name: 'It is a post'
+          name: 'It is a post',
+          callbacks: { confirm: null, cancel: null }
         }
       })
 
@@ -100,7 +103,8 @@ describe('ReportModal.vue', () => {
       beforeEach(() => {
         propsData = {
           type: 'user',
-          id: 'u4711'
+          id: 'u4711',
+          callbacks: { confirm: null, cancel: null }
         }
         wrapper = Wrapper()
       })
diff --git a/webapp/components/Modal/ReportModal.vue b/webapp/components/Modal/ReportModal.vue
index 846fe5420..382e8df60 100644
--- a/webapp/components/Modal/ReportModal.vue
+++ b/webapp/components/Modal/ReportModal.vue
@@ -53,6 +53,7 @@ export default {
   props: {
     name: { type: String, default: '' },
     type: { type: String, required: true },
+    callbacks: { type: Object, required: true },
     id: { type: String, required: true }
   },
   data() {
@@ -73,6 +74,9 @@ export default {
   },
   methods: {
     async cancel() {
+      if (!!this.callbacks.cancel) {
+        await this.callbacks.cancel()
+      }
       this.isOpen = false
       setTimeout(() => {
         this.$emit('close')
@@ -81,6 +85,9 @@ export default {
     async confirm() {
       this.loading = true
       try {
+        if (!!this.callbacks.confirm) {
+          await this.callbacks.confirm()
+        }
         await this.$apollo.mutate({
           mutation: gql`
             mutation($id: ID!) {
diff --git a/webapp/components/PostCard/index.vue b/webapp/components/PostCard/index.vue
index dfee29c8f..58b38e285 100644
--- a/webapp/components/PostCard/index.vue
+++ b/webapp/components/PostCard/index.vue
@@ -82,7 +82,7 @@ import HcUser from '~/components/User'
 import ContentMenu from '~/components/ContentMenu'
 import { randomBytes } from 'crypto'
 import { mapGetters } from 'vuex'
-import Post from '~/mixins/Post'
+import PostMutationHelpers from '~/mixins/PostMutationHelpers'
 
 export default {
   name: 'HcPostCard',
@@ -90,7 +90,7 @@ export default {
     HcUser,
     ContentMenu
   },
-  mixins: [Post],
+  mixins: [PostMutationHelpers],
   props: {
     post: {
       type: Object,
@@ -98,7 +98,7 @@ export default {
     },
     width: {
       type: Object,
-      required: true
+      default: () => {}
     }
   },
   computed: {
diff --git a/webapp/mixins/Post.js b/webapp/mixins/PostMutationHelpers.js
similarity index 84%
rename from webapp/mixins/Post.js
rename to webapp/mixins/PostMutationHelpers.js
index 24779bab1..830c56a26 100644
--- a/webapp/mixins/Post.js
+++ b/webapp/mixins/PostMutationHelpers.js
@@ -3,6 +3,7 @@ import gql from 'graphql-tag'
 export default {
   methods: {
     async deletePostCallback(postDisplayType = 'list') {
+      console.log('inside "deletePostCallback" !!! ', this.post)
       try {
         var gqlMutation = gql`
           mutation($id: ID!) {
@@ -19,8 +20,10 @@ export default {
         switch (postDisplayType) {
           case 'list':
             this.$emit('deletePost')
+            console.log('emitted "deletePost" !!!')
             break
           default:
+            // case 'page'
             this.$router.history.push('/') // Single page type: Redirect to index
             break
         }
diff --git a/webapp/mixins/PostMutationHelpers.spec.js b/webapp/mixins/PostMutationHelpers.spec.js
new file mode 100644
index 000000000..5854917df
--- /dev/null
+++ b/webapp/mixins/PostMutationHelpers.spec.js
@@ -0,0 +1,71 @@
+import { shallowMount, mount, createLocalVue } from '@vue/test-utils'
+import Methods from '~/mixins/PostMutationHelpers'
+
+const {
+  methods: { deletePostCallback }
+} = Methods
+// console.log(deletePostCallback())
+
+describe('PostMutationHelpers.js', () => {
+  let post
+  let mocks
+
+  beforeEach(() => {
+    post = {
+      id: 'p23'
+    }
+    mocks = {
+      $t: jest.fn(),
+      $filters: {
+        truncate: a => a
+      },
+      $emit: jest.fn(),
+      $router: {
+        history: {
+          push: jest.fn()
+        }
+      },
+      $toast: {
+        success: () => {},
+        error: () => {}
+      },
+      $apollo: {
+        mutate: jest.fn().mockResolvedValue()
+      }
+    }
+  })
+
+  describe('given post id', () => {
+    describe('delete post in general', () => {
+      beforeEach(() => {
+        deletePostCallback()
+      })
+
+      it('calls delete mutation', () => {
+        expect(mocks.$apollo.mutate).toHaveBeenCalled()
+      })
+
+      it('displays a success message', () => {
+        const calls = mocks.$t.mock.calls
+        const expected = [['delete.contribution.success']]
+        expect(calls).toEqual(expect.arrayContaining(expected))
+      })
+
+      it.todo('displays an error message')
+    })
+
+    describe('delete Post from list', () => {
+      it('calls delete in list', () => {
+        deletePostCallback('list')
+        expect(mocks.$emit).toHaveBeenCalled()
+      })
+    })
+
+    describe('delete Post displayed on post page', () => {
+      it('routs to index (main page) on post page', () => {
+        deletePostCallback('page')
+        expect($router.history.push).toHaveBeenCalled()
+      })
+    })
+  })
+})
diff --git a/webapp/package.json b/webapp/package.json
index a3e8b44b9..e6e149b73 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -29,7 +29,6 @@
       "!**/?(*.)+(spec|test).js?(x)"
     ],
     "coverageReporters": [
-      "text",
       "lcov"
     ],
     "transform": {
diff --git a/webapp/pages/post/_id/_slug/index.vue b/webapp/pages/post/_id/_slug/index.vue
index 102d9007c..cefc90792 100644
--- a/webapp/pages/post/_id/_slug/index.vue
+++ b/webapp/pages/post/_id/_slug/index.vue
@@ -115,7 +115,7 @@ import HcUser from '~/components/User'
 import HcShoutButton from '~/components/ShoutButton.vue'
 import HcCommentForm from '~/components/comments/CommentForm'
 import HcCommentList from '~/components/comments/CommentList'
-import Post from '~/mixins/Post'
+import PostMutationHelpers from '~/mixins/PostMutationHelpers'
 
 export default {
   transition: {
@@ -131,7 +131,7 @@ export default {
     HcCommentForm,
     HcCommentList
   },
-  mixins: [Post],
+  mixins: [PostMutationHelpers],
   head() {
     return {
       title: this.title
diff --git a/webapp/pages/profile/_id/_slug.spec.js b/webapp/pages/profile/_id/_slug.spec.js
new file mode 100644
index 000000000..c2f342b49
--- /dev/null
+++ b/webapp/pages/profile/_id/_slug.spec.js
@@ -0,0 +1,243 @@
+import { shallowMount, mount, createLocalVue } from '@vue/test-utils'
+// import PostMutationHelpers from '~/mixins/PostMutationHelpers'
+import PostSlug from './_slug.vue'
+import Vue from 'vue'
+import Vuex from 'vuex'
+import Styleguide from '@human-connection/styleguide'
+import VueRouter from 'vue-router'
+
+const routes = [{ path: '/' }]
+const router = new VueRouter({ routes })
+const localVue = createLocalVue()
+
+localVue.use(Vuex)
+localVue.use(Styleguide)
+localVue.use(VueRouter)
+
+describe('PostSlug', () => {
+  let wrapper
+  let Wrapper
+  let propsData
+  let mocks
+
+  beforeEach(() => {
+    propsData = {}
+    mocks = {
+      post: {
+        id: 'p23'
+      },
+      $t: jest.fn(),
+      // $filters: {
+      //   truncate: a => a
+      // },
+      $toast: {
+        success: () => {},
+        error: () => {}
+      },
+      $apollo: {
+        mutate: jest.fn().mockResolvedValue()
+      }
+    }
+  })
+
+//   describe('shallowMount', () => {
+//     Wrapper = () => {
+//       return shallowMount(PostSlug, { propsData, mocks, localVue, router })
+//     }
+
+//     describe('defaults', () => {
+//       it('success false', () => {
+//         console.log(Wrapper().vm)
+//         expect(Wrapper().vm.success).toBe(false)
+//       })
+
+//       it('loading false', () => {
+//         expect(Wrapper().vm.loading).toBe(false)
+//       })
+//     })
+
+    // describe('given a post', () => {
+    //   beforeEach(() => {
+    //     propsData = {
+    //       type: 'contribution',
+    //       id: 'p23',
+    //       name: 'It is a post'
+    //     //   callbacks: {
+    //     //     confirm: () => Post.methods.deletePostCallback('list'),
+    //     //     cancel: null
+    //     //   }
+    //     }
+    //   })
+
+    //   it('mentions post title', () => {
+    //     Wrapper()
+    //     const calls = mocks.$t.mock.calls
+    //     const expected = [
+    //       ['delete.contribution.message', { name: 'It is a post' }]
+    //     ]
+    //     expect(calls).toEqual(expect.arrayContaining(expected))
+    //   })
+    // })
+
+    // describe('given a comment', () => {
+    //   beforeEach(() => {
+    //     propsData = {
+    //       type: 'comment',
+    //       id: 'c3',
+    //       name: 'It is the user of the comment'
+    //     //   callbacks: {
+    //     //     confirm: () => Post.methods.deletePostCallback('list'),
+    //     //     cancel: null
+    //     //   }
+    //     }
+    //   })
+
+    //   it('mentions comments user name', () => {
+    //     Wrapper()
+    //     const calls = mocks.$t.mock.calls
+    //     const expected = [
+    //       ['delete.comment.message', { name: 'It is the user of the comment' }]
+    //     ]
+    //     expect(calls).toEqual(expect.arrayContaining(expected))
+    //   })
+    // })
+//   })
+
+  describe('mount', () => {
+    Wrapper = () => {
+      return mount(PostSlug, { propsData, mocks, localVue, router })
+    }
+
+    beforeEach(jest.useFakeTimers)
+
+    it('renders', () => {
+      // console.log(Wrapper().vm)
+      expect(Wrapper().is('div')).toBe(true)
+    })
+
+    describe('given post id', () => {
+      beforeEach(() => {
+        // post = {
+        //   id: 'p23'
+        // }
+        wrapper = Wrapper()
+      })
+
+      describe('confirm deletion of Post from List by invoking "deletePostCallback"', () => {
+        beforeEach(() => {
+          wrapper = Wrapper()
+          wrapper.vm.deletePostCallback('list')
+        })
+
+        describe('after timeout', () => {
+          beforeEach(jest.runAllTimers)
+
+          // it('fades away', () => {
+          //   expect(wrapper.vm.isOpen).toBe(false)
+          // })
+
+          it('emits "deletePost"', () => {
+            expect(wrapper.emitted().deletePost).toBeTruthy()
+          })
+
+          it('does call mutation', () => {
+            expect(mocks.$apollo.mutate).toHaveBeenCalled()
+          })
+        })
+      })
+
+      // describe('click cancel button and do not delete the post', () => {
+      //   beforeEach(() => {
+      //     wrapper = Wrapper()
+      //     wrapper.find('button.cancel').trigger('click')
+      //   })
+
+      //   describe('after timeout', () => {
+      //     beforeEach(jest.runAllTimers)
+
+      //     it('fades away', () => {
+      //       expect(wrapper.vm.isOpen).toBe(false)
+      //     })
+
+      //     it('emits "close"', () => {
+      //       expect(wrapper.emitted().close).toBeTruthy()
+      //     })
+
+      //     it('does not call mutation', () => {
+      //       expect(mocks.$apollo.mutate).not.toHaveBeenCalled()
+      //     })
+      //   })
+      // })
+
+//       describe('click confirm button and delete the post', () => {
+//         beforeEach(() => {
+//           wrapper.find('button.confirm').trigger('click')
+//         })
+
+//         it('calls delete mutation', () => {
+//           expect(mocks.$apollo.mutate).toHaveBeenCalled()
+//         })
+
+//         it('sets success', () => {
+//           expect(wrapper.vm.success).toBe(true)
+//         })
+
+//         it('displays a success message', () => {
+//           const calls = mocks.$t.mock.calls
+//           const expected = [['delete.contribution.success']]
+//           expect(calls).toEqual(expect.arrayContaining(expected))
+//         })
+
+//         describe('after timeout', () => {
+//           beforeEach(jest.runAllTimers)
+
+//           it('fades away', () => {
+//             expect(wrapper.vm.isOpen).toBe(false)
+//           })
+
+//           it('emits close', () => {
+//             expect(wrapper.emitted().close).toBeTruthy()
+//           })
+
+//           it('resets success', () => {
+//             expect(wrapper.vm.success).toBe(false)
+//           })
+//         })
+//       })
+    })
+
+//     describe('given comment id', () => {
+//       beforeEach(() => {
+//         propsData = {
+//           type: 'comment',
+//           id: 'c3'
+//         //   callbacks: {
+//         //     confirm: () => Post.methods.deletePostCallback('list'),
+//         //     cancel: null
+//         //   }
+//         }
+//         wrapper = Wrapper()
+//       })
+
+//       describe('click confirm button and delete the comment', () => {
+//         beforeEach(() => {
+//           wrapper.find('button.confirm').trigger('click')
+//         })
+
+//         it('calls delete mutation', () => {
+//           expect(mocks.$apollo.mutate).toHaveBeenCalled()
+//         })
+
+//         it('sets success', () => {
+//           expect(wrapper.vm.success).toBe(true)
+//         })
+
+//         it('displays a success message', () => {
+//           const calls = mocks.$t.mock.calls
+//           const expected = [['delete.comment.success']]
+//           expect(calls).toEqual(expect.arrayContaining(expected))
+//         })
+//       })
+//     })
+  })
+})
diff --git a/webapp/pages/profile/_id/_slug.vue b/webapp/pages/profile/_id/_slug.vue
index d4db41fb5..613967553 100644
--- a/webapp/pages/profile/_id/_slug.vue
+++ b/webapp/pages/profile/_id/_slug.vue
@@ -328,7 +328,7 @@ import HcBadges from '~/components/Badges.vue'
 import HcLoadMore from '~/components/LoadMore.vue'
 import HcEmpty from '~/components/Empty.vue'
 import ContentMenu from '~/components/ContentMenu'
-import Post from '~/mixins/Post'
+import PostMutationHelpers from '~/mixins/PostMutationHelpers'
 
 export default {
   components: {
@@ -341,7 +341,7 @@ export default {
     HcEmpty,
     ContentMenu
   },
-  mixins: [Post],
+  mixins: [PostMutationHelpers],
   transition: {
     name: 'slide-up',
     mode: 'out-in'

From f9fe4f742f06ff8206a9673af92300f86190e121 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Mon, 27 May 2019 12:39:37 +0200
Subject: [PATCH 10/20] Lint fixes

---
 webapp/components/Comment.vue               |   4 +-
 webapp/components/ContentMenu.vue           |   8 +-
 webapp/components/Modal/DeleteModal.spec.js |  22 +-
 webapp/components/Modal/DeleteModal.vue     |   4 +-
 webapp/components/Modal/DisableModal.vue    |   4 +-
 webapp/components/Modal/ReportModal.vue     |   4 +-
 webapp/components/PostCard/index.vue        |  26 +--
 webapp/mixins/PostMutationHelpers.js        |   6 +-
 webapp/mixins/PostMutationHelpers.spec.js   |  16 +-
 webapp/pages/post/_id/_slug/more-info.vue   |   2 +-
 webapp/pages/profile/_id/_slug.spec.js      | 234 ++++++++++----------
 11 files changed, 163 insertions(+), 167 deletions(-)

diff --git a/webapp/components/Comment.vue b/webapp/components/Comment.vue
index 06f5b4bde..ce5433332 100644
--- a/webapp/components/Comment.vue
+++ b/webapp/components/Comment.vue
@@ -84,7 +84,7 @@ export default {
         `
         await this.$apollo.mutate({
           mutation: gqlMutation,
-          variables: { id: this.comment.id }
+          variables: { id: this.comment.id },
         })
         this.$toast.success(this.$t(`delete.comment.success`))
         this.$emit('deleteComment')
@@ -92,6 +92,6 @@ export default {
         this.$toast.error(err.message)
       }
     },
-  }
+  },
 }
 </script>
diff --git a/webapp/components/ContentMenu.vue b/webapp/components/ContentMenu.vue
index bee5ca011..a8b4db02f 100644
--- a/webapp/components/ContentMenu.vue
+++ b/webapp/components/ContentMenu.vue
@@ -59,7 +59,7 @@ export default {
       required: true,
       validator: value => {
         return value.match(/(contribution|comment|organization|user)/)
-      }
+      },
     },
     callbacks: { type: Object, required: true },
   },
@@ -101,7 +101,7 @@ export default {
           callback: () => {
             this.openModal('delete')
           },
-          icon: 'trash'
+          icon: 'trash',
         })
       }
 
@@ -153,8 +153,8 @@ export default {
         data: {
           type: this.resourceType,
           resource: this.resource,
-          callbacks: this.callbacks
-        }
+          callbacks: this.callbacks,
+        },
       })
     },
   },
diff --git a/webapp/components/Modal/DeleteModal.spec.js b/webapp/components/Modal/DeleteModal.spec.js
index 0b01c3647..8fd250e19 100644
--- a/webapp/components/Modal/DeleteModal.spec.js
+++ b/webapp/components/Modal/DeleteModal.spec.js
@@ -24,7 +24,7 @@ describe('DeleteModal.vue', () => {
       id: 'p23',
       callbacks: {
         confirm: () => Post.methods.deletePostCallback('list'),
-        cancel: null
+        cancel: null,
       },
     }
     mocks = {
@@ -65,7 +65,7 @@ describe('DeleteModal.vue', () => {
           name: 'It is a post',
           callbacks: {
             confirm: () => Post.methods.deletePostCallback('list'),
-            cancel: null
+            cancel: null,
           },
         }
       })
@@ -73,9 +73,7 @@ describe('DeleteModal.vue', () => {
       it('mentions post title', () => {
         Wrapper()
         const calls = mocks.$t.mock.calls
-        const expected = [
-          ['delete.contribution.message', { name: 'It is a post' }]
-        ]
+        const expected = [['delete.contribution.message', { name: 'It is a post' }]]
         expect(calls).toEqual(expect.arrayContaining(expected))
       })
     })
@@ -88,17 +86,15 @@ describe('DeleteModal.vue', () => {
           name: 'It is the user of the comment',
           callbacks: {
             confirm: () => Post.methods.deletePostCallback('list'),
-            cancel: null
-          }
+            cancel: null,
+          },
         }
       })
 
       it('mentions comments user name', () => {
         Wrapper()
         const calls = mocks.$t.mock.calls
-        const expected = [
-          ['delete.comment.message', { name: 'It is the user of the comment' }]
-        ]
+        const expected = [['delete.comment.message', { name: 'It is the user of the comment' }]]
         expect(calls).toEqual(expect.arrayContaining(expected))
       })
     })
@@ -122,7 +118,7 @@ describe('DeleteModal.vue', () => {
           id: 'p23',
           callbacks: {
             confirm: () => Post.methods.deletePostCallback('list'),
-            cancel: null
+            cancel: null,
           },
         }
         wrapper = Wrapper()
@@ -195,8 +191,8 @@ describe('DeleteModal.vue', () => {
           id: 'c3',
           callbacks: {
             confirm: () => Post.methods.deletePostCallback('list'),
-            cancel: null
-          }
+            cancel: null,
+          },
         }
         wrapper = Wrapper()
       })
diff --git a/webapp/components/Modal/DeleteModal.vue b/webapp/components/Modal/DeleteModal.vue
index 883dc28d8..ef542973b 100644
--- a/webapp/components/Modal/DeleteModal.vue
+++ b/webapp/components/Modal/DeleteModal.vue
@@ -74,7 +74,7 @@ export default {
   },
   methods: {
     async cancel() {
-      if (!!this.callbacks.cancel) {
+      if (this.callbacks.cancel) {
         await this.callbacks.cancel()
       }
       this.isOpen = false
@@ -85,7 +85,7 @@ export default {
     async confirm() {
       this.loading = true
       try {
-        if (!!this.callbacks.confirm) {
+        if (this.callbacks.confirm) {
           await this.callbacks.confirm()
         }
         this.success = true
diff --git a/webapp/components/Modal/DisableModal.vue b/webapp/components/Modal/DisableModal.vue
index c2d3d64a4..fe9921511 100644
--- a/webapp/components/Modal/DisableModal.vue
+++ b/webapp/components/Modal/DisableModal.vue
@@ -55,7 +55,7 @@ export default {
   },
   methods: {
     async cancel() {
-      if (!!this.callbacks.cancel) {
+      if (this.callbacks.cancel) {
         await this.callbacks.cancel()
       }
       this.isOpen = false
@@ -65,7 +65,7 @@ export default {
     },
     async confirm() {
       try {
-        if (!!this.callbacks.confirm) {
+        if (this.callbacks.confirm) {
           await this.callbacks.confirm()
         }
         await this.$apollo.mutate({
diff --git a/webapp/components/Modal/ReportModal.vue b/webapp/components/Modal/ReportModal.vue
index 2fa85967f..1d99bead1 100644
--- a/webapp/components/Modal/ReportModal.vue
+++ b/webapp/components/Modal/ReportModal.vue
@@ -74,7 +74,7 @@ export default {
   },
   methods: {
     async cancel() {
-      if (!!this.callbacks.cancel) {
+      if (this.callbacks.cancel) {
         await this.callbacks.cancel()
       }
       this.isOpen = false
@@ -85,7 +85,7 @@ export default {
     async confirm() {
       this.loading = true
       try {
-        if (!!this.callbacks.confirm) {
+        if (this.callbacks.confirm) {
           await this.callbacks.confirm()
         }
         await this.$apollo.mutate({
diff --git a/webapp/components/PostCard/index.vue b/webapp/components/PostCard/index.vue
index b5f7e5e9b..7a6f5da89 100644
--- a/webapp/components/PostCard/index.vue
+++ b/webapp/components/PostCard/index.vue
@@ -1,16 +1,16 @@
 <template>
-    <ds-card
-      :header="post.title"
-      :image="post.image"
-      :class="{'post-card': true, 'disabled-content': post.disabled}"
+  <ds-card
+    :header="post.title"
+    :image="post.image"
+    :class="{'post-card': true, 'disabled-content': post.disabled}"
+  >
+    <!-- Post Link Target -->
+    <nuxt-link
+      class="post-link"
+      :to="{ name: 'post-id-slug', params: { id: post.id, slug: post.slug } }"
     >
-      <!-- Post Link Target -->
-      <nuxt-link
-        class="post-link"
-        :to="{ name: 'post-id-slug', params: { id: post.id, slug: post.slug } }"
-      >
-        {{ post.title }}
-      </nuxt-link>
+      {{ post.title }}
+    </nuxt-link>
     <ds-space margin-bottom="small" />
     <!-- Username, Image & Date of Post -->
     <div>
@@ -74,7 +74,7 @@
         </div>
       </no-ssr>
     </template>
-    </ds-card>
+  </ds-card>
 </template>
 
 <script>
@@ -102,7 +102,7 @@ export default {
     },
     width: {
       type: Object,
-      default: () => {}
+      default: () => {},
     },
   },
   computed: {
diff --git a/webapp/mixins/PostMutationHelpers.js b/webapp/mixins/PostMutationHelpers.js
index 830c56a26..a19ee4949 100644
--- a/webapp/mixins/PostMutationHelpers.js
+++ b/webapp/mixins/PostMutationHelpers.js
@@ -14,7 +14,7 @@ export default {
         `
         await this.$apollo.mutate({
           mutation: gqlMutation,
-          variables: { id: this.post.id }
+          variables: { id: this.post.id },
         })
         this.$toast.success(this.$t(`delete.contribution.success`))
         switch (postDisplayType) {
@@ -30,6 +30,6 @@ export default {
       } catch (err) {
         this.$toast.error(err.message)
       }
-    }
-  }
+    },
+  },
 }
diff --git a/webapp/mixins/PostMutationHelpers.spec.js b/webapp/mixins/PostMutationHelpers.spec.js
index 5854917df..a99e644a2 100644
--- a/webapp/mixins/PostMutationHelpers.spec.js
+++ b/webapp/mixins/PostMutationHelpers.spec.js
@@ -2,7 +2,7 @@ import { shallowMount, mount, createLocalVue } from '@vue/test-utils'
 import Methods from '~/mixins/PostMutationHelpers'
 
 const {
-  methods: { deletePostCallback }
+  methods: { deletePostCallback },
 } = Methods
 // console.log(deletePostCallback())
 
@@ -12,26 +12,26 @@ describe('PostMutationHelpers.js', () => {
 
   beforeEach(() => {
     post = {
-      id: 'p23'
+      id: 'p23',
     }
     mocks = {
       $t: jest.fn(),
       $filters: {
-        truncate: a => a
+        truncate: a => a,
       },
       $emit: jest.fn(),
       $router: {
         history: {
-          push: jest.fn()
-        }
+          push: jest.fn(),
+        },
       },
       $toast: {
         success: () => {},
-        error: () => {}
+        error: () => {},
       },
       $apollo: {
-        mutate: jest.fn().mockResolvedValue()
-      }
+        mutate: jest.fn().mockResolvedValue(),
+      },
     }
   })
 
diff --git a/webapp/pages/post/_id/_slug/more-info.vue b/webapp/pages/post/_id/_slug/more-info.vue
index 5e036e4f5..f7f5d583e 100644
--- a/webapp/pages/post/_id/_slug/more-info.vue
+++ b/webapp/pages/post/_id/_slug/more-info.vue
@@ -76,7 +76,7 @@ export default {
   methods: {
     deletePost(index) {
       this.post.relatedContributions.splice(index, 1)
-    }
+    },
   },
   apollo: {
     Post: {
diff --git a/webapp/pages/profile/_id/_slug.spec.js b/webapp/pages/profile/_id/_slug.spec.js
index c2f342b49..8fb8b4a14 100644
--- a/webapp/pages/profile/_id/_slug.spec.js
+++ b/webapp/pages/profile/_id/_slug.spec.js
@@ -24,7 +24,7 @@ describe('PostSlug', () => {
     propsData = {}
     mocks = {
       post: {
-        id: 'p23'
+        id: 'p23',
       },
       $t: jest.fn(),
       // $filters: {
@@ -32,76 +32,76 @@ describe('PostSlug', () => {
       // },
       $toast: {
         success: () => {},
-        error: () => {}
+        error: () => {},
       },
       $apollo: {
-        mutate: jest.fn().mockResolvedValue()
-      }
+        mutate: jest.fn().mockResolvedValue(),
+      },
     }
   })
 
-//   describe('shallowMount', () => {
-//     Wrapper = () => {
-//       return shallowMount(PostSlug, { propsData, mocks, localVue, router })
-//     }
+  //   describe('shallowMount', () => {
+  //     Wrapper = () => {
+  //       return shallowMount(PostSlug, { propsData, mocks, localVue, router })
+  //     }
 
-//     describe('defaults', () => {
-//       it('success false', () => {
-//         console.log(Wrapper().vm)
-//         expect(Wrapper().vm.success).toBe(false)
-//       })
+  //     describe('defaults', () => {
+  //       it('success false', () => {
+  //         console.log(Wrapper().vm)
+  //         expect(Wrapper().vm.success).toBe(false)
+  //       })
 
-//       it('loading false', () => {
-//         expect(Wrapper().vm.loading).toBe(false)
-//       })
-//     })
+  //       it('loading false', () => {
+  //         expect(Wrapper().vm.loading).toBe(false)
+  //       })
+  //     })
 
-    // describe('given a post', () => {
-    //   beforeEach(() => {
-    //     propsData = {
-    //       type: 'contribution',
-    //       id: 'p23',
-    //       name: 'It is a post'
-    //     //   callbacks: {
-    //     //     confirm: () => Post.methods.deletePostCallback('list'),
-    //     //     cancel: null
-    //     //   }
-    //     }
-    //   })
+  // describe('given a post', () => {
+  //   beforeEach(() => {
+  //     propsData = {
+  //       type: 'contribution',
+  //       id: 'p23',
+  //       name: 'It is a post'
+  //     //   callbacks: {
+  //     //     confirm: () => Post.methods.deletePostCallback('list'),
+  //     //     cancel: null
+  //     //   }
+  //     }
+  //   })
 
-    //   it('mentions post title', () => {
-    //     Wrapper()
-    //     const calls = mocks.$t.mock.calls
-    //     const expected = [
-    //       ['delete.contribution.message', { name: 'It is a post' }]
-    //     ]
-    //     expect(calls).toEqual(expect.arrayContaining(expected))
-    //   })
-    // })
+  //   it('mentions post title', () => {
+  //     Wrapper()
+  //     const calls = mocks.$t.mock.calls
+  //     const expected = [
+  //       ['delete.contribution.message', { name: 'It is a post' }]
+  //     ]
+  //     expect(calls).toEqual(expect.arrayContaining(expected))
+  //   })
+  // })
 
-    // describe('given a comment', () => {
-    //   beforeEach(() => {
-    //     propsData = {
-    //       type: 'comment',
-    //       id: 'c3',
-    //       name: 'It is the user of the comment'
-    //     //   callbacks: {
-    //     //     confirm: () => Post.methods.deletePostCallback('list'),
-    //     //     cancel: null
-    //     //   }
-    //     }
-    //   })
+  // describe('given a comment', () => {
+  //   beforeEach(() => {
+  //     propsData = {
+  //       type: 'comment',
+  //       id: 'c3',
+  //       name: 'It is the user of the comment'
+  //     //   callbacks: {
+  //     //     confirm: () => Post.methods.deletePostCallback('list'),
+  //     //     cancel: null
+  //     //   }
+  //     }
+  //   })
 
-    //   it('mentions comments user name', () => {
-    //     Wrapper()
-    //     const calls = mocks.$t.mock.calls
-    //     const expected = [
-    //       ['delete.comment.message', { name: 'It is the user of the comment' }]
-    //     ]
-    //     expect(calls).toEqual(expect.arrayContaining(expected))
-    //   })
-    // })
-//   })
+  //   it('mentions comments user name', () => {
+  //     Wrapper()
+  //     const calls = mocks.$t.mock.calls
+  //     const expected = [
+  //       ['delete.comment.message', { name: 'It is the user of the comment' }]
+  //     ]
+  //     expect(calls).toEqual(expect.arrayContaining(expected))
+  //   })
+  // })
+  //   })
 
   describe('mount', () => {
     Wrapper = () => {
@@ -169,75 +169,75 @@ describe('PostSlug', () => {
       //   })
       // })
 
-//       describe('click confirm button and delete the post', () => {
-//         beforeEach(() => {
-//           wrapper.find('button.confirm').trigger('click')
-//         })
+      //       describe('click confirm button and delete the post', () => {
+      //         beforeEach(() => {
+      //           wrapper.find('button.confirm').trigger('click')
+      //         })
 
-//         it('calls delete mutation', () => {
-//           expect(mocks.$apollo.mutate).toHaveBeenCalled()
-//         })
+      //         it('calls delete mutation', () => {
+      //           expect(mocks.$apollo.mutate).toHaveBeenCalled()
+      //         })
 
-//         it('sets success', () => {
-//           expect(wrapper.vm.success).toBe(true)
-//         })
+      //         it('sets success', () => {
+      //           expect(wrapper.vm.success).toBe(true)
+      //         })
 
-//         it('displays a success message', () => {
-//           const calls = mocks.$t.mock.calls
-//           const expected = [['delete.contribution.success']]
-//           expect(calls).toEqual(expect.arrayContaining(expected))
-//         })
+      //         it('displays a success message', () => {
+      //           const calls = mocks.$t.mock.calls
+      //           const expected = [['delete.contribution.success']]
+      //           expect(calls).toEqual(expect.arrayContaining(expected))
+      //         })
 
-//         describe('after timeout', () => {
-//           beforeEach(jest.runAllTimers)
+      //         describe('after timeout', () => {
+      //           beforeEach(jest.runAllTimers)
 
-//           it('fades away', () => {
-//             expect(wrapper.vm.isOpen).toBe(false)
-//           })
+      //           it('fades away', () => {
+      //             expect(wrapper.vm.isOpen).toBe(false)
+      //           })
 
-//           it('emits close', () => {
-//             expect(wrapper.emitted().close).toBeTruthy()
-//           })
+      //           it('emits close', () => {
+      //             expect(wrapper.emitted().close).toBeTruthy()
+      //           })
 
-//           it('resets success', () => {
-//             expect(wrapper.vm.success).toBe(false)
-//           })
-//         })
-//       })
+      //           it('resets success', () => {
+      //             expect(wrapper.vm.success).toBe(false)
+      //           })
+      //         })
+      //       })
     })
 
-//     describe('given comment id', () => {
-//       beforeEach(() => {
-//         propsData = {
-//           type: 'comment',
-//           id: 'c3'
-//         //   callbacks: {
-//         //     confirm: () => Post.methods.deletePostCallback('list'),
-//         //     cancel: null
-//         //   }
-//         }
-//         wrapper = Wrapper()
-//       })
+    //     describe('given comment id', () => {
+    //       beforeEach(() => {
+    //         propsData = {
+    //           type: 'comment',
+    //           id: 'c3'
+    //         //   callbacks: {
+    //         //     confirm: () => Post.methods.deletePostCallback('list'),
+    //         //     cancel: null
+    //         //   }
+    //         }
+    //         wrapper = Wrapper()
+    //       })
 
-//       describe('click confirm button and delete the comment', () => {
-//         beforeEach(() => {
-//           wrapper.find('button.confirm').trigger('click')
-//         })
+    //       describe('click confirm button and delete the comment', () => {
+    //         beforeEach(() => {
+    //           wrapper.find('button.confirm').trigger('click')
+    //         })
 
-//         it('calls delete mutation', () => {
-//           expect(mocks.$apollo.mutate).toHaveBeenCalled()
-//         })
+    //         it('calls delete mutation', () => {
+    //           expect(mocks.$apollo.mutate).toHaveBeenCalled()
+    //         })
 
-//         it('sets success', () => {
-//           expect(wrapper.vm.success).toBe(true)
-//         })
+    //         it('sets success', () => {
+    //           expect(wrapper.vm.success).toBe(true)
+    //         })
 
-//         it('displays a success message', () => {
-//           const calls = mocks.$t.mock.calls
-//           const expected = [['delete.comment.success']]
-//           expect(calls).toEqual(expect.arrayContaining(expected))
-//         })
-//       })
-//     })
+    //         it('displays a success message', () => {
+    //           const calls = mocks.$t.mock.calls
+    //           const expected = [['delete.comment.success']]
+    //           expect(calls).toEqual(expect.arrayContaining(expected))
+    //         })
+    //       })
+    //     })
   })
 })

From 5380a5d6af139ab42aac8ae45b6ee194f39afa77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Mon, 27 May 2019 15:35:51 +0200
Subject: [PATCH 11/20] Fixed Lint

---
 webapp/components/Modal/DeleteModal.spec.js | 42 ++++++++++++++++++---
 webapp/components/Modal/DeleteModal.vue     |  5 +--
 2 files changed, 37 insertions(+), 10 deletions(-)

diff --git a/webapp/components/Modal/DeleteModal.spec.js b/webapp/components/Modal/DeleteModal.spec.js
index 8fd250e19..664a0bdd6 100644
--- a/webapp/components/Modal/DeleteModal.spec.js
+++ b/webapp/components/Modal/DeleteModal.spec.js
@@ -5,8 +5,14 @@ import Vuex from 'vuex'
 import Styleguide from '@human-connection/styleguide'
 import VueRouter from 'vue-router'
 
-const routes = [{ path: '/' }]
-const router = new VueRouter({ routes })
+const routes = [
+  {
+    path: '/',
+  },
+]
+const router = new VueRouter({
+  routes,
+})
 const localVue = createLocalVue()
 
 localVue.use(Vuex)
@@ -44,7 +50,12 @@ describe('DeleteModal.vue', () => {
 
   describe('shallowMount', () => {
     Wrapper = () => {
-      return shallowMount(DeleteModal, { propsData, mocks, localVue, router })
+      return shallowMount(DeleteModal, {
+        propsData,
+        mocks,
+        localVue,
+        router,
+      })
     }
 
     describe('defaults', () => {
@@ -73,7 +84,14 @@ describe('DeleteModal.vue', () => {
       it('mentions post title', () => {
         Wrapper()
         const calls = mocks.$t.mock.calls
-        const expected = [['delete.contribution.message', { name: 'It is a post' }]]
+        const expected = [
+          [
+            'delete.contribution.message',
+            {
+              name: 'It is a post',
+            },
+          ],
+        ]
         expect(calls).toEqual(expect.arrayContaining(expected))
       })
     })
@@ -94,7 +112,14 @@ describe('DeleteModal.vue', () => {
       it('mentions comments user name', () => {
         Wrapper()
         const calls = mocks.$t.mock.calls
-        const expected = [['delete.comment.message', { name: 'It is the user of the comment' }]]
+        const expected = [
+          [
+            'delete.comment.message',
+            {
+              name: 'It is the user of the comment',
+            },
+          ],
+        ]
         expect(calls).toEqual(expect.arrayContaining(expected))
       })
     })
@@ -102,7 +127,12 @@ describe('DeleteModal.vue', () => {
 
   describe('mount', () => {
     Wrapper = () => {
-      return mount(DeleteModal, { propsData, mocks, localVue, router })
+      return mount(DeleteModal, {
+        propsData,
+        mocks,
+        localVue,
+        router,
+      })
     }
 
     beforeEach(jest.useFakeTimers)
diff --git a/webapp/components/Modal/DeleteModal.vue b/webapp/components/Modal/DeleteModal.vue
index ef542973b..7488f7efb 100644
--- a/webapp/components/Modal/DeleteModal.vue
+++ b/webapp/components/Modal/DeleteModal.vue
@@ -17,9 +17,7 @@
     <!-- eslint-disable-next-line vue/no-v-html -->
     <p v-html="message" />
 
-    <template
-      slot="footer"
-    >
+    <template slot="footer">
       <ds-button
         class="cancel"
         icon="close"
@@ -42,7 +40,6 @@
 </template>
 
 <script>
-import gql from 'graphql-tag'
 import { SweetalertIcon } from 'vue-sweetalert-icons'
 
 export default {

From 19771a342e42af26afc434393bf39d9c5e64cfb0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Wed, 29 May 2019 12:19:51 +0200
Subject: [PATCH 12/20] First approach to test '_slug.spec.js'

---
 webapp/components/Modal/DeleteModal.spec.js |  43 +--
 webapp/mixins/PostMutationHelpers.js        |  12 +-
 webapp/mixins/PostMutationHelpers.spec.js   |  12 +-
 webapp/pages/profile/_id/_slug.spec.js      | 284 +++++++++-----------
 4 files changed, 157 insertions(+), 194 deletions(-)

diff --git a/webapp/components/Modal/DeleteModal.spec.js b/webapp/components/Modal/DeleteModal.spec.js
index 664a0bdd6..704c3d832 100644
--- a/webapp/components/Modal/DeleteModal.spec.js
+++ b/webapp/components/Modal/DeleteModal.spec.js
@@ -1,5 +1,5 @@
 import { shallowMount, mount, createLocalVue } from '@vue/test-utils'
-import PostMutationHelpers from '~/mixins/PostMutationHelpers'
+// import PostMutationHelpers from '~/mixins/PostMutationHelpers'
 import DeleteModal from './DeleteModal.vue'
 import Vuex from 'vuex'
 import Styleguide from '@human-connection/styleguide'
@@ -20,6 +20,7 @@ localVue.use(Styleguide)
 localVue.use(VueRouter)
 
 describe('DeleteModal.vue', () => {
+  let Wrapper
   let wrapper
   let propsData
   let mocks
@@ -28,10 +29,10 @@ describe('DeleteModal.vue', () => {
     propsData = {
       type: 'contribution',
       id: 'p23',
-      callbacks: {
-        confirm: () => Post.methods.deletePostCallback('list'),
-        cancel: null,
-      },
+      // callbacks: {
+      //   confirm: () => Post.methods.deletePostCallback('list'),
+      //   cancel: null,
+      // },
     }
     mocks = {
       $t: jest.fn(),
@@ -74,10 +75,10 @@ describe('DeleteModal.vue', () => {
           type: 'contribution',
           id: 'p23',
           name: 'It is a post',
-          callbacks: {
-            confirm: () => Post.methods.deletePostCallback('list'),
-            cancel: null,
-          },
+          // callbacks: {
+          //   confirm: () => Post.methods.deletePostCallback('list'),
+          //   cancel: null,
+          // },
         }
       })
 
@@ -102,10 +103,10 @@ describe('DeleteModal.vue', () => {
           type: 'comment',
           id: 'c3',
           name: 'It is the user of the comment',
-          callbacks: {
-            confirm: () => Post.methods.deletePostCallback('list'),
-            cancel: null,
-          },
+          // callbacks: {
+          //   confirm: () => Post.methods.deletePostCallback('list'),
+          //   cancel: null,
+          // },
         }
       })
 
@@ -146,10 +147,10 @@ describe('DeleteModal.vue', () => {
         propsData = {
           type: 'contribution',
           id: 'p23',
-          callbacks: {
-            confirm: () => Post.methods.deletePostCallback('list'),
-            cancel: null,
-          },
+          // callbacks: {
+          //   confirm: () => Post.methods.deletePostCallback('list'),
+          //   cancel: null,
+          // },
         }
         wrapper = Wrapper()
       })
@@ -219,10 +220,10 @@ describe('DeleteModal.vue', () => {
         propsData = {
           type: 'comment',
           id: 'c3',
-          callbacks: {
-            confirm: () => Post.methods.deletePostCallback('list'),
-            cancel: null,
-          },
+          // callbacks: {
+          //   confirm: () => Post.methods.deletePostCallback('list'),
+          //   cancel: null,
+          // },
         }
         wrapper = Wrapper()
       })
diff --git a/webapp/mixins/PostMutationHelpers.js b/webapp/mixins/PostMutationHelpers.js
index a19ee4949..0c0729def 100644
--- a/webapp/mixins/PostMutationHelpers.js
+++ b/webapp/mixins/PostMutationHelpers.js
@@ -3,7 +3,7 @@ import gql from 'graphql-tag'
 export default {
   methods: {
     async deletePostCallback(postDisplayType = 'list') {
-      console.log('inside "deletePostCallback" !!! ', this.post)
+      // console.log('inside "deletePostCallback" !!! ', this.post)
       try {
         var gqlMutation = gql`
           mutation($id: ID!) {
@@ -14,16 +14,20 @@ export default {
         `
         await this.$apollo.mutate({
           mutation: gqlMutation,
-          variables: { id: this.post.id },
+          variables: {
+            id: this.post.id,
+          },
         })
-        this.$toast.success(this.$t(`delete.contribution.success`))
+        this.$toast.success(this.$t('delete.contribution.success'))
+        // console.log('called "this.$t" !!!')
         switch (postDisplayType) {
           case 'list':
             this.$emit('deletePost')
-            console.log('emitted "deletePost" !!!')
+            // console.log('emitted "deletePost" !!!')
             break
           default:
             // case 'page'
+            console.log('called "this.$router.history.push" !!!')
             this.$router.history.push('/') // Single page type: Redirect to index
             break
         }
diff --git a/webapp/mixins/PostMutationHelpers.spec.js b/webapp/mixins/PostMutationHelpers.spec.js
index a99e644a2..59e9d7b5e 100644
--- a/webapp/mixins/PostMutationHelpers.spec.js
+++ b/webapp/mixins/PostMutationHelpers.spec.js
@@ -1,4 +1,4 @@
-import { shallowMount, mount, createLocalVue } from '@vue/test-utils'
+// import { shallowMount, mount, createLocalVue } from '@vue/test-utils'
 import Methods from '~/mixins/PostMutationHelpers'
 
 const {
@@ -7,13 +7,13 @@ const {
 // console.log(deletePostCallback())
 
 describe('PostMutationHelpers.js', () => {
-  let post
+  // let post
   let mocks
 
   beforeEach(() => {
-    post = {
-      id: 'p23',
-    }
+    // post = {
+    //   id: 'p23',
+    // }
     mocks = {
       $t: jest.fn(),
       $filters: {
@@ -64,7 +64,7 @@ describe('PostMutationHelpers.js', () => {
     describe('delete Post displayed on post page', () => {
       it('routs to index (main page) on post page', () => {
         deletePostCallback('page')
-        expect($router.history.push).toHaveBeenCalled()
+        // expect($router.history.push).toHaveBeenCalled()
       })
     })
   })
diff --git a/webapp/pages/profile/_id/_slug.spec.js b/webapp/pages/profile/_id/_slug.spec.js
index 8fb8b4a14..b7109d3f3 100644
--- a/webapp/pages/profile/_id/_slug.spec.js
+++ b/webapp/pages/profile/_id/_slug.spec.js
@@ -1,13 +1,20 @@
-import { shallowMount, mount, createLocalVue } from '@vue/test-utils'
+// import { shallowMount, mount, createLocalVue } from '@vue/test-utils'
+import { mount, createLocalVue } from '@vue/test-utils'
 // import PostMutationHelpers from '~/mixins/PostMutationHelpers'
 import PostSlug from './_slug.vue'
-import Vue from 'vue'
+// import Vue from 'vue'
 import Vuex from 'vuex'
 import Styleguide from '@human-connection/styleguide'
 import VueRouter from 'vue-router'
 
-const routes = [{ path: '/' }]
-const router = new VueRouter({ routes })
+const routes = [
+  {
+    path: '/',
+  },
+]
+const router = new VueRouter({
+  routes,
+})
 const localVue = createLocalVue()
 
 localVue.use(Vuex)
@@ -30,6 +37,11 @@ describe('PostSlug', () => {
       // $filters: {
       //   truncate: a => a
       // },
+      // $router: {
+      //   history: {
+      //     push: jest.fn(),
+      //   },
+      // },
       $toast: {
         success: () => {},
         error: () => {},
@@ -40,72 +52,85 @@ describe('PostSlug', () => {
     }
   })
 
-  //   describe('shallowMount', () => {
-  //     Wrapper = () => {
-  //       return shallowMount(PostSlug, { propsData, mocks, localVue, router })
-  //     }
-
-  //     describe('defaults', () => {
-  //       it('success false', () => {
-  //         console.log(Wrapper().vm)
-  //         expect(Wrapper().vm.success).toBe(false)
-  //       })
-
-  //       it('loading false', () => {
-  //         expect(Wrapper().vm.loading).toBe(false)
-  //       })
+  // describe('shallowMount', () => {
+  //   Wrapper = () => {
+  //     return shallowMount(PostSlug, {
+  //       propsData,
+  //       mocks,
+  //       localVue,
+  //       router,
+  //     })
+  //   }
+  //   describe('given a post', () => {
+  //     beforeEach(() => {
+  //       // propsData = {
+  //       //   type: 'contribution',
+  //       //   id: 'p23',
+  //       //   name: 'It is a post',
+  //       //   // callbacks: {
+  //       //   //   confirm: () => Post.methods.deletePostCallback('list'),
+  //       //   //   cancel: null
+  //       //   // }
+  //       // }
+  //       mocks = {
+  //         ...mocks,
+  //         post: {
+  //           id: 'p23',
+  //           name: 'It is a post',
+  //         },
+  //       }
   //     })
 
-  // describe('given a post', () => {
-  //   beforeEach(() => {
-  //     propsData = {
-  //       type: 'contribution',
-  //       id: 'p23',
-  //       name: 'It is a post'
-  //     //   callbacks: {
-  //     //     confirm: () => Post.methods.deletePostCallback('list'),
-  //     //     cancel: null
-  //     //   }
-  //     }
+  //     it('mentions post title', () => {
+  //       wrapper = Wrapper()
+  //       wrapper.vm.deletePostCallback('list')
+
+  //       console.log('mocks.$t: ', mocks.$t)
+  //       const calls = mocks.$t.mock.calls
+  //       const expected = [
+  //         [
+  //           'delete.contribution.message',
+  //           {
+  //             name: 'It is a post',
+  //           },
+  //         ],
+  //       ]
+  //       expect(calls).toEqual(expect.arrayContaining(expected))
+  //     })
   //   })
 
-  //   it('mentions post title', () => {
-  //     Wrapper()
-  //     const calls = mocks.$t.mock.calls
-  //     const expected = [
-  //       ['delete.contribution.message', { name: 'It is a post' }]
-  //     ]
-  //     expect(calls).toEqual(expect.arrayContaining(expected))
-  //   })
+  //   // describe('given a comment', () => {
+  //   //   beforeEach(() => {
+  //   //     propsData = {
+  //   //       type: 'comment',
+  //   //       id: 'c3',
+  //   //       name: 'It is the user of the comment'
+  //   //     //   callbacks: {
+  //   //     //     confirm: () => Post.methods.deletePostCallback('list'),
+  //   //     //     cancel: null
+  //   //     //   }
+  //   //     }
+  //   //   })
+
+  //   //   it('mentions comments user name', () => {
+  //   //     Wrapper()
+  //   //     const calls = mocks.$t.mock.calls
+  //   //     const expected = [
+  //   //       ['delete.comment.message', { name: 'It is the user of the comment' }]
+  //   //     ]
+  //   //     expect(calls).toEqual(expect.arrayContaining(expected))
+  //   //   })
+  //   // })
   // })
 
-  // describe('given a comment', () => {
-  //   beforeEach(() => {
-  //     propsData = {
-  //       type: 'comment',
-  //       id: 'c3',
-  //       name: 'It is the user of the comment'
-  //     //   callbacks: {
-  //     //     confirm: () => Post.methods.deletePostCallback('list'),
-  //     //     cancel: null
-  //     //   }
-  //     }
-  //   })
-
-  //   it('mentions comments user name', () => {
-  //     Wrapper()
-  //     const calls = mocks.$t.mock.calls
-  //     const expected = [
-  //       ['delete.comment.message', { name: 'It is the user of the comment' }]
-  //     ]
-  //     expect(calls).toEqual(expect.arrayContaining(expected))
-  //   })
-  // })
-  //   })
-
   describe('mount', () => {
     Wrapper = () => {
-      return mount(PostSlug, { propsData, mocks, localVue, router })
+      return mount(PostSlug, {
+        propsData,
+        mocks,
+        localVue,
+        router,
+      })
     }
 
     beforeEach(jest.useFakeTimers)
@@ -115,20 +140,40 @@ describe('PostSlug', () => {
       expect(Wrapper().is('div')).toBe(true)
     })
 
-    describe('given post id', () => {
+    describe('test mixin "PostMutationHelpers"', () => {
       beforeEach(() => {
-        // post = {
-        //   id: 'p23'
-        // }
         wrapper = Wrapper()
       })
 
-      describe('confirm deletion of Post from List by invoking "deletePostCallback"', () => {
+      describe('deletion of Post from List by invoking "deletePostCallback(`list`)"', () => {
         beforeEach(() => {
-          wrapper = Wrapper()
           wrapper.vm.deletePostCallback('list')
         })
 
+        describe('after timeout', () => {
+          beforeEach(jest.runAllTimers)
+
+          it('emits "deletePost"', () => {
+            expect(wrapper.emitted().deletePost).toBeTruthy()
+          })
+
+          it.todo('does not go to index (main) page')
+          // it('does not go to index (main) page', () => {
+          //   expect(mocks.$router.history.push).not.toHaveBeenCalled()
+          // })
+
+          it('does call mutation', () => {
+            expect(mocks.$apollo.mutate).toHaveBeenCalledTimes(1)
+            // expect(mocks.$toast.success).toHaveBeenCalledTimes(1)
+          })
+        })
+      })
+
+      describe('deletion of Post from Page by invoking "deletePostCallback(`page`)"', () => {
+        beforeEach(() => {
+          wrapper.vm.deletePostCallback('page')
+        })
+
         describe('after timeout', () => {
           beforeEach(jest.runAllTimers)
 
@@ -136,108 +181,21 @@ describe('PostSlug', () => {
           //   expect(wrapper.vm.isOpen).toBe(false)
           // })
 
-          it('emits "deletePost"', () => {
-            expect(wrapper.emitted().deletePost).toBeTruthy()
+          it('not emits "deletePost"', () => {
+            expect(wrapper.emitted().deletePost).toBeFalsy()
           })
 
+          it.todo('does go to index (main) page')
+          // it('does go to index (main) page', () => {
+          //   expect(mocks.$router.history.push).toHaveBeenCalled()
+          // })
+
           it('does call mutation', () => {
             expect(mocks.$apollo.mutate).toHaveBeenCalled()
+            // expect(mocks.$toast.success).toHaveBeenCalledTimes(1)
           })
         })
       })
-
-      // describe('click cancel button and do not delete the post', () => {
-      //   beforeEach(() => {
-      //     wrapper = Wrapper()
-      //     wrapper.find('button.cancel').trigger('click')
-      //   })
-
-      //   describe('after timeout', () => {
-      //     beforeEach(jest.runAllTimers)
-
-      //     it('fades away', () => {
-      //       expect(wrapper.vm.isOpen).toBe(false)
-      //     })
-
-      //     it('emits "close"', () => {
-      //       expect(wrapper.emitted().close).toBeTruthy()
-      //     })
-
-      //     it('does not call mutation', () => {
-      //       expect(mocks.$apollo.mutate).not.toHaveBeenCalled()
-      //     })
-      //   })
-      // })
-
-      //       describe('click confirm button and delete the post', () => {
-      //         beforeEach(() => {
-      //           wrapper.find('button.confirm').trigger('click')
-      //         })
-
-      //         it('calls delete mutation', () => {
-      //           expect(mocks.$apollo.mutate).toHaveBeenCalled()
-      //         })
-
-      //         it('sets success', () => {
-      //           expect(wrapper.vm.success).toBe(true)
-      //         })
-
-      //         it('displays a success message', () => {
-      //           const calls = mocks.$t.mock.calls
-      //           const expected = [['delete.contribution.success']]
-      //           expect(calls).toEqual(expect.arrayContaining(expected))
-      //         })
-
-      //         describe('after timeout', () => {
-      //           beforeEach(jest.runAllTimers)
-
-      //           it('fades away', () => {
-      //             expect(wrapper.vm.isOpen).toBe(false)
-      //           })
-
-      //           it('emits close', () => {
-      //             expect(wrapper.emitted().close).toBeTruthy()
-      //           })
-
-      //           it('resets success', () => {
-      //             expect(wrapper.vm.success).toBe(false)
-      //           })
-      //         })
-      //       })
     })
-
-    //     describe('given comment id', () => {
-    //       beforeEach(() => {
-    //         propsData = {
-    //           type: 'comment',
-    //           id: 'c3'
-    //         //   callbacks: {
-    //         //     confirm: () => Post.methods.deletePostCallback('list'),
-    //         //     cancel: null
-    //         //   }
-    //         }
-    //         wrapper = Wrapper()
-    //       })
-
-    //       describe('click confirm button and delete the comment', () => {
-    //         beforeEach(() => {
-    //           wrapper.find('button.confirm').trigger('click')
-    //         })
-
-    //         it('calls delete mutation', () => {
-    //           expect(mocks.$apollo.mutate).toHaveBeenCalled()
-    //         })
-
-    //         it('sets success', () => {
-    //           expect(wrapper.vm.success).toBe(true)
-    //         })
-
-    //         it('displays a success message', () => {
-    //           const calls = mocks.$t.mock.calls
-    //           const expected = [['delete.comment.success']]
-    //           expect(calls).toEqual(expect.arrayContaining(expected))
-    //         })
-    //       })
-    //     })
   })
 })

From 3e3e447bc5ca2de48dc41851c144e2a010413438 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Wed, 29 May 2019 17:59:07 +0200
Subject: [PATCH 13/20] Refactored three quater of the tests

---
 webapp/components/Modal/DeleteModal.spec.js   | 127 +++-----------
 .../components/comments/CommentList/index.vue |   7 -
 webapp/mixins/PostMutationHelpers.js          |   4 +-
 webapp/mixins/PostMutationHelpers.spec.js     |  71 --------
 webapp/pages/post/_id/_slug/index.spec.js     | 100 +++++++++++
 webapp/pages/post/_id/_slug/index.vue         |   1 +
 webapp/pages/profile/_id/_slug.spec.js        | 160 +++---------------
 7 files changed, 149 insertions(+), 321 deletions(-)
 delete mode 100644 webapp/mixins/PostMutationHelpers.spec.js
 create mode 100644 webapp/pages/post/_id/_slug/index.spec.js

diff --git a/webapp/components/Modal/DeleteModal.spec.js b/webapp/components/Modal/DeleteModal.spec.js
index 704c3d832..008acdada 100644
--- a/webapp/components/Modal/DeleteModal.spec.js
+++ b/webapp/components/Modal/DeleteModal.spec.js
@@ -1,25 +1,14 @@
 import { shallowMount, mount, createLocalVue } from '@vue/test-utils'
-// import PostMutationHelpers from '~/mixins/PostMutationHelpers'
 import DeleteModal from './DeleteModal.vue'
 import Vuex from 'vuex'
 import Styleguide from '@human-connection/styleguide'
-import VueRouter from 'vue-router'
 
-const routes = [
-  {
-    path: '/',
-  },
-]
-const router = new VueRouter({
-  routes,
-})
 const localVue = createLocalVue()
 
 localVue.use(Vuex)
 localVue.use(Styleguide)
-localVue.use(VueRouter)
 
-describe('DeleteModal.vue', () => {
+describe('DeleteModal', () => {
   let Wrapper
   let wrapper
   let propsData
@@ -29,23 +18,17 @@ describe('DeleteModal.vue', () => {
     propsData = {
       type: 'contribution',
       id: 'p23',
-      // callbacks: {
-      //   confirm: () => Post.methods.deletePostCallback('list'),
-      //   cancel: null,
-      // },
+      name: 'It is a post',
+      callbacks: {
+        confirm: jest.fn(),
+        cancel: jest.fn(),
+      },
     }
     mocks = {
       $t: jest.fn(),
       $filters: {
         truncate: a => a,
       },
-      $toast: {
-        success: () => {},
-        error: () => {},
-      },
-      $apollo: {
-        mutate: jest.fn().mockResolvedValue(),
-      },
     }
   })
 
@@ -55,35 +38,35 @@ describe('DeleteModal.vue', () => {
         propsData,
         mocks,
         localVue,
-        router,
       })
     }
 
     describe('defaults', () => {
+      beforeEach(() => {
+        wrapper = Wrapper()
+      })
+
       it('success false', () => {
-        expect(Wrapper().vm.success).toBe(false)
+        expect(wrapper.vm.success).toBe(false)
       })
 
       it('loading false', () => {
-        expect(Wrapper().vm.loading).toBe(false)
+        expect(wrapper.vm.loading).toBe(false)
       })
     })
 
     describe('given a post', () => {
       beforeEach(() => {
         propsData = {
+          ...propsData,
           type: 'contribution',
           id: 'p23',
           name: 'It is a post',
-          // callbacks: {
-          //   confirm: () => Post.methods.deletePostCallback('list'),
-          //   cancel: null,
-          // },
         }
+        wrapper = Wrapper()
       })
 
       it('mentions post title', () => {
-        Wrapper()
         const calls = mocks.$t.mock.calls
         const expected = [
           [
@@ -100,18 +83,15 @@ describe('DeleteModal.vue', () => {
     describe('given a comment', () => {
       beforeEach(() => {
         propsData = {
+          ...propsData,
           type: 'comment',
-          id: 'c3',
+          id: 'c4',
           name: 'It is the user of the comment',
-          // callbacks: {
-          //   confirm: () => Post.methods.deletePostCallback('list'),
-          //   cancel: null,
-          // },
         }
+        wrapper = Wrapper()
       })
 
       it('mentions comments user name', () => {
-        Wrapper()
         const calls = mocks.$t.mock.calls
         const expected = [
           [
@@ -132,32 +112,18 @@ describe('DeleteModal.vue', () => {
         propsData,
         mocks,
         localVue,
-        router,
       })
     }
 
     beforeEach(jest.useFakeTimers)
 
-    it('renders', () => {
-      expect(Wrapper().is('div')).toBe(true)
-    })
-
     describe('given post id', () => {
       beforeEach(() => {
-        propsData = {
-          type: 'contribution',
-          id: 'p23',
-          // callbacks: {
-          //   confirm: () => Post.methods.deletePostCallback('list'),
-          //   cancel: null,
-          // },
-        }
         wrapper = Wrapper()
       })
 
-      describe('click cancel button and do not delete the post', () => {
+      describe('click cancel button', () => {
         beforeEach(() => {
-          wrapper = Wrapper()
           wrapper.find('button.cancel').trigger('click')
         })
 
@@ -168,35 +134,25 @@ describe('DeleteModal.vue', () => {
             expect(wrapper.vm.isOpen).toBe(false)
           })
 
-          it('emits "close"', () => {
-            expect(wrapper.emitted().close).toBeTruthy()
+          it('does call the cancel callback', () => {
+            expect(propsData.callbacks.cancel).toHaveBeenCalledTimes(1)
           })
 
-          it('does not call mutation', () => {
-            expect(mocks.$apollo.mutate).not.toHaveBeenCalled()
+          it('emits "close"', () => {
+            expect(wrapper.emitted().close).toBeTruthy()
           })
         })
       })
 
-      describe('click confirm button and delete the post', () => {
+      describe('click confirm button', () => {
         beforeEach(() => {
           wrapper.find('button.confirm').trigger('click')
         })
 
-        it('calls delete mutation', () => {
-          expect(mocks.$apollo.mutate).toHaveBeenCalled()
-        })
-
         it('sets success', () => {
           expect(wrapper.vm.success).toBe(true)
         })
 
-        it('displays a success message', () => {
-          const calls = mocks.$t.mock.calls
-          const expected = [['delete.contribution.success']]
-          expect(calls).toEqual(expect.arrayContaining(expected))
-        })
-
         describe('after timeout', () => {
           beforeEach(jest.runAllTimers)
 
@@ -204,6 +160,9 @@ describe('DeleteModal.vue', () => {
             expect(wrapper.vm.isOpen).toBe(false)
           })
 
+          it('does call the confirm callback', () => {
+            expect(propsData.callbacks.confirm).toHaveBeenCalledTimes(1)
+          })
           it('emits close', () => {
             expect(wrapper.emitted().close).toBeTruthy()
           })
@@ -214,39 +173,5 @@ describe('DeleteModal.vue', () => {
         })
       })
     })
-
-    describe('given comment id', () => {
-      beforeEach(() => {
-        propsData = {
-          type: 'comment',
-          id: 'c3',
-          // callbacks: {
-          //   confirm: () => Post.methods.deletePostCallback('list'),
-          //   cancel: null,
-          // },
-        }
-        wrapper = Wrapper()
-      })
-
-      describe('click confirm button and delete the comment', () => {
-        beforeEach(() => {
-          wrapper.find('button.confirm').trigger('click')
-        })
-
-        it('calls delete mutation', () => {
-          expect(mocks.$apollo.mutate).toHaveBeenCalled()
-        })
-
-        it('sets success', () => {
-          expect(wrapper.vm.success).toBe(true)
-        })
-
-        it('displays a success message', () => {
-          const calls = mocks.$t.mock.calls
-          const expected = [['delete.comment.success']]
-          expect(calls).toEqual(expect.arrayContaining(expected))
-        })
-      })
-    })
   })
 })
diff --git a/webapp/components/comments/CommentList/index.vue b/webapp/components/comments/CommentList/index.vue
index 3c7566dce..eb9cac088 100644
--- a/webapp/components/comments/CommentList/index.vue
+++ b/webapp/components/comments/CommentList/index.vue
@@ -24,13 +24,6 @@
         :comment="comment"
         @deleteComment="deleteComment(index)"
       />
-      <!-- <comment
-        is="comment-item"
-        v-for="(comment, index) in comments"
-        :key="comment.id"
-        :comment="comment"
-        v-on:remove="comments.splice(index, 1)"
-      /> -->
     </div>
     <hc-empty
       v-else
diff --git a/webapp/mixins/PostMutationHelpers.js b/webapp/mixins/PostMutationHelpers.js
index 0c0729def..2e7a91e4d 100644
--- a/webapp/mixins/PostMutationHelpers.js
+++ b/webapp/mixins/PostMutationHelpers.js
@@ -27,8 +27,8 @@ export default {
             break
           default:
             // case 'page'
-            console.log('called "this.$router.history.push" !!!')
-            this.$router.history.push('/') // Single page type: Redirect to index
+            // console.log('called "this.$router.history.push" !!!')
+            this.$router.history.push('/') // Single page type: Redirect to index (main) page
             break
         }
       } catch (err) {
diff --git a/webapp/mixins/PostMutationHelpers.spec.js b/webapp/mixins/PostMutationHelpers.spec.js
deleted file mode 100644
index 59e9d7b5e..000000000
--- a/webapp/mixins/PostMutationHelpers.spec.js
+++ /dev/null
@@ -1,71 +0,0 @@
-// import { shallowMount, mount, createLocalVue } from '@vue/test-utils'
-import Methods from '~/mixins/PostMutationHelpers'
-
-const {
-  methods: { deletePostCallback },
-} = Methods
-// console.log(deletePostCallback())
-
-describe('PostMutationHelpers.js', () => {
-  // let post
-  let mocks
-
-  beforeEach(() => {
-    // post = {
-    //   id: 'p23',
-    // }
-    mocks = {
-      $t: jest.fn(),
-      $filters: {
-        truncate: a => a,
-      },
-      $emit: jest.fn(),
-      $router: {
-        history: {
-          push: jest.fn(),
-        },
-      },
-      $toast: {
-        success: () => {},
-        error: () => {},
-      },
-      $apollo: {
-        mutate: jest.fn().mockResolvedValue(),
-      },
-    }
-  })
-
-  describe('given post id', () => {
-    describe('delete post in general', () => {
-      beforeEach(() => {
-        deletePostCallback()
-      })
-
-      it('calls delete mutation', () => {
-        expect(mocks.$apollo.mutate).toHaveBeenCalled()
-      })
-
-      it('displays a success message', () => {
-        const calls = mocks.$t.mock.calls
-        const expected = [['delete.contribution.success']]
-        expect(calls).toEqual(expect.arrayContaining(expected))
-      })
-
-      it.todo('displays an error message')
-    })
-
-    describe('delete Post from list', () => {
-      it('calls delete in list', () => {
-        deletePostCallback('list')
-        expect(mocks.$emit).toHaveBeenCalled()
-      })
-    })
-
-    describe('delete Post displayed on post page', () => {
-      it('routs to index (main page) on post page', () => {
-        deletePostCallback('page')
-        // expect($router.history.push).toHaveBeenCalled()
-      })
-    })
-  })
-})
diff --git a/webapp/pages/post/_id/_slug/index.spec.js b/webapp/pages/post/_id/_slug/index.spec.js
new file mode 100644
index 000000000..5bf4ea168
--- /dev/null
+++ b/webapp/pages/post/_id/_slug/index.spec.js
@@ -0,0 +1,100 @@
+import { config, shallowMount, createLocalVue } from '@vue/test-utils'
+import PostSlug from './index.vue'
+import Vuex from 'vuex'
+import Styleguide from '@human-connection/styleguide'
+
+const localVue = createLocalVue()
+
+localVue.use(Vuex)
+localVue.use(Styleguide)
+
+config.stubs['no-ssr'] = '<span><slot /></span>'
+
+describe('PostSlug', () => {
+  let wrapper
+  let Wrapper
+  let store
+  let mocks
+
+  beforeEach(() => {
+    store = new Vuex.Store({
+      getters: {
+        'auth/user': () => {
+          return {}
+        },
+      },
+    })
+    mocks = {
+      $t: jest.fn(),
+      $filters: {
+        truncate: a => a,
+      },
+      // If you mocking router, than don't use VueRouter with lacalVue: https://vue-test-utils.vuejs.org/guides/using-with-vue-router.html
+      $router: {
+        history: {
+          push: jest.fn(),
+        },
+      },
+      $toast: {
+        success: jest.fn(),
+        error: jest.fn(),
+      },
+      $apollo: {
+        mutate: jest.fn().mockResolvedValue(),
+      },
+    }
+  })
+
+  describe('shallowMount', () => {
+    Wrapper = () => {
+      return shallowMount(PostSlug, {
+        store,
+        mocks,
+        localVue,
+      })
+    }
+
+    beforeEach(jest.useFakeTimers)
+
+    describe('test mixin "PostMutationHelpers"', () => {
+      beforeEach(() => {
+        wrapper = Wrapper()
+        wrapper.setData({
+          post: {
+            id: 'p23',
+            name: 'It is a post',
+            author: {
+              id: 'u1',
+            },
+          },
+        })
+      })
+
+      describe('deletion of Post from Page by invoking "deletePostCallback(`page`)"', () => {
+        beforeEach(() => {
+          wrapper.vm.deletePostCallback('page')
+        })
+
+        describe('after timeout', () => {
+          beforeEach(jest.runAllTimers)
+
+          it('not emits "deletePost"', () => {
+            expect(wrapper.emitted().deletePost).toBeFalsy()
+          })
+
+          it('does go to index (main) page', () => {
+            expect(mocks.$router.history.push).toHaveBeenCalledTimes(1)
+          })
+
+          it('does call mutation', () => {
+            expect(mocks.$apollo.mutate).toHaveBeenCalledTimes(1)
+          })
+
+          it('mutation is successful', () => {
+            expect(mocks.$toast.success).toHaveBeenCalledTimes(1)
+          })
+        })
+      })
+    })
+  })
+})
diff --git a/webapp/pages/post/_id/_slug/index.vue b/webapp/pages/post/_id/_slug/index.vue
index 55f12f534..0761b1de8 100644
--- a/webapp/pages/post/_id/_slug/index.vue
+++ b/webapp/pages/post/_id/_slug/index.vue
@@ -94,6 +94,7 @@ import HcCommentList from '~/components/comments/CommentList'
 import PostMutationHelpers from '~/mixins/PostMutationHelpers'
 
 export default {
+  name: 'PostSlug',
   transition: {
     name: 'slide-up',
     mode: 'out-in',
diff --git a/webapp/pages/profile/_id/_slug.spec.js b/webapp/pages/profile/_id/_slug.spec.js
index b7109d3f3..d79f9b885 100644
--- a/webapp/pages/profile/_id/_slug.spec.js
+++ b/webapp/pages/profile/_id/_slug.spec.js
@@ -1,50 +1,34 @@
-// import { shallowMount, mount, createLocalVue } from '@vue/test-utils'
-import { mount, createLocalVue } from '@vue/test-utils'
-// import PostMutationHelpers from '~/mixins/PostMutationHelpers'
-import PostSlug from './_slug.vue'
-// import Vue from 'vue'
+import { shallowMount, createLocalVue } from '@vue/test-utils'
+import ProfileSlug from './_slug.vue'
 import Vuex from 'vuex'
 import Styleguide from '@human-connection/styleguide'
-import VueRouter from 'vue-router'
 
-const routes = [
-  {
-    path: '/',
-  },
-]
-const router = new VueRouter({
-  routes,
-})
 const localVue = createLocalVue()
 
 localVue.use(Vuex)
 localVue.use(Styleguide)
-localVue.use(VueRouter)
 
-describe('PostSlug', () => {
+describe('ProfileSlug', () => {
   let wrapper
   let Wrapper
-  let propsData
   let mocks
 
   beforeEach(() => {
-    propsData = {}
     mocks = {
       post: {
         id: 'p23',
+        name: 'It is a post',
       },
       $t: jest.fn(),
-      // $filters: {
-      //   truncate: a => a
-      // },
-      // $router: {
-      //   history: {
-      //     push: jest.fn(),
-      //   },
-      // },
+      // If you mocking router, than don't use VueRouter with lacalVue: https://vue-test-utils.vuejs.org/guides/using-with-vue-router.html
+      $router: {
+        history: {
+          push: jest.fn(),
+        },
+      },
       $toast: {
-        success: () => {},
-        error: () => {},
+        success: jest.fn(),
+        error: jest.fn(),
       },
       $apollo: {
         mutate: jest.fn().mockResolvedValue(),
@@ -52,94 +36,16 @@ describe('PostSlug', () => {
     }
   })
 
-  // describe('shallowMount', () => {
-  //   Wrapper = () => {
-  //     return shallowMount(PostSlug, {
-  //       propsData,
-  //       mocks,
-  //       localVue,
-  //       router,
-  //     })
-  //   }
-  //   describe('given a post', () => {
-  //     beforeEach(() => {
-  //       // propsData = {
-  //       //   type: 'contribution',
-  //       //   id: 'p23',
-  //       //   name: 'It is a post',
-  //       //   // callbacks: {
-  //       //   //   confirm: () => Post.methods.deletePostCallback('list'),
-  //       //   //   cancel: null
-  //       //   // }
-  //       // }
-  //       mocks = {
-  //         ...mocks,
-  //         post: {
-  //           id: 'p23',
-  //           name: 'It is a post',
-  //         },
-  //       }
-  //     })
-
-  //     it('mentions post title', () => {
-  //       wrapper = Wrapper()
-  //       wrapper.vm.deletePostCallback('list')
-
-  //       console.log('mocks.$t: ', mocks.$t)
-  //       const calls = mocks.$t.mock.calls
-  //       const expected = [
-  //         [
-  //           'delete.contribution.message',
-  //           {
-  //             name: 'It is a post',
-  //           },
-  //         ],
-  //       ]
-  //       expect(calls).toEqual(expect.arrayContaining(expected))
-  //     })
-  //   })
-
-  //   // describe('given a comment', () => {
-  //   //   beforeEach(() => {
-  //   //     propsData = {
-  //   //       type: 'comment',
-  //   //       id: 'c3',
-  //   //       name: 'It is the user of the comment'
-  //   //     //   callbacks: {
-  //   //     //     confirm: () => Post.methods.deletePostCallback('list'),
-  //   //     //     cancel: null
-  //   //     //   }
-  //   //     }
-  //   //   })
-
-  //   //   it('mentions comments user name', () => {
-  //   //     Wrapper()
-  //   //     const calls = mocks.$t.mock.calls
-  //   //     const expected = [
-  //   //       ['delete.comment.message', { name: 'It is the user of the comment' }]
-  //   //     ]
-  //   //     expect(calls).toEqual(expect.arrayContaining(expected))
-  //   //   })
-  //   // })
-  // })
-
-  describe('mount', () => {
+  describe('shallowMount', () => {
     Wrapper = () => {
-      return mount(PostSlug, {
-        propsData,
+      return shallowMount(ProfileSlug, {
         mocks,
         localVue,
-        router,
       })
     }
 
     beforeEach(jest.useFakeTimers)
 
-    it('renders', () => {
-      // console.log(Wrapper().vm)
-      expect(Wrapper().is('div')).toBe(true)
-    })
-
     describe('test mixin "PostMutationHelpers"', () => {
       beforeEach(() => {
         wrapper = Wrapper()
@@ -154,45 +60,19 @@ describe('PostSlug', () => {
           beforeEach(jest.runAllTimers)
 
           it('emits "deletePost"', () => {
-            expect(wrapper.emitted().deletePost).toBeTruthy()
+            expect(wrapper.emitted().deletePost.length).toBe(1)
           })
 
-          it.todo('does not go to index (main) page')
-          // it('does not go to index (main) page', () => {
-          //   expect(mocks.$router.history.push).not.toHaveBeenCalled()
-          // })
+          it('does not go to index (main) page', () => {
+            expect(mocks.$router.history.push).not.toHaveBeenCalled()
+          })
 
           it('does call mutation', () => {
             expect(mocks.$apollo.mutate).toHaveBeenCalledTimes(1)
-            // expect(mocks.$toast.success).toHaveBeenCalledTimes(1)
-          })
-        })
-      })
-
-      describe('deletion of Post from Page by invoking "deletePostCallback(`page`)"', () => {
-        beforeEach(() => {
-          wrapper.vm.deletePostCallback('page')
-        })
-
-        describe('after timeout', () => {
-          beforeEach(jest.runAllTimers)
-
-          // it('fades away', () => {
-          //   expect(wrapper.vm.isOpen).toBe(false)
-          // })
-
-          it('not emits "deletePost"', () => {
-            expect(wrapper.emitted().deletePost).toBeFalsy()
           })
 
-          it.todo('does go to index (main) page')
-          // it('does go to index (main) page', () => {
-          //   expect(mocks.$router.history.push).toHaveBeenCalled()
-          // })
-
-          it('does call mutation', () => {
-            expect(mocks.$apollo.mutate).toHaveBeenCalled()
-            // expect(mocks.$toast.success).toHaveBeenCalledTimes(1)
+          it('mutation is successful', () => {
+            expect(mocks.$toast.success).toHaveBeenCalledTimes(1)
           })
         })
       })

From ad7627fe05b4df0f3d964f33dc01860b0d68d88e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Wed, 29 May 2019 18:18:58 +0200
Subject: [PATCH 14/20] Fixed the missing `ds-flex`in the PostCard

---
 webapp/components/PostCard/index.vue | 139 +++++++++++++--------------
 1 file changed, 67 insertions(+), 72 deletions(-)

diff --git a/webapp/components/PostCard/index.vue b/webapp/components/PostCard/index.vue
index 7a6f5da89..e17cced61 100644
--- a/webapp/components/PostCard/index.vue
+++ b/webapp/components/PostCard/index.vue
@@ -1,80 +1,75 @@
 <template>
-  <ds-card
-    :header="post.title"
-    :image="post.image"
-    :class="{'post-card': true, 'disabled-content': post.disabled}"
-  >
-    <!-- Post Link Target -->
-    <nuxt-link
-      class="post-link"
-      :to="{ name: 'post-id-slug', params: { id: post.id, slug: post.slug } }"
+  <ds-flex-item :width="width">
+    <ds-card
+      :header="post.title"
+      :image="post.image"
+      :class="{'post-card': true, 'disabled-content': post.disabled}"
     >
-      {{ post.title }}
-    </nuxt-link>
-    <ds-space margin-bottom="small" />
-    <!-- Username, Image & Date of Post -->
-    <div>
-      <no-ssr>
-        <hc-user
-          :user="post.author"
-          :trunc="35"
-          :date-time="post.createdAt"
-        />
-      </no-ssr>
-      <hc-ribbon :text="$t('post.name')" />
-    </div>
-    <ds-space margin-bottom="small" />
-    <!-- Post Title -->
-    <ds-heading
-      tag="h3"
-      no-margin
-    >
-      {{ post.title }}
-    </ds-heading>
-    <ds-space margin-bottom="small" />
-    <!-- Post Content Excerpt -->
-    <!-- eslint-disable vue/no-v-html -->
-    <!-- TODO: replace editor content with tiptap render view -->
-    <div
-      class="hc-editor-content"
-      v-html="excerpt"
-    />
-    <!-- eslint-enable vue/no-v-html -->
-    <!-- Footer o the Post -->
-    <template slot="footer">
-      <div style="display: inline-block; opacity: .5;">
-        <!-- Categories -->
-        <hc-category
-          v-for="category in post.categories"
-          :key="category.id"
-          v-tooltip="{content: category.name, placement: 'bottom-start', delay: { show: 500 }}"
-          :icon="category.icon"
-        />
+      <!-- Post Link Target -->
+      <nuxt-link
+        class="post-link"
+        :to="{ name: 'post-id-slug', params: { id: post.id, slug: post.slug } }"
+      >
+{{ post.title }}
+</nuxt-link>
+      <ds-space margin-bottom="small" />
+      <!-- Username, Image & Date of Post -->
+      <div>
+        <no-ssr>
+          <hc-user :user="post.author"
+:trunc="35" :date-time="post.createdAt" />
+        </no-ssr>
+        <hc-ribbon :text="$t('post.name')" />
       </div>
-      <no-ssr>
-        <div style="display: inline-block; float: right">
-          <!-- Shouts Count -->
-          <span :style="{ opacity: post.shoutedCount ? 1 : .5 }">
-            <ds-icon name="bullhorn" />
-            <small>{{ post.shoutedCount }}</small>
-          </span>
-          &nbsp;
-          <!-- Comments Count -->
-          <span :style="{ opacity: post.commentsCount ? 1 : .5 }">
-            <ds-icon name="comments" />
-            <small>{{ post.commentsCount }}</small>
-          </span>
-          <!-- Menu -->
-          <content-menu
-            resource-type="contribution"
-            :resource="post"
-            :callbacks="{ confirm: deletePostCallback, cancel: null }"
-            :is-owner="isAuthor"
+      <ds-space margin-bottom="small" />
+      <!-- Post Title -->
+      <ds-heading tag="h3"
+no-margin>
+{{ post.title }}
+</ds-heading>
+      <ds-space margin-bottom="small" />
+      <!-- Post Content Excerpt -->
+      <!-- eslint-disable vue/no-v-html -->
+      <!-- TODO: replace editor content with tiptap render view -->
+      <div class="hc-editor-content"
+v-html="excerpt" />
+      <!-- eslint-enable vue/no-v-html -->
+      <!-- Footer o the Post -->
+      <template slot="footer">
+        <div style="display: inline-block; opacity: .5;">
+          <!-- Categories -->
+          <hc-category
+            v-for="category in post.categories"
+            :key="category.id"
+            v-tooltip="{content: category.name, placement: 'bottom-start', delay: { show: 500 }}"
+            :icon="category.icon"
           />
         </div>
-      </no-ssr>
-    </template>
-  </ds-card>
+        <no-ssr>
+          <div style="display: inline-block; float: right">
+            <!-- Shouts Count -->
+            <span :style="{ opacity: post.shoutedCount ? 1 : .5 }">
+              <ds-icon name="bullhorn" />
+              <small>{{ post.shoutedCount }}</small>
+            </span>
+            &nbsp;
+            <!-- Comments Count -->
+            <span :style="{ opacity: post.commentsCount ? 1 : .5 }">
+              <ds-icon name="comments" />
+              <small>{{ post.commentsCount }}</small>
+            </span>
+            <!-- Menu -->
+            <content-menu
+              resource-type="contribution"
+              :resource="post"
+              :callbacks="{ confirm: deletePostCallback, cancel: null }"
+              :is-owner="isAuthor"
+            />
+          </div>
+        </no-ssr>
+      </template>
+    </ds-card>
+  </ds-flex-item>
 </template>
 
 <script>

From 542e281450b07cfa7eb59033e65352343a0c70d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Wed, 29 May 2019 18:30:53 +0200
Subject: [PATCH 15/20] Fixed lint

---
 webapp/components/PostCard/index.vue | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/webapp/components/PostCard/index.vue b/webapp/components/PostCard/index.vue
index e17cced61..f71be3d5d 100644
--- a/webapp/components/PostCard/index.vue
+++ b/webapp/components/PostCard/index.vue
@@ -10,29 +10,36 @@
         class="post-link"
         :to="{ name: 'post-id-slug', params: { id: post.id, slug: post.slug } }"
       >
-{{ post.title }}
-</nuxt-link>
+        {{ post.title }}
+      </nuxt-link>
       <ds-space margin-bottom="small" />
       <!-- Username, Image & Date of Post -->
       <div>
         <no-ssr>
-          <hc-user :user="post.author"
-:trunc="35" :date-time="post.createdAt" />
+          <hc-user
+            :user="post.author"
+            :trunc="35"
+            :date-time="post.createdAt"
+          />
         </no-ssr>
         <hc-ribbon :text="$t('post.name')" />
       </div>
       <ds-space margin-bottom="small" />
       <!-- Post Title -->
-      <ds-heading tag="h3"
-no-margin>
-{{ post.title }}
-</ds-heading>
+      <ds-heading
+        tag="h3"
+        no-margin
+      >
+        {{ post.title }}
+      </ds-heading>
       <ds-space margin-bottom="small" />
       <!-- Post Content Excerpt -->
       <!-- eslint-disable vue/no-v-html -->
       <!-- TODO: replace editor content with tiptap render view -->
-      <div class="hc-editor-content"
-v-html="excerpt" />
+      <div
+        class="hc-editor-content"
+        v-html="excerpt"
+      />
       <!-- eslint-enable vue/no-v-html -->
       <!-- Footer o the Post -->
       <template slot="footer">

From 76469df059391148cc31553268e274b1b1d01ff7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Fri, 31 May 2019 11:36:27 +0200
Subject: [PATCH 16/20] Getting Jest Tests to run again.

---
 webapp/components/ContentMenu.vue            | 35 +++++---------
 webapp/components/Modal.spec.js              | 46 +++++++++++++++++--
 webapp/components/Modal.vue                  |  2 +-
 webapp/components/Modal/DeleteModal.spec.js  |  2 +-
 webapp/components/Modal/DisableModal.spec.js | 48 ++++++++++++++++----
 webapp/components/Modal/DisableModal.vue     |  1 +
 webapp/components/Modal/ReportModal.spec.js  | 43 ++++++++++++++----
 7 files changed, 130 insertions(+), 47 deletions(-)

diff --git a/webapp/components/ContentMenu.vue b/webapp/components/ContentMenu.vue
index a8b4db02f..ffa42fec0 100644
--- a/webapp/components/ContentMenu.vue
+++ b/webapp/components/ContentMenu.vue
@@ -1,32 +1,18 @@
 <template>
-  <dropdown
-    class="content-menu"
-    :placement="placement"
-    offset="5"
-  >
-    <template
-      slot="default"
-      slot-scope="{toggleMenu}"
-    >
-      <slot
-        name="button"
-        :toggleMenu="toggleMenu"
-      >
-        <ds-button
-          class="content-menu-trigger"
-          size="small"
-          ghost
-          @click.prevent="toggleMenu"
-        >
+  <dropdown class="content-menu"
+:placement="placement" offset="5">
+    <template slot="default"
+slot-scope="{toggleMenu}">
+      <slot name="button"
+:toggleMenu="toggleMenu">
+        <ds-button class="content-menu-trigger"
+size="small" ghost @click.prevent="toggleMenu">
           <ds-icon name="ellipsis-v" />
         </ds-button>
       </slot>
     </template>
-    <div
-      slot="popover"
-      slot-scope="{toggleMenu}"
-      class="content-menu-popover"
-    >
+    <div slot="popover"
+slot-scope="{toggleMenu}" class="content-menu-popover">
       <ds-menu :routes="routes">
         <ds-menu-item
           slot="menuitem"
@@ -47,6 +33,7 @@
 import Dropdown from '~/components/Dropdown'
 
 export default {
+  name: 'ContentMenu',
   components: {
     Dropdown,
   },
diff --git a/webapp/components/Modal.spec.js b/webapp/components/Modal.spec.js
index 52d13c4a0..0e2158e96 100644
--- a/webapp/components/Modal.spec.js
+++ b/webapp/components/Modal.spec.js
@@ -1,5 +1,6 @@
 import { shallowMount, createLocalVue } from '@vue/test-utils'
 import Modal from './Modal.vue'
+import DeleteModal from './Modal/DeleteModal.vue'
 import DisableModal from './Modal/DisableModal.vue'
 import ReportModal from './Modal/ReportModal.vue'
 import Vuex from 'vuex'
@@ -29,7 +30,11 @@ describe('Modal.vue', () => {
           'modal/SET_OPEN': mutations.SET_OPEN,
         },
       })
-      return mountMethod(Modal, { store, mocks, localVue })
+      return mountMethod(Modal, {
+        store,
+        mocks,
+        localVue,
+      })
     }
   }
 
@@ -55,6 +60,7 @@ describe('Modal.vue', () => {
 
     it('initially empty', () => {
       wrapper = Wrapper()
+      expect(wrapper.contains(DeleteModal)).toBe(false)
       expect(wrapper.contains(DisableModal)).toBe(false)
       expect(wrapper.contains(ReportModal)).toBe(false)
     })
@@ -69,6 +75,10 @@ describe('Modal.vue', () => {
               id: 'c456',
               title: 'some title',
             },
+            callbacks: {
+              confirm: null,
+              cancel: null,
+            },
           },
         }
         wrapper = Wrapper()
@@ -83,6 +93,10 @@ describe('Modal.vue', () => {
           type: 'contribution',
           name: 'some title',
           id: 'c456',
+          callbacks: {
+            confirm: null,
+            cancel: null,
+          },
         })
       })
 
@@ -97,23 +111,49 @@ describe('Modal.vue', () => {
         it('passes author name to disable modal', () => {
           state.data = {
             type: 'comment',
-            resource: { id: 'c456', author: { name: 'Author name' } },
+            resource: {
+              id: 'c456',
+              author: {
+                name: 'Author name',
+              },
+            },
+            callbacks: {
+              confirm: null,
+              cancel: null,
+            },
           }
           wrapper = Wrapper()
           expect(wrapper.find(DisableModal).props()).toEqual({
             type: 'comment',
             name: 'Author name',
             id: 'c456',
+            callbacks: {
+              confirm: null,
+              cancel: null,
+            },
           })
         })
 
         it('does not crash if author is undefined', () => {
-          state.data = { type: 'comment', resource: { id: 'c456' } }
+          state.data = {
+            type: 'comment',
+            resource: {
+              id: 'c456',
+            },
+            callbacks: {
+              confirm: null,
+              cancel: null,
+            },
+          }
           wrapper = Wrapper()
           expect(wrapper.find(DisableModal).props()).toEqual({
             type: 'comment',
             name: '',
             id: 'c456',
+            callbacks: {
+              confirm: null,
+              cancel: null,
+            },
           })
         })
       })
diff --git a/webapp/components/Modal.vue b/webapp/components/Modal.vue
index f06ed497a..efe1b8ab6 100644
--- a/webapp/components/Modal.vue
+++ b/webapp/components/Modal.vue
@@ -29,9 +29,9 @@
 </template>
 
 <script>
+import DeleteModal from '~/components/Modal/DeleteModal'
 import DisableModal from '~/components/Modal/DisableModal'
 import ReportModal from '~/components/Modal/ReportModal'
-import DeleteModal from '~/components/Modal/DeleteModal'
 import { mapGetters } from 'vuex'
 
 export default {
diff --git a/webapp/components/Modal/DeleteModal.spec.js b/webapp/components/Modal/DeleteModal.spec.js
index 008acdada..c5e9df001 100644
--- a/webapp/components/Modal/DeleteModal.spec.js
+++ b/webapp/components/Modal/DeleteModal.spec.js
@@ -8,7 +8,7 @@ const localVue = createLocalVue()
 localVue.use(Vuex)
 localVue.use(Styleguide)
 
-describe('DeleteModal', () => {
+describe('DeleteModal.vue', () => {
   let Wrapper
   let wrapper
   let propsData
diff --git a/webapp/components/Modal/DisableModal.spec.js b/webapp/components/Modal/DisableModal.spec.js
index c1cf38c60..02ae3fa5d 100644
--- a/webapp/components/Modal/DisableModal.spec.js
+++ b/webapp/components/Modal/DisableModal.spec.js
@@ -14,9 +14,12 @@ describe('DisableModal.vue', () => {
   beforeEach(() => {
     propsData = {
       type: 'contribution',
-      name: 'blah',
-      callbacks: { confirm: null, cancel: null },
       id: 'c42',
+      name: 'blah',
+      callbacks: {
+        confirm: jest.fn(),
+        cancel: jest.fn(),
+      },
     }
     mocks = {
       $filters: {
@@ -35,22 +38,34 @@ describe('DisableModal.vue', () => {
 
   describe('shallowMount', () => {
     const Wrapper = () => {
-      return shallowMount(DisableModal, { propsData, mocks, localVue })
+      return shallowMount(DisableModal, {
+        propsData,
+        mocks,
+        localVue,
+      })
     }
 
     describe('given a user', () => {
       beforeEach(() => {
         propsData = {
+          ...propsData,
           type: 'user',
-          id: 'u2',
           name: 'Bob Ross',
+          id: 'u2',
         }
       })
 
       it('mentions user name', () => {
         Wrapper()
         const calls = mocks.$t.mock.calls
-        const expected = [['disable.user.message', { name: 'Bob Ross' }]]
+        const expected = [
+          [
+            'disable.user.message',
+            {
+              name: 'Bob Ross',
+            },
+          ],
+        ]
         expect(calls).toEqual(expect.arrayContaining(expected))
       })
     })
@@ -58,16 +73,24 @@ describe('DisableModal.vue', () => {
     describe('given a contribution', () => {
       beforeEach(() => {
         propsData = {
+          ...propsData,
           type: 'contribution',
-          id: 'c3',
           name: 'This is some post title.',
+          id: 'c3',
         }
       })
 
       it('mentions contribution title', () => {
         Wrapper()
         const calls = mocks.$t.mock.calls
-        const expected = [['disable.contribution.message', { name: 'This is some post title.' }]]
+        const expected = [
+          [
+            'disable.contribution.message',
+            {
+              name: 'This is some post title.',
+            },
+          ],
+        ]
         expect(calls).toEqual(expect.arrayContaining(expected))
       })
     })
@@ -75,13 +98,18 @@ describe('DisableModal.vue', () => {
 
   describe('mount', () => {
     const Wrapper = () => {
-      return mount(DisableModal, { propsData, mocks, localVue })
+      return mount(DisableModal, {
+        propsData,
+        mocks,
+        localVue,
+      })
     }
     beforeEach(jest.useFakeTimers)
 
     describe('given id', () => {
       beforeEach(() => {
         propsData = {
+          ...propsData,
           type: 'user',
           id: 'u4711',
         }
@@ -127,7 +155,9 @@ describe('DisableModal.vue', () => {
         it('passes id to mutation', () => {
           const calls = mocks.$apollo.mutate.mock.calls
           const [[{ variables }]] = calls
-          expect(variables).toEqual({ id: 'u4711' })
+          expect(variables).toEqual({
+            id: 'u4711',
+          })
         })
 
         it('fades away', () => {
diff --git a/webapp/components/Modal/DisableModal.vue b/webapp/components/Modal/DisableModal.vue
index fe9921511..47ecce8e5 100644
--- a/webapp/components/Modal/DisableModal.vue
+++ b/webapp/components/Modal/DisableModal.vue
@@ -31,6 +31,7 @@
 import gql from 'graphql-tag'
 
 export default {
+  name: 'DisableModal',
   props: {
     name: { type: String, default: '' },
     type: { type: String, required: true },
diff --git a/webapp/components/Modal/ReportModal.spec.js b/webapp/components/Modal/ReportModal.spec.js
index 46c5a02bc..27262e998 100644
--- a/webapp/components/Modal/ReportModal.spec.js
+++ b/webapp/components/Modal/ReportModal.spec.js
@@ -17,7 +17,10 @@ describe('ReportModal.vue', () => {
     propsData = {
       type: 'contribution',
       id: 'c43',
-      callbacks: { confirm: null, cancel: null },
+      callbacks: {
+        confirm: jest.fn(),
+        cancel: jest.fn(),
+      },
     }
     mocks = {
       $t: jest.fn(),
@@ -36,7 +39,11 @@ describe('ReportModal.vue', () => {
 
   describe('shallowMount', () => {
     const Wrapper = () => {
-      return shallowMount(ReportModal, { propsData, mocks, localVue })
+      return shallowMount(ReportModal, {
+        propsData,
+        mocks,
+        localVue,
+      })
     }
 
     describe('defaults', () => {
@@ -52,17 +59,24 @@ describe('ReportModal.vue', () => {
     describe('given a user', () => {
       beforeEach(() => {
         propsData = {
+          ...propsData,
           type: 'user',
           id: 'u4',
           name: 'Bob Ross',
-          callbacks: { confirm: null, cancel: null },
         }
       })
 
       it('mentions user name', () => {
         Wrapper()
         const calls = mocks.$t.mock.calls
-        const expected = [['report.user.message', { name: 'Bob Ross' }]]
+        const expected = [
+          [
+            'report.user.message',
+            {
+              name: 'Bob Ross',
+            },
+          ],
+        ]
         expect(calls).toEqual(expect.arrayContaining(expected))
       })
     })
@@ -70,17 +84,24 @@ describe('ReportModal.vue', () => {
     describe('given a post', () => {
       beforeEach(() => {
         propsData = {
-          id: 'p23',
+          ...propsData,
           type: 'post',
+          id: 'p23',
           name: 'It is a post',
-          callbacks: { confirm: null, cancel: null },
         }
       })
 
       it('mentions post title', () => {
         Wrapper()
         const calls = mocks.$t.mock.calls
-        const expected = [['report.post.message', { name: 'It is a post' }]]
+        const expected = [
+          [
+            'report.post.message',
+            {
+              name: 'It is a post',
+            },
+          ],
+        ]
         expect(calls).toEqual(expect.arrayContaining(expected))
       })
     })
@@ -88,7 +109,11 @@ describe('ReportModal.vue', () => {
 
   describe('mount', () => {
     const Wrapper = () => {
-      return mount(ReportModal, { propsData, mocks, localVue })
+      return mount(ReportModal, {
+        propsData,
+        mocks,
+        localVue,
+      })
     }
 
     beforeEach(jest.useFakeTimers)
@@ -100,9 +125,9 @@ describe('ReportModal.vue', () => {
     describe('given id', () => {
       beforeEach(() => {
         propsData = {
+          ...propsData,
           type: 'user',
           id: 'u4711',
-          callbacks: { confirm: null, cancel: null },
         }
         wrapper = Wrapper()
       })

From b46016203acf99927ab7e82e7b404c450568e342 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Fri, 31 May 2019 14:57:44 +0200
Subject: [PATCH 17/20] Started writing Jest tests for Deletion of Comments

---
 webapp/components/Comment.spec.js | 68 ++++++++++++++++++++++++++-----
 1 file changed, 58 insertions(+), 10 deletions(-)

diff --git a/webapp/components/Comment.spec.js b/webapp/components/Comment.spec.js
index ebb9b8bf8..fa22679c5 100644
--- a/webapp/components/Comment.spec.js
+++ b/webapp/components/Comment.spec.js
@@ -1,4 +1,8 @@
-import { config, shallowMount, createLocalVue } from '@vue/test-utils'
+import {
+  config,
+  shallowMount,
+  createLocalVue
+} from '@vue/test-utils'
 import Comment from './Comment.vue'
 import Vuex from 'vuex'
 import Styleguide from '@human-connection/styleguide'
@@ -14,6 +18,8 @@ describe('Comment.vue', () => {
   let propsData
   let mocks
   let getters
+  let wrapper
+  let Wrapper
 
   beforeEach(() => {
     propsData = {}
@@ -29,11 +35,16 @@ describe('Comment.vue', () => {
   })
 
   describe('shallowMount', () => {
-    const Wrapper = () => {
+    Wrapper = () => {
       const store = new Vuex.Store({
         getters,
       })
-      return shallowMount(Comment, { store, propsData, mocks, localVue })
+      return shallowMount(Comment, {
+        store,
+        propsData,
+        mocks,
+        localVue,
+      })
     }
 
     describe('given a comment', () => {
@@ -45,7 +56,7 @@ describe('Comment.vue', () => {
       })
 
       it('renders content', () => {
-        const wrapper = Wrapper()
+        wrapper = Wrapper()
         expect(wrapper.text()).toMatch('Hello I am a comment content')
       })
 
@@ -55,19 +66,22 @@ describe('Comment.vue', () => {
         })
 
         it('renders no comment data', () => {
-          const wrapper = Wrapper()
+          wrapper = Wrapper()
           expect(wrapper.text()).not.toMatch('comment content')
         })
 
         it('has no "disabled-content" css class', () => {
-          const wrapper = Wrapper()
+          wrapper = Wrapper()
           expect(wrapper.classes()).not.toContain('disabled-content')
         })
 
         it('translates a placeholder', () => {
-          /* const wrapper = */ Wrapper()
+          /* const wrapper = */
+          Wrapper()
           const calls = mocks.$t.mock.calls
-          const expected = [['comment.content.unavailable-placeholder']]
+          const expected = [
+            ['comment.content.unavailable-placeholder']
+          ]
           expect(calls).toEqual(expect.arrayContaining(expected))
         })
 
@@ -77,16 +91,50 @@ describe('Comment.vue', () => {
           })
 
           it('renders comment data', () => {
-            const wrapper = Wrapper()
+            wrapper = Wrapper()
             expect(wrapper.text()).toMatch('comment content')
           })
 
           it('has a "disabled-content" css class', () => {
-            const wrapper = Wrapper()
+            wrapper = Wrapper()
             expect(wrapper.classes()).toContain('disabled-content')
           })
         })
       })
+
+      beforeEach(jest.useFakeTimers)
+
+      describe('test callbacks', () => {
+        beforeEach(() => {
+          wrapper = Wrapper()
+        })
+
+        describe('deletion of Comment from List by invoking "deleteCommentCallback()"', () => {
+          beforeEach(() => {
+            wrapper.vm.deleteCommentCallback()
+          })
+
+          describe('after timeout', () => {
+            beforeEach(jest.runAllTimers)
+
+            it('emits "deleteComment"', () => {
+              expect(wrapper.emitted().deleteComment.length).toBe(1)
+            })
+
+            // it('does not go to index (main) page', () => {
+            //   expect(mocks.$router.history.push).not.toHaveBeenCalled()
+            // })
+
+            it('does call mutation', () => {
+              expect(mocks.$apollo.mutate).toHaveBeenCalledTimes(1)
+            })
+
+            it('mutation is successful', () => {
+              expect(mocks.$toast.success).toHaveBeenCalledTimes(1)
+            })
+          })
+        })
+      })
     })
   })
 })

From 5bec0f1d72cf8c3a5fd4de0503b12513fee99b5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Fri, 31 May 2019 15:46:34 +0200
Subject: [PATCH 18/20] Refined list deletion functions and started writing
 custom mutation for DeleteComment and their tests

---
 .../src/middleware/permissionsMiddleware.js   |  26 +-
 backend/src/resolvers/comments.js             |   5 +
 backend/src/resolvers/comments.spec.js        | 244 ++++++++++++++++--
 webapp/components/Comment.spec.js             |  24 +-
 webapp/components/ContentMenu.vue             |  34 ++-
 .../components/comments/CommentList/index.vue |   5 +-
 webapp/pages/index.vue                        |  17 +-
 webapp/pages/post/_id/_slug/more-info.vue     |  44 ++--
 webapp/pages/profile/_id/_slug.vue            | 197 +++-----------
 9 files changed, 352 insertions(+), 244 deletions(-)

diff --git a/backend/src/middleware/permissionsMiddleware.js b/backend/src/middleware/permissionsMiddleware.js
index b1a08a14d..ea4ba3dd2 100644
--- a/backend/src/middleware/permissionsMiddleware.js
+++ b/backend/src/middleware/permissionsMiddleware.js
@@ -16,11 +16,15 @@ const isAdmin = rule()(async (parent, args, { user }, info) => {
   return user && user.role === 'admin'
 })
 
-const isMyOwn = rule({ cache: 'no_cache' })(async (parent, args, context, info) => {
+const isMyOwn = rule({
+  cache: 'no_cache',
+})(async (parent, args, context, info) => {
   return context.user.id === parent.id
 })
 
-const belongsToMe = rule({ cache: 'no_cache' })(async (_, args, context) => {
+const belongsToMe = rule({
+  cache: 'no_cache',
+})(async (_, args, context) => {
   const {
     driver,
     user: { id: userId },
@@ -32,7 +36,10 @@ const belongsToMe = rule({ cache: 'no_cache' })(async (_, args, context) => {
   MATCH (u:User {id: $userId})<-[:NOTIFIED]-(n:Notification {id: $notificationId})
   RETURN n
   `,
-    { userId, notificationId },
+    {
+      userId,
+      notificationId,
+    },
   )
   const [notification] = result.records.map(record => {
     return record.get('n')
@@ -41,12 +48,16 @@ const belongsToMe = rule({ cache: 'no_cache' })(async (_, args, context) => {
   return Boolean(notification)
 })
 
-const onlyEnabledContent = rule({ cache: 'strict' })(async (parent, args, ctx, info) => {
+const onlyEnabledContent = rule({
+  cache: 'strict',
+})(async (parent, args, ctx, info) => {
   const { disabled, deleted } = args
   return !(disabled || deleted)
 })
 
-const isAuthor = rule({ cache: 'no_cache' })(async (parent, args, { user, driver }) => {
+const isAuthor = rule({
+  cache: 'no_cache',
+})(async (parent, args, { user, driver }) => {
   if (!user) return false
   const session = driver.session()
   const { id: postId } = args
@@ -55,7 +66,9 @@ const isAuthor = rule({ cache: 'no_cache' })(async (parent, args, { user, driver
   MATCH (post:Post {id: $postId})<-[:WROTE]-(author)
   RETURN author
   `,
-    { postId },
+    {
+      postId,
+    },
   )
   const [author] = result.records.map(record => {
     return record.get('author')
@@ -100,6 +113,7 @@ const permissions = shield({
     enable: isModerator,
     disable: isModerator,
     CreateComment: isAuthenticated,
+    DeleteComment: isAuthenticated,
     // CreateUser: allow,
   },
   User: {
diff --git a/backend/src/resolvers/comments.js b/backend/src/resolvers/comments.js
index 949b77041..a4b3c21b1 100644
--- a/backend/src/resolvers/comments.js
+++ b/backend/src/resolvers/comments.js
@@ -53,6 +53,11 @@ export default {
       )
       session.close()
 
+      return comment
+    },
+    DeleteComment: async (object, params, context, resolveInfo) => {
+      const socialMedia = await neo4jgraphql(object, params, context, resolveInfo, false)
+
       return comment
     },
   },
diff --git a/backend/src/resolvers/comments.spec.js b/backend/src/resolvers/comments.spec.js
index 451c559f1..4d86d2d58 100644
--- a/backend/src/resolvers/comments.spec.js
+++ b/backend/src/resolvers/comments.spec.js
@@ -1,3 +1,4 @@
+import gql from 'graphql-tag'
 import Factory from '../seed/factories'
 import { GraphQLClient } from 'graphql-request'
 import { host, login } from '../jest/helpers'
@@ -5,6 +6,7 @@ import { host, login } from '../jest/helpers'
 const factory = Factory()
 let client
 let createCommentVariables
+let deleteCommentVariables
 let createPostVariables
 let createCommentVariablesSansPostId
 let createCommentVariablesWithNonExistentPost
@@ -21,22 +23,22 @@ afterEach(async () => {
 })
 
 describe('CreateComment', () => {
-  const createCommentMutation = `
-  mutation($postId: ID, $content: String!) {
-    CreateComment(postId: $postId, content: $content) {
-      id
-      content
+  const createCommentMutation = gql`
+    mutation($postId: ID, $content: String!) {
+      CreateComment(postId: $postId, content: $content) {
+        id
+        content
+      }
     }
-  }
   `
-  const createPostMutation = `
-  mutation($id: ID!, $title: String!, $content: String!) {
-    CreatePost(id: $id, title: $title, content: $content) {
-      id
+  const createPostMutation = gql`
+    mutation($id: ID!, $title: String!, $content: String!) {
+      CreatePost(id: $id, title: $title, content: $content) {
+        id
+      }
     }
-  }
   `
-  const commentQueryForPostId = `
+  const commentQueryForPostId = gql`
     query($content: String) {
       Comment(content: $content) {
         postId
@@ -59,8 +61,13 @@ describe('CreateComment', () => {
   describe('authenticated', () => {
     let headers
     beforeEach(async () => {
-      headers = await login({ email: 'test@example.org', password: '1234' })
-      client = new GraphQLClient(host, { headers })
+      headers = await login({
+        email: 'test@example.org',
+        password: '1234',
+      })
+      client = new GraphQLClient(host, {
+        headers,
+      })
       createCommentVariables = {
         postId: 'p1',
         content: "I'm authorised to comment",
@@ -96,7 +103,15 @@ describe('CreateComment', () => {
           }
         }`)
 
-      expect(User).toEqual([{ comments: [{ content: "I'm authorised to comment" }] }])
+      expect(User).toEqual([
+        {
+          comments: [
+            {
+              content: "I'm authorised to comment",
+            },
+          ],
+        },
+      ])
     })
 
     it('throw an error if an empty string is sent from the editor as content', async () => {
@@ -186,7 +201,204 @@ describe('CreateComment', () => {
         commentQueryForPostId,
         commentQueryVariablesByContent,
       )
-      expect(Comment).toEqual([{ postId: null }])
+      expect(Comment).toEqual([
+        {
+          postId: null,
+        },
+      ])
     })
   })
 })
+
+// describe('DeleteComment', () => {
+//   const createCommentMutation = gql `
+//   mutation($postId: ID, $content: String!) {
+//     CreateComment(postId: $postId, content: $content) {
+//       id
+//       content
+//     }
+//   }
+//   `
+//   const deleteCommentMutation = gql `
+//   mutation($id: ID!) {
+//     DeleteComment(id: $id) {
+//       id
+//       content
+//     }
+//   }
+//   `
+//   const createPostMutation = gql `
+//   mutation($id: ID!, $title: String!, $content: String!) {
+//     CreatePost(id: $id, title: $title, content: $content) {
+//       id
+//     }
+//   }
+//   `
+//   const commentQueryForPostId = gql `
+//     query($content: String) {
+//       Comment(content: $content) {
+//         postId
+//       }
+//     }
+//   `
+//   describe('unauthenticated', () => {
+//     it('throws authorization error', async () => {
+//       deleteCommentVariables = {
+//         id: 'c1',
+//       }
+//       client = new GraphQLClient(host)
+//       await expect(client.request(deleteCommentMutation, deleteCommentVariables)).rejects.toThrow(
+//         'Not Authorised',
+//       )
+//     })
+//   })
+
+//   // describe('authenticated', () => {
+//   //   let headers
+//   //   beforeEach(async () => {
+//   //     headers = await login({
+//   //       email: 'test@example.org',
+//   //       password: '1234'
+//   //     })
+//   //     client = new GraphQLClient(host, {
+//   //       headers
+//   //     })
+//   //     createCommentVariables = {
+//   //       postId: 'p1',
+//   //       content: "I'm authorised to comment",
+//   //     }
+//   //     createPostVariables = {
+//   //       id: 'p1',
+//   //       title: 'post to comment on',
+//   //       content: 'please comment on me',
+//   //     }
+//   //     await client.request(createPostMutation, createPostVariables)
+//   //   })
+
+//   //   it('creates a comment', async () => {
+//   //     const expected = {
+//   //       CreateComment: {
+//   //         content: "I'm authorised to comment",
+//   //       },
+//   //     }
+
+//   //     await expect(
+//   //       client.request(createCommentMutation, createCommentVariables),
+//   //     ).resolves.toMatchObject(expected)
+//   //   })
+
+//   //   it('assigns the authenticated user as author', async () => {
+//   //     await client.request(createCommentMutation, createCommentVariables)
+
+//   //     const {
+//   //       User
+//   //     } = await client.request(`{
+//   //         User(email: "test@example.org") {
+//   //           comments {
+//   //             content
+//   //           }
+//   //         }
+//   //       }`)
+
+//   //     expect(User).toEqual([{
+//   //       comments: [{
+//   //         content: "I'm authorised to comment"
+//   //       }]
+//   //     }])
+//   //   })
+
+//   //   it('throw an error if an empty string is sent from the editor as content', async () => {
+//   //     createCommentVariables = {
+//   //       postId: 'p1',
+//   //       content: '<p></p>',
+//   //     }
+
+//   //     await expect(client.request(createCommentMutation, createCommentVariables)).rejects.toThrow(
+//   //       'Comment must be at least 1 character long!',
+//   //     )
+//   //   })
+
+//   //   it('throws an error if a comment sent from the editor does not contain a single character', async () => {
+//   //     createCommentVariables = {
+//   //       postId: 'p1',
+//   //       content: '<p> </p>',
+//   //     }
+
+//   //     await expect(client.request(createCommentMutation, createCommentVariables)).rejects.toThrow(
+//   //       'Comment must be at least 1 character long!',
+//   //     )
+//   //   })
+
+//   //   it('throws an error if postId is sent as an empty string', async () => {
+//   //     createCommentVariables = {
+//   //       postId: 'p1',
+//   //       content: '',
+//   //     }
+
+//   //     await expect(client.request(createCommentMutation, createCommentVariables)).rejects.toThrow(
+//   //       'Comment must be at least 1 character long!',
+//   //     )
+//   //   })
+
+//   //   it('throws an error if content is sent as an string of empty characters', async () => {
+//   //     createCommentVariables = {
+//   //       postId: 'p1',
+//   //       content: '    ',
+//   //     }
+
+//   //     await expect(client.request(createCommentMutation, createCommentVariables)).rejects.toThrow(
+//   //       'Comment must be at least 1 character long!',
+//   //     )
+//   //   })
+
+//   //   it('throws an error if postId is sent as an empty string', async () => {
+//   //     createCommentVariablesSansPostId = {
+//   //       postId: '',
+//   //       content: 'this comment should not be created',
+//   //     }
+
+//   //     await expect(
+//   //       client.request(createCommentMutation, createCommentVariablesSansPostId),
+//   //     ).rejects.toThrow('Comment cannot be created without a post!')
+//   //   })
+
+//   //   it('throws an error if postId is sent as an string of empty characters', async () => {
+//   //     createCommentVariablesSansPostId = {
+//   //       postId: '   ',
+//   //       content: 'this comment should not be created',
+//   //     }
+
+//   //     await expect(
+//   //       client.request(createCommentMutation, createCommentVariablesSansPostId),
+//   //     ).rejects.toThrow('Comment cannot be created without a post!')
+//   //   })
+
+//   //   it('throws an error if the post does not exist in the database', async () => {
+//   //     createCommentVariablesWithNonExistentPost = {
+//   //       postId: 'p2',
+//   //       content: "comment should not be created cause the post doesn't exist",
+//   //     }
+
+//   //     await expect(
+//   //       client.request(createCommentMutation, createCommentVariablesWithNonExistentPost),
+//   //     ).rejects.toThrow('Comment cannot be created without a post!')
+//   //   })
+
+//   //   it('does not create the comment with the postId as an attribute', async () => {
+//   //     const commentQueryVariablesByContent = {
+//   //       content: "I'm authorised to comment",
+//   //     }
+
+//   //     await client.request(createCommentMutation, createCommentVariables)
+//   //     const {
+//   //       Comment
+//   //     } = await client.request(
+//   //       commentQueryForPostId,
+//   //       commentQueryVariablesByContent,
+//   //     )
+//   //     expect(Comment).toEqual([{
+//   //       postId: null
+//   //     }])
+//   //   })
+//   // })
+// })
diff --git a/webapp/components/Comment.spec.js b/webapp/components/Comment.spec.js
index fa22679c5..e899a05e1 100644
--- a/webapp/components/Comment.spec.js
+++ b/webapp/components/Comment.spec.js
@@ -1,8 +1,4 @@
-import {
-  config,
-  shallowMount,
-  createLocalVue
-} from '@vue/test-utils'
+import { config, shallowMount, createLocalVue } from '@vue/test-utils'
 import Comment from './Comment.vue'
 import Vuex from 'vuex'
 import Styleguide from '@human-connection/styleguide'
@@ -25,6 +21,13 @@ describe('Comment.vue', () => {
     propsData = {}
     mocks = {
       $t: jest.fn(),
+      $toast: {
+        success: jest.fn(),
+        error: jest.fn(),
+      },
+      $apollo: {
+        mutate: jest.fn().mockResolvedValue(),
+      },
     }
     getters = {
       'auth/user': () => {
@@ -76,12 +79,9 @@ describe('Comment.vue', () => {
         })
 
         it('translates a placeholder', () => {
-          /* const wrapper = */
-          Wrapper()
+          wrapper = Wrapper()
           const calls = mocks.$t.mock.calls
-          const expected = [
-            ['comment.content.unavailable-placeholder']
-          ]
+          const expected = [['comment.content.unavailable-placeholder']]
           expect(calls).toEqual(expect.arrayContaining(expected))
         })
 
@@ -121,10 +121,6 @@ describe('Comment.vue', () => {
               expect(wrapper.emitted().deleteComment.length).toBe(1)
             })
 
-            // it('does not go to index (main) page', () => {
-            //   expect(mocks.$router.history.push).not.toHaveBeenCalled()
-            // })
-
             it('does call mutation', () => {
               expect(mocks.$apollo.mutate).toHaveBeenCalledTimes(1)
             })
diff --git a/webapp/components/ContentMenu.vue b/webapp/components/ContentMenu.vue
index ffa42fec0..60cc4b658 100644
--- a/webapp/components/ContentMenu.vue
+++ b/webapp/components/ContentMenu.vue
@@ -1,18 +1,32 @@
 <template>
-  <dropdown class="content-menu"
-:placement="placement" offset="5">
-    <template slot="default"
-slot-scope="{toggleMenu}">
-      <slot name="button"
-:toggleMenu="toggleMenu">
-        <ds-button class="content-menu-trigger"
-size="small" ghost @click.prevent="toggleMenu">
+  <dropdown
+    class="content-menu"
+    :placement="placement"
+    offset="5"
+  >
+    <template
+      slot="default"
+      slot-scope="{toggleMenu}"
+    >
+      <slot
+        name="button"
+        :toggleMenu="toggleMenu"
+      >
+        <ds-button
+          class="content-menu-trigger"
+          size="small"
+          ghost
+          @click.prevent="toggleMenu"
+        >
           <ds-icon name="ellipsis-v" />
         </ds-button>
       </slot>
     </template>
-    <div slot="popover"
-slot-scope="{toggleMenu}" class="content-menu-popover">
+    <div
+      slot="popover"
+      slot-scope="{toggleMenu}"
+      class="content-menu-popover"
+    >
       <ds-menu :routes="routes">
         <ds-menu-item
           slot="menuitem"
diff --git a/webapp/components/comments/CommentList/index.vue b/webapp/components/comments/CommentList/index.vue
index eb9cac088..6b81bebdf 100644
--- a/webapp/components/comments/CommentList/index.vue
+++ b/webapp/components/comments/CommentList/index.vue
@@ -22,7 +22,7 @@
         v-for="(comment, index) in comments"
         :key="comment.id"
         :comment="comment"
-        @deleteComment="deleteComment(index)"
+        @deleteComment="comments.splice(index, 1)"
       />
     </div>
     <hc-empty
@@ -65,9 +65,6 @@ export default {
         this.$apollo.queries.Post.refetch()
       }
     },
-    deleteComment(index) {
-      this.comments.splice(index, 1)
-    },
   },
   apollo: {
     Post: {
diff --git a/webapp/pages/index.vue b/webapp/pages/index.vue
index 21163282a..6d07388dc 100644
--- a/webapp/pages/index.vue
+++ b/webapp/pages/index.vue
@@ -1,10 +1,7 @@
 <template>
   <div>
-    <ds-flex
-      v-if="Post && Post.length"
-      :width="{ base: '100%' }"
-      gutter="base"
-    >
+    <ds-flex v-if="Post && Post.length"
+:width="{ base: '100%' }" gutter="base">
       <hc-post-card
         v-for="(post, index) in uniq(Post)"
         :key="post.id"
@@ -23,11 +20,8 @@
         primary
       />
     </no-ssr>
-    <hc-load-more
-      v-if="true"
-      :loading="$apollo.loading"
-      @click="showMoreContributions"
-    />
+    <hc-load-more v-if="true"
+:loading="$apollo.loading" @click="showMoreContributions" />
   </div>
 </template>
 
@@ -90,7 +84,8 @@ export default {
       this.Post = this.Post.filter(post => {
         return post.id !== postId
       })
-      // Ideal solution:
+      // Why "uniq(Post)" is used in the array for list creation?
+      // Ideal solution here:
       // this.Post.splice(index, 1)
     },
   },
diff --git a/webapp/pages/post/_id/_slug/more-info.vue b/webapp/pages/post/_id/_slug/more-info.vue
index f7f5d583e..be218dc85 100644
--- a/webapp/pages/post/_id/_slug/more-info.vue
+++ b/webapp/pages/post/_id/_slug/more-info.vue
@@ -1,11 +1,13 @@
 <template>
   <ds-card>
     <h2 style="margin-bottom: .2em;">
-      Mehr Informationen
-    </h2>
+Mehr Informationen
+</h2>
     <p>Hier findest du weitere infos zum Thema.</p>
     <ds-space />
-    <h3><ds-icon name="compass" /> Themenkategorien</h3>
+    <h3>
+      <ds-icon name="compass" />Themenkategorien
+    </h3>
     <div class="tags">
       <ds-icon
         v-for="category in post.categories"
@@ -16,39 +18,34 @@
       />&nbsp;
       <!--<ds-tag
         v-for="category in post.categories"
-        :key="category.id"><ds-icon :name="category.icon" /> {{ category.name }}</ds-tag>-->
+      :key="category.id"><ds-icon :name="category.icon" /> {{ category.name }}</ds-tag>-->
     </div>
     <template v-if="post.tags && post.tags.length">
-      <h3><ds-icon name="tags" /> Schlagwörter</h3>
+      <h3>
+        <ds-icon name="tags" />Schlagwörter
+      </h3>
       <div class="tags">
-        <ds-tag
-          v-for="tag in post.tags"
-          :key="tag.id"
-        >
-          <ds-icon name="tag" /> {{ tag.name }}
+        <ds-tag v-for="tag in post.tags"
+:key="tag.id">
+          <ds-icon name="tag" />
+          {{ tag.name }}
         </ds-tag>
       </div>
     </template>
     <h3>Verwandte Beiträge</h3>
     <ds-section style="margin: 0 -1.5rem; padding: 1.5rem;">
-      <ds-flex
-        v-if="post.relatedContributions && post.relatedContributions.length"
-        gutter="small"
-      >
+      <ds-flex v-if="post.relatedContributions && post.relatedContributions.length"
+gutter="small">
         <hc-post-card
           v-for="(relatedPost, index) in post.relatedContributions"
           :key="relatedPost.id"
           :post="relatedPost"
           :width="{ base: '100%', lg: 1 }"
-          @deletePost="deletePost(index)"
+          @deletePost="post.relatedContributions.splice(index, 1)"
         />
       </ds-flex>
-      <hc-empty
-        v-else
-        margin="large"
-        icon="file"
-        message="No related Posts"
-      />
+      <hc-empty v-else
+margin="large" icon="file" message="No related Posts" />
     </ds-section>
     <ds-space margin-bottom="large" />
   </ds-card>
@@ -73,11 +70,6 @@ export default {
       return this.Post ? this.Post[0] || {} : {}
     },
   },
-  methods: {
-    deletePost(index) {
-      this.post.relatedContributions.splice(index, 1)
-    },
-  },
   apollo: {
     Post: {
       query() {
diff --git a/webapp/pages/profile/_id/_slug.vue b/webapp/pages/profile/_id/_slug.vue
index 710d87031..b109dc65b 100644
--- a/webapp/pages/profile/_id/_slug.vue
+++ b/webapp/pages/profile/_id/_slug.vue
@@ -3,27 +3,15 @@
     <ds-card v-if="user && user.image">
       <p>PROFILE IMAGE</p>
     </ds-card>
-    <ds-space />
-    <ds-flex
-      v-if="user"
-      :width="{ base: '100%' }"
-      gutter="base"
-    >
+    <ds-space/>
+    <ds-flex v-if="user" :width="{ base: '100%' }" gutter="base">
       <ds-flex-item :width="{ base: '100%', sm: 2, md: 2, lg: 1 }">
         <ds-card
           :class="{'disabled-content': user.disabled}"
           style="position: relative; height: auto;"
         >
-          <hc-upload
-            v-if="myProfile"
-            :user="user"
-          />
-          <hc-avatar
-            v-else
-            :user="user"
-            class="profile-avatar"
-            size="x-large"
-          />
+          <hc-upload v-if="myProfile" :user="user"/>
+          <hc-avatar v-else :user="user" class="profile-avatar" size="x-large"/>
           <no-ssr>
             <content-menu
               placement="bottom-end"
@@ -35,54 +23,32 @@
             />
           </no-ssr>
           <ds-space margin="small">
-            <ds-heading
-              tag="h3"
-              align="center"
-              no-margin
-            >
-              {{ userName }}
-            </ds-heading>
-            <ds-text
-              v-if="user.location"
-              align="center"
-              color="soft"
-              size="small"
-            >
-              <ds-icon name="map-marker" />
+            <ds-heading tag="h3" align="center" no-margin>{{ userName }}</ds-heading>
+            <ds-text v-if="user.location" align="center" color="soft" size="small">
+              <ds-icon name="map-marker"/>
               {{ user.location.name }}
             </ds-text>
             <ds-text
               align="center"
               color="soft"
               size="small"
-            >
-              {{ $t('profile.memberSince') }} {{ user.createdAt | date('MMMM yyyy') }}
-            </ds-text>
+            >{{ $t('profile.memberSince') }} {{ user.createdAt | date('MMMM yyyy') }}</ds-text>
           </ds-space>
-          <ds-space
-            v-if="user.badges && user.badges.length"
-            margin="x-small"
-          >
-            <hc-badges :badges="user.badges" />
+          <ds-space v-if="user.badges && user.badges.length" margin="x-small">
+            <hc-badges :badges="user.badges"/>
           </ds-space>
           <ds-flex>
             <ds-flex-item>
               <no-ssr>
                 <ds-number :label="$t('profile.followers')">
-                  <hc-count-to
-                    slot="count"
-                    :end-val="followedByCount"
-                  />
+                  <hc-count-to slot="count" :end-val="followedByCount"/>
                 </ds-number>
               </no-ssr>
             </ds-flex-item>
             <ds-flex-item>
               <no-ssr>
                 <ds-number :label="$t('profile.following')">
-                  <hc-count-to
-                    slot="count"
-                    :end-val="Number(user.followingCount) || 0"
-                  />
+                  <hc-count-to slot="count" :end-val="Number(user.followingCount) || 0"/>
                 </ds-number>
               </no-ssr>
             </ds-flex-item>
@@ -98,136 +64,69 @@
           </ds-space>
           <template v-if="user.about">
             <hr>
-            <ds-space
-              margin-top="small"
-              margin-bottom="small"
-            >
-              <ds-text
-                color="soft"
-                size="small"
-              >
-                {{ user.about }}
-              </ds-text>
+            <ds-space margin-top="small" margin-bottom="small">
+              <ds-text color="soft" size="small">{{ user.about }}</ds-text>
             </ds-space>
           </template>
         </ds-card>
-        <ds-space />
-        <ds-heading
-          tag="h3"
-          soft
-          style="text-align: center; margin-bottom: 10px;"
-        >
-          Netzwerk
-        </ds-heading>
+        <ds-space/>
+        <ds-heading tag="h3" soft style="text-align: center; margin-bottom: 10px;">Netzwerk</ds-heading>
         <ds-card style="position: relative; height: auto;">
-          <ds-space
-            v-if="user.following && user.following.length"
-            margin="x-small"
-          >
-            <ds-text
-              tag="h5"
-              color="soft"
-            >
-              Wem folgt {{ userName | truncate(15) }}?
-            </ds-text>
+          <ds-space v-if="user.following && user.following.length" margin="x-small">
+            <ds-text tag="h5" color="soft">Wem folgt {{ userName | truncate(15) }}?</ds-text>
           </ds-space>
           <template v-if="user.following && user.following.length">
-            <ds-space
-              v-for="follow in uniq(user.following)"
-              :key="follow.id"
-              margin="x-small"
-            >
+            <ds-space v-for="follow in uniq(user.following)" :key="follow.id" margin="x-small">
               <!-- TODO: find better solution for rendering errors -->
               <no-ssr>
-                <user
-                  :user="follow"
-                  :trunc="15"
-                />
+                <user :user="follow" :trunc="15"/>
               </no-ssr>
             </ds-space>
-            <ds-space
-              v-if="user.followingCount - user.following.length"
-              margin="small"
-            >
+            <ds-space v-if="user.followingCount - user.following.length" margin="small">
               <ds-text
                 size="small"
                 color="softer"
-              >
-                und {{ user.followingCount - user.following.length }} weitere
-              </ds-text>
+              >und {{ user.followingCount - user.following.length }} weitere</ds-text>
             </ds-space>
           </template>
           <template v-else>
-            <p style="text-align: center; opacity: .5;">
-              {{ userName }} folgt niemandem
-            </p>
+            <p style="text-align: center; opacity: .5;">{{ userName }} folgt niemandem</p>
           </template>
         </ds-card>
-        <ds-space />
+        <ds-space/>
         <ds-card style="position: relative; height: auto;">
-          <ds-space
-            v-if="user.followedBy && user.followedBy.length"
-            margin="x-small"
-          >
-            <ds-text
-              tag="h5"
-              color="soft"
-            >
-              Wer folgt {{ userName | truncate(15) }}?
-            </ds-text>
+          <ds-space v-if="user.followedBy && user.followedBy.length" margin="x-small">
+            <ds-text tag="h5" color="soft">Wer folgt {{ userName | truncate(15) }}?</ds-text>
           </ds-space>
           <template v-if="user.followedBy && user.followedBy.length">
-            <ds-space
-              v-for="follow in uniq(user.followedBy)"
-              :key="follow.id"
-              margin="x-small"
-            >
+            <ds-space v-for="follow in uniq(user.followedBy)" :key="follow.id" margin="x-small">
               <!-- TODO: find better solution for rendering errors -->
               <no-ssr>
-                <user
-                  :user="follow"
-                  :trunc="15"
-                />
+                <user :user="follow" :trunc="15"/>
               </no-ssr>
             </ds-space>
-            <ds-space
-              v-if="user.followedByCount - user.followedBy.length"
-              margin="small"
-            >
+            <ds-space v-if="user.followedByCount - user.followedBy.length" margin="small">
               <ds-text
                 size="small"
                 color="softer"
-              >
-                und {{ user.followedByCount - user.followedBy.length }} weitere
-              </ds-text>
+              >und {{ user.followedByCount - user.followedBy.length }} weitere</ds-text>
             </ds-space>
           </template>
           <template v-else>
-            <p style="text-align: center; opacity: .5;">
-              niemand folgt {{ userName }}
-            </p>
+            <p style="text-align: center; opacity: .5;">niemand folgt {{ userName }}</p>
           </template>
         </ds-card>
-        <ds-space
-          v-if="user.socialMedia && user.socialMedia.length"
-          margin="large"
-        >
+        <ds-space v-if="user.socialMedia && user.socialMedia.length" margin="large">
           <ds-card style="position: relative; height: auto;">
             <ds-space margin="x-small">
               <ds-text
                 tag="h5"
                 color="soft"
-              >
-                {{ $t('profile.socialMedia') }} {{ user.name | truncate(15) }}?
-              </ds-text>
+              >{{ $t('profile.socialMedia') }} {{ user.name | truncate(15) }}?</ds-text>
               <template>
-                <ds-space
-                  v-for="link in socialMediaLinks"
-                  :key="link.username"
-                  margin="x-small"
-                >
+                <ds-space v-for="link in socialMediaLinks" :key="link.username" margin="x-small">
                   <a :href="link.url">
-                    <ds-avatar :image="link.favicon" />
+                    <ds-avatar :image="link.favicon"/>
                     {{ 'link.username' }}
                   </a>
                 </ds-space>
@@ -237,10 +136,7 @@
         </ds-space>
       </ds-flex-item>
       <ds-flex-item :width="{ base: '100%', sm: 3, md: 5, lg: 3 }">
-        <ds-flex
-          :width="{ base: '100%' }"
-          gutter="small"
-        >
+        <ds-flex :width="{ base: '100%' }" gutter="small">
           <ds-flex-item class="profile-top-navigation">
             <ds-card class="ds-tab-nav">
               <ds-flex>
@@ -249,10 +145,7 @@
                     <!-- TODO: find better solution for rendering errors -->
                     <no-ssr>
                       <ds-number :label="$t('common.post', null, user.contributionsCount)">
-                        <hc-count-to
-                          slot="count"
-                          :end-val="user.contributionsCount"
-                        />
+                        <hc-count-to slot="count" :end-val="user.contributionsCount"/>
                       </ds-number>
                     </no-ssr>
                   </ds-space>
@@ -299,23 +192,16 @@
               :key="post.id"
               :post="post"
               :width="{ base: '100%', md: '100%', xl: '50%' }"
-              @deletePost="deletePost(index)"
+              @deletePost="user.contributions.splice(index, 1)"
             />
           </template>
           <template v-else>
             <ds-flex-item :width="{ base: '100%' }">
-              <hc-empty
-                margin="xx-large"
-                icon="file"
-              />
+              <hc-empty margin="xx-large" icon="file"/>
             </ds-flex-item>
           </template>
         </ds-flex>
-        <hc-load-more
-          v-if="hasMore"
-          :loading="$apollo.loading"
-          @click="showMoreContributions"
-        />
+        <hc-load-more v-if="hasMore" :loading="$apollo.loading" @click="showMoreContributions"/>
       </ds-flex-item>
     </ds-flex>
   </div>
@@ -440,9 +326,6 @@ export default {
         fetchPolicy: 'cache-and-network',
       })
     },
-    deletePost(index) {
-      this.user.contributions.splice(index, 1)
-    },
   },
   apollo: {
     User: {

From e63e4ad890583f12ac4b3d4c017878f6b6e1b7e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Fri, 31 May 2019 17:42:04 +0200
Subject: [PATCH 19/20] Written custom mutation and Jest tests for
 DeleteComment

---
 backend/src/resolvers/comments.js         |   2 +-
 backend/src/resolvers/comments.spec.js    | 270 +++++++---------------
 backend/src/resolvers/socialMedia.spec.js |  40 +++-
 webapp/components/Comment.vue             |   1 -
 webapp/pages/index.vue                    |  14 +-
 webapp/pages/post/_id/_slug/more-info.vue |  24 +-
 webapp/pages/profile/_id/_slug.vue        | 192 +++++++++++----
 7 files changed, 289 insertions(+), 254 deletions(-)

diff --git a/backend/src/resolvers/comments.js b/backend/src/resolvers/comments.js
index a4b3c21b1..7f3b11da4 100644
--- a/backend/src/resolvers/comments.js
+++ b/backend/src/resolvers/comments.js
@@ -56,7 +56,7 @@ export default {
       return comment
     },
     DeleteComment: async (object, params, context, resolveInfo) => {
-      const socialMedia = await neo4jgraphql(object, params, context, resolveInfo, false)
+      const comment = await neo4jgraphql(object, params, context, resolveInfo, false)
 
       return comment
     },
diff --git a/backend/src/resolvers/comments.spec.js b/backend/src/resolvers/comments.spec.js
index 4d86d2d58..e3bf00528 100644
--- a/backend/src/resolvers/comments.spec.js
+++ b/backend/src/resolvers/comments.spec.js
@@ -95,13 +95,15 @@ describe('CreateComment', () => {
     it('assigns the authenticated user as author', async () => {
       await client.request(createCommentMutation, createCommentVariables)
 
-      const { User } = await client.request(`{
+      const { User } = await client.request(gql`
+        {
           User(email: "test@example.org") {
             comments {
               content
             }
           }
-        }`)
+        }
+      `)
 
       expect(User).toEqual([
         {
@@ -210,195 +212,83 @@ describe('CreateComment', () => {
   })
 })
 
-// describe('DeleteComment', () => {
-//   const createCommentMutation = gql `
-//   mutation($postId: ID, $content: String!) {
-//     CreateComment(postId: $postId, content: $content) {
-//       id
-//       content
-//     }
-//   }
-//   `
-//   const deleteCommentMutation = gql `
-//   mutation($id: ID!) {
-//     DeleteComment(id: $id) {
-//       id
-//       content
-//     }
-//   }
-//   `
-//   const createPostMutation = gql `
-//   mutation($id: ID!, $title: String!, $content: String!) {
-//     CreatePost(id: $id, title: $title, content: $content) {
-//       id
-//     }
-//   }
-//   `
-//   const commentQueryForPostId = gql `
-//     query($content: String) {
-//       Comment(content: $content) {
-//         postId
-//       }
-//     }
-//   `
-//   describe('unauthenticated', () => {
-//     it('throws authorization error', async () => {
-//       deleteCommentVariables = {
-//         id: 'c1',
-//       }
-//       client = new GraphQLClient(host)
-//       await expect(client.request(deleteCommentMutation, deleteCommentVariables)).rejects.toThrow(
-//         'Not Authorised',
-//       )
-//     })
-//   })
+describe('DeleteComment', () => {
+  const createCommentMutation = gql`
+    mutation($postId: ID, $content: String!) {
+      CreateComment(postId: $postId, content: $content) {
+        id
+        content
+      }
+    }
+  `
+  const deleteCommentMutation = gql`
+    mutation($id: ID!) {
+      DeleteComment(id: $id) {
+        id
+      }
+    }
+  `
+  const createPostMutation = gql`
+    mutation($id: ID!, $title: String!, $content: String!) {
+      CreatePost(id: $id, title: $title, content: $content) {
+        id
+      }
+    }
+  `
+  describe('unauthenticated', () => {
+    it('throws authorization error', async () => {
+      deleteCommentVariables = {
+        id: 'c1',
+      }
+      client = new GraphQLClient(host)
+      await expect(client.request(deleteCommentMutation, deleteCommentVariables)).rejects.toThrow(
+        'Not Authorised',
+      )
+    })
+  })
 
-//   // describe('authenticated', () => {
-//   //   let headers
-//   //   beforeEach(async () => {
-//   //     headers = await login({
-//   //       email: 'test@example.org',
-//   //       password: '1234'
-//   //     })
-//   //     client = new GraphQLClient(host, {
-//   //       headers
-//   //     })
-//   //     createCommentVariables = {
-//   //       postId: 'p1',
-//   //       content: "I'm authorised to comment",
-//   //     }
-//   //     createPostVariables = {
-//   //       id: 'p1',
-//   //       title: 'post to comment on',
-//   //       content: 'please comment on me',
-//   //     }
-//   //     await client.request(createPostMutation, createPostVariables)
-//   //   })
+  describe('authenticated', () => {
+    let headers
+    beforeEach(async () => {
+      headers = await login({
+        email: 'test@example.org',
+        password: '1234',
+      })
+      client = new GraphQLClient(host, {
+        headers,
+      })
+      createCommentVariables = {
+        id: 'c1',
+        postId: 'p1',
+        content: "I'm authorised to comment",
+      }
+      deleteCommentVariables = {
+        id: 'c1',
+      }
+      createPostVariables = {
+        id: 'p1',
+        title: 'post to comment on',
+        content: 'please comment on me',
+      }
+      await client.request(createPostMutation, createPostVariables)
+    })
 
-//   //   it('creates a comment', async () => {
-//   //     const expected = {
-//   //       CreateComment: {
-//   //         content: "I'm authorised to comment",
-//   //       },
-//   //     }
+    it('deletes the authors comment', async () => {
+      const { CreateComment } = await client.request(createCommentMutation, createCommentVariables)
 
-//   //     await expect(
-//   //       client.request(createCommentMutation, createCommentVariables),
-//   //     ).resolves.toMatchObject(expected)
-//   //   })
+      deleteCommentVariables = {
+        id: CreateComment.id,
+      }
+      const expected = {
+        DeleteComment: {
+          id: CreateComment.id,
+        },
+      }
+      await expect(
+        client.request(deleteCommentMutation, deleteCommentVariables),
+      ).resolves.toMatchObject(expected)
+    })
 
-//   //   it('assigns the authenticated user as author', async () => {
-//   //     await client.request(createCommentMutation, createCommentVariables)
-
-//   //     const {
-//   //       User
-//   //     } = await client.request(`{
-//   //         User(email: "test@example.org") {
-//   //           comments {
-//   //             content
-//   //           }
-//   //         }
-//   //       }`)
-
-//   //     expect(User).toEqual([{
-//   //       comments: [{
-//   //         content: "I'm authorised to comment"
-//   //       }]
-//   //     }])
-//   //   })
-
-//   //   it('throw an error if an empty string is sent from the editor as content', async () => {
-//   //     createCommentVariables = {
-//   //       postId: 'p1',
-//   //       content: '<p></p>',
-//   //     }
-
-//   //     await expect(client.request(createCommentMutation, createCommentVariables)).rejects.toThrow(
-//   //       'Comment must be at least 1 character long!',
-//   //     )
-//   //   })
-
-//   //   it('throws an error if a comment sent from the editor does not contain a single character', async () => {
-//   //     createCommentVariables = {
-//   //       postId: 'p1',
-//   //       content: '<p> </p>',
-//   //     }
-
-//   //     await expect(client.request(createCommentMutation, createCommentVariables)).rejects.toThrow(
-//   //       'Comment must be at least 1 character long!',
-//   //     )
-//   //   })
-
-//   //   it('throws an error if postId is sent as an empty string', async () => {
-//   //     createCommentVariables = {
-//   //       postId: 'p1',
-//   //       content: '',
-//   //     }
-
-//   //     await expect(client.request(createCommentMutation, createCommentVariables)).rejects.toThrow(
-//   //       'Comment must be at least 1 character long!',
-//   //     )
-//   //   })
-
-//   //   it('throws an error if content is sent as an string of empty characters', async () => {
-//   //     createCommentVariables = {
-//   //       postId: 'p1',
-//   //       content: '    ',
-//   //     }
-
-//   //     await expect(client.request(createCommentMutation, createCommentVariables)).rejects.toThrow(
-//   //       'Comment must be at least 1 character long!',
-//   //     )
-//   //   })
-
-//   //   it('throws an error if postId is sent as an empty string', async () => {
-//   //     createCommentVariablesSansPostId = {
-//   //       postId: '',
-//   //       content: 'this comment should not be created',
-//   //     }
-
-//   //     await expect(
-//   //       client.request(createCommentMutation, createCommentVariablesSansPostId),
-//   //     ).rejects.toThrow('Comment cannot be created without a post!')
-//   //   })
-
-//   //   it('throws an error if postId is sent as an string of empty characters', async () => {
-//   //     createCommentVariablesSansPostId = {
-//   //       postId: '   ',
-//   //       content: 'this comment should not be created',
-//   //     }
-
-//   //     await expect(
-//   //       client.request(createCommentMutation, createCommentVariablesSansPostId),
-//   //     ).rejects.toThrow('Comment cannot be created without a post!')
-//   //   })
-
-//   //   it('throws an error if the post does not exist in the database', async () => {
-//   //     createCommentVariablesWithNonExistentPost = {
-//   //       postId: 'p2',
-//   //       content: "comment should not be created cause the post doesn't exist",
-//   //     }
-
-//   //     await expect(
-//   //       client.request(createCommentMutation, createCommentVariablesWithNonExistentPost),
-//   //     ).rejects.toThrow('Comment cannot be created without a post!')
-//   //   })
-
-//   //   it('does not create the comment with the postId as an attribute', async () => {
-//   //     const commentQueryVariablesByContent = {
-//   //       content: "I'm authorised to comment",
-//   //     }
-
-//   //     await client.request(createCommentMutation, createCommentVariables)
-//   //     const {
-//   //       Comment
-//   //     } = await client.request(
-//   //       commentQueryForPostId,
-//   //       commentQueryVariablesByContent,
-//   //     )
-//   //     expect(Comment).toEqual([{
-//   //       postId: null
-//   //     }])
-//   //   })
-//   // })
-// })
+    it.todo('throws an error if it tries to delete a comment not from this author')
+  })
+})
diff --git a/backend/src/resolvers/socialMedia.spec.js b/backend/src/resolvers/socialMedia.spec.js
index 5143587b1..4e298e783 100644
--- a/backend/src/resolvers/socialMedia.spec.js
+++ b/backend/src/resolvers/socialMedia.spec.js
@@ -1,13 +1,14 @@
+import gql from 'graphql-tag'
 import Factory from '../seed/factories'
 import { GraphQLClient } from 'graphql-request'
 import { host, login } from '../jest/helpers'
 
 const factory = Factory()
 
-describe('CreateSocialMedia', () => {
+describe('SocialMedia', () => {
   let client
   let headers
-  const mutationC = `
+  const mutationC = gql`
     mutation($url: String!) {
       CreateSocialMedia(url: $url) {
         id
@@ -15,7 +16,7 @@ describe('CreateSocialMedia', () => {
       }
     }
   `
-  const mutationD = `
+  const mutationD = gql`
     mutation($id: ID!) {
       DeleteSocialMedia(id: $id) {
         id
@@ -42,19 +43,28 @@ describe('CreateSocialMedia', () => {
   describe('unauthenticated', () => {
     it('throws authorization error', async () => {
       client = new GraphQLClient(host)
-      const variables = { url: 'http://nsosp.org' }
+      const variables = {
+        url: 'http://nsosp.org',
+      }
       await expect(client.request(mutationC, variables)).rejects.toThrow('Not Authorised')
     })
   })
 
   describe('authenticated', () => {
     beforeEach(async () => {
-      headers = await login({ email: 'test@example.org', password: '1234' })
-      client = new GraphQLClient(host, { headers })
+      headers = await login({
+        email: 'test@example.org',
+        password: '1234',
+      })
+      client = new GraphQLClient(host, {
+        headers,
+      })
     })
 
     it('creates social media with correct URL', async () => {
-      const variables = { url: 'http://nsosp.org' }
+      const variables = {
+        url: 'http://nsosp.org',
+      }
       await expect(client.request(mutationC, variables)).resolves.toEqual(
         expect.objectContaining({
           CreateSocialMedia: {
@@ -66,11 +76,15 @@ describe('CreateSocialMedia', () => {
     })
 
     it('deletes social media', async () => {
-      const creationVariables = { url: 'http://nsosp.org' }
+      const creationVariables = {
+        url: 'http://nsosp.org',
+      }
       const { CreateSocialMedia } = await client.request(mutationC, creationVariables)
       const { id } = CreateSocialMedia
 
-      const deletionVariables = { id }
+      const deletionVariables = {
+        id,
+      }
       const expected = {
         DeleteSocialMedia: {
           id: id,
@@ -81,12 +95,16 @@ describe('CreateSocialMedia', () => {
     })
 
     it('rejects empty string', async () => {
-      const variables = { url: '' }
+      const variables = {
+        url: '',
+      }
       await expect(client.request(mutationC, variables)).rejects.toThrow('Input is not a URL')
     })
 
     it('validates URLs', async () => {
-      const variables = { url: 'not-a-url' }
+      const variables = {
+        url: 'not-a-url',
+      }
       await expect(client.request(mutationC, variables)).rejects.toThrow('Input is not a URL')
     })
   })
diff --git a/webapp/components/Comment.vue b/webapp/components/Comment.vue
index ce5433332..7c85192d8 100644
--- a/webapp/components/Comment.vue
+++ b/webapp/components/Comment.vue
@@ -74,7 +74,6 @@ export default {
     },
     async deleteCommentCallback() {
       try {
-        // XXX Make custom mutation and tests in the Backend !!!
         var gqlMutation = gql`
           mutation($id: ID!) {
             DeleteComment(id: $id) {
diff --git a/webapp/pages/index.vue b/webapp/pages/index.vue
index 6d07388dc..42b0f3eb4 100644
--- a/webapp/pages/index.vue
+++ b/webapp/pages/index.vue
@@ -1,7 +1,10 @@
 <template>
   <div>
-    <ds-flex v-if="Post && Post.length"
-:width="{ base: '100%' }" gutter="base">
+    <ds-flex
+      v-if="Post && Post.length"
+      :width="{ base: '100%' }"
+      gutter="base"
+    >
       <hc-post-card
         v-for="(post, index) in uniq(Post)"
         :key="post.id"
@@ -20,8 +23,11 @@
         primary
       />
     </no-ssr>
-    <hc-load-more v-if="true"
-:loading="$apollo.loading" @click="showMoreContributions" />
+    <hc-load-more
+      v-if="true"
+      :loading="$apollo.loading"
+      @click="showMoreContributions"
+    />
   </div>
 </template>
 
diff --git a/webapp/pages/post/_id/_slug/more-info.vue b/webapp/pages/post/_id/_slug/more-info.vue
index be218dc85..aa7c250c8 100644
--- a/webapp/pages/post/_id/_slug/more-info.vue
+++ b/webapp/pages/post/_id/_slug/more-info.vue
@@ -1,8 +1,8 @@
 <template>
   <ds-card>
     <h2 style="margin-bottom: .2em;">
-Mehr Informationen
-</h2>
+      Mehr Informationen
+    </h2>
     <p>Hier findest du weitere infos zum Thema.</p>
     <ds-space />
     <h3>
@@ -25,8 +25,10 @@ Mehr Informationen
         <ds-icon name="tags" />Schlagwörter
       </h3>
       <div class="tags">
-        <ds-tag v-for="tag in post.tags"
-:key="tag.id">
+        <ds-tag
+          v-for="tag in post.tags"
+          :key="tag.id"
+        >
           <ds-icon name="tag" />
           {{ tag.name }}
         </ds-tag>
@@ -34,8 +36,10 @@ Mehr Informationen
     </template>
     <h3>Verwandte Beiträge</h3>
     <ds-section style="margin: 0 -1.5rem; padding: 1.5rem;">
-      <ds-flex v-if="post.relatedContributions && post.relatedContributions.length"
-gutter="small">
+      <ds-flex
+        v-if="post.relatedContributions && post.relatedContributions.length"
+        gutter="small"
+      >
         <hc-post-card
           v-for="(relatedPost, index) in post.relatedContributions"
           :key="relatedPost.id"
@@ -44,8 +48,12 @@ gutter="small">
           @deletePost="post.relatedContributions.splice(index, 1)"
         />
       </ds-flex>
-      <hc-empty v-else
-margin="large" icon="file" message="No related Posts" />
+      <hc-empty
+        v-else
+        margin="large"
+        icon="file"
+        message="No related Posts"
+      />
     </ds-section>
     <ds-space margin-bottom="large" />
   </ds-card>
diff --git a/webapp/pages/profile/_id/_slug.vue b/webapp/pages/profile/_id/_slug.vue
index b109dc65b..d99613ace 100644
--- a/webapp/pages/profile/_id/_slug.vue
+++ b/webapp/pages/profile/_id/_slug.vue
@@ -3,15 +3,27 @@
     <ds-card v-if="user && user.image">
       <p>PROFILE IMAGE</p>
     </ds-card>
-    <ds-space/>
-    <ds-flex v-if="user" :width="{ base: '100%' }" gutter="base">
+    <ds-space />
+    <ds-flex
+      v-if="user"
+      :width="{ base: '100%' }"
+      gutter="base"
+    >
       <ds-flex-item :width="{ base: '100%', sm: 2, md: 2, lg: 1 }">
         <ds-card
           :class="{'disabled-content': user.disabled}"
           style="position: relative; height: auto;"
         >
-          <hc-upload v-if="myProfile" :user="user"/>
-          <hc-avatar v-else :user="user" class="profile-avatar" size="x-large"/>
+          <hc-upload
+            v-if="myProfile"
+            :user="user"
+          />
+          <hc-avatar
+            v-else
+            :user="user"
+            class="profile-avatar"
+            size="x-large"
+          />
           <no-ssr>
             <content-menu
               placement="bottom-end"
@@ -23,32 +35,54 @@
             />
           </no-ssr>
           <ds-space margin="small">
-            <ds-heading tag="h3" align="center" no-margin>{{ userName }}</ds-heading>
-            <ds-text v-if="user.location" align="center" color="soft" size="small">
-              <ds-icon name="map-marker"/>
+            <ds-heading
+              tag="h3"
+              align="center"
+              no-margin
+            >
+              {{ userName }}
+            </ds-heading>
+            <ds-text
+              v-if="user.location"
+              align="center"
+              color="soft"
+              size="small"
+            >
+              <ds-icon name="map-marker" />
               {{ user.location.name }}
             </ds-text>
             <ds-text
               align="center"
               color="soft"
               size="small"
-            >{{ $t('profile.memberSince') }} {{ user.createdAt | date('MMMM yyyy') }}</ds-text>
+            >
+              {{ $t('profile.memberSince') }} {{ user.createdAt | date('MMMM yyyy') }}
+            </ds-text>
           </ds-space>
-          <ds-space v-if="user.badges && user.badges.length" margin="x-small">
-            <hc-badges :badges="user.badges"/>
+          <ds-space
+            v-if="user.badges && user.badges.length"
+            margin="x-small"
+          >
+            <hc-badges :badges="user.badges" />
           </ds-space>
           <ds-flex>
             <ds-flex-item>
               <no-ssr>
                 <ds-number :label="$t('profile.followers')">
-                  <hc-count-to slot="count" :end-val="followedByCount"/>
+                  <hc-count-to
+                    slot="count"
+                    :end-val="followedByCount"
+                  />
                 </ds-number>
               </no-ssr>
             </ds-flex-item>
             <ds-flex-item>
               <no-ssr>
                 <ds-number :label="$t('profile.following')">
-                  <hc-count-to slot="count" :end-val="Number(user.followingCount) || 0"/>
+                  <hc-count-to
+                    slot="count"
+                    :end-val="Number(user.followingCount) || 0"
+                  />
                 </ds-number>
               </no-ssr>
             </ds-flex-item>
@@ -64,69 +98,136 @@
           </ds-space>
           <template v-if="user.about">
             <hr>
-            <ds-space margin-top="small" margin-bottom="small">
-              <ds-text color="soft" size="small">{{ user.about }}</ds-text>
+            <ds-space
+              margin-top="small"
+              margin-bottom="small"
+            >
+              <ds-text
+                color="soft"
+                size="small"
+              >
+                {{ user.about }}
+              </ds-text>
             </ds-space>
           </template>
         </ds-card>
-        <ds-space/>
-        <ds-heading tag="h3" soft style="text-align: center; margin-bottom: 10px;">Netzwerk</ds-heading>
+        <ds-space />
+        <ds-heading
+          tag="h3"
+          soft
+          style="text-align: center; margin-bottom: 10px;"
+        >
+          Netzwerk
+        </ds-heading>
         <ds-card style="position: relative; height: auto;">
-          <ds-space v-if="user.following && user.following.length" margin="x-small">
-            <ds-text tag="h5" color="soft">Wem folgt {{ userName | truncate(15) }}?</ds-text>
+          <ds-space
+            v-if="user.following && user.following.length"
+            margin="x-small"
+          >
+            <ds-text
+              tag="h5"
+              color="soft"
+            >
+              Wem folgt {{ userName | truncate(15) }}?
+            </ds-text>
           </ds-space>
           <template v-if="user.following && user.following.length">
-            <ds-space v-for="follow in uniq(user.following)" :key="follow.id" margin="x-small">
+            <ds-space
+              v-for="follow in uniq(user.following)"
+              :key="follow.id"
+              margin="x-small"
+            >
               <!-- TODO: find better solution for rendering errors -->
               <no-ssr>
-                <user :user="follow" :trunc="15"/>
+                <user
+                  :user="follow"
+                  :trunc="15"
+                />
               </no-ssr>
             </ds-space>
-            <ds-space v-if="user.followingCount - user.following.length" margin="small">
+            <ds-space
+              v-if="user.followingCount - user.following.length"
+              margin="small"
+            >
               <ds-text
                 size="small"
                 color="softer"
-              >und {{ user.followingCount - user.following.length }} weitere</ds-text>
+              >
+                und {{ user.followingCount - user.following.length }} weitere
+              </ds-text>
             </ds-space>
           </template>
           <template v-else>
-            <p style="text-align: center; opacity: .5;">{{ userName }} folgt niemandem</p>
+            <p style="text-align: center; opacity: .5;">
+              {{ userName }} folgt niemandem
+            </p>
           </template>
         </ds-card>
-        <ds-space/>
+        <ds-space />
         <ds-card style="position: relative; height: auto;">
-          <ds-space v-if="user.followedBy && user.followedBy.length" margin="x-small">
-            <ds-text tag="h5" color="soft">Wer folgt {{ userName | truncate(15) }}?</ds-text>
+          <ds-space
+            v-if="user.followedBy && user.followedBy.length"
+            margin="x-small"
+          >
+            <ds-text
+              tag="h5"
+              color="soft"
+            >
+              Wer folgt {{ userName | truncate(15) }}?
+            </ds-text>
           </ds-space>
           <template v-if="user.followedBy && user.followedBy.length">
-            <ds-space v-for="follow in uniq(user.followedBy)" :key="follow.id" margin="x-small">
+            <ds-space
+              v-for="follow in uniq(user.followedBy)"
+              :key="follow.id"
+              margin="x-small"
+            >
               <!-- TODO: find better solution for rendering errors -->
               <no-ssr>
-                <user :user="follow" :trunc="15"/>
+                <user
+                  :user="follow"
+                  :trunc="15"
+                />
               </no-ssr>
             </ds-space>
-            <ds-space v-if="user.followedByCount - user.followedBy.length" margin="small">
+            <ds-space
+              v-if="user.followedByCount - user.followedBy.length"
+              margin="small"
+            >
               <ds-text
                 size="small"
                 color="softer"
-              >und {{ user.followedByCount - user.followedBy.length }} weitere</ds-text>
+              >
+                und {{ user.followedByCount - user.followedBy.length }} weitere
+              </ds-text>
             </ds-space>
           </template>
           <template v-else>
-            <p style="text-align: center; opacity: .5;">niemand folgt {{ userName }}</p>
+            <p style="text-align: center; opacity: .5;">
+              niemand folgt {{ userName }}
+            </p>
           </template>
         </ds-card>
-        <ds-space v-if="user.socialMedia && user.socialMedia.length" margin="large">
+        <ds-space
+          v-if="user.socialMedia && user.socialMedia.length"
+          margin="large"
+        >
           <ds-card style="position: relative; height: auto;">
             <ds-space margin="x-small">
               <ds-text
                 tag="h5"
                 color="soft"
-              >{{ $t('profile.socialMedia') }} {{ user.name | truncate(15) }}?</ds-text>
+              >
+                {{ $t('profile.socialMedia') }} {{ user.name | truncate(15) }}?
+              </ds-text>
               <template>
-                <ds-space v-for="link in socialMediaLinks" :key="link.username" margin="x-small">
+                <ds-space
+                  v-for="link in socialMediaLinks"
+                  :key="link.username"
+                  margin="x-small"
+                >
                   <a :href="link.url">
-                    <ds-avatar :image="link.favicon"/>
+                    <ds-avatar :image="link.favicon" />
                     {{ 'link.username' }}
                   </a>
                 </ds-space>
@@ -136,7 +237,10 @@
         </ds-space>
       </ds-flex-item>
       <ds-flex-item :width="{ base: '100%', sm: 3, md: 5, lg: 3 }">
-        <ds-flex :width="{ base: '100%' }" gutter="small">
+        <ds-flex
+          :width="{ base: '100%' }"
+          gutter="small"
+        >
           <ds-flex-item class="profile-top-navigation">
             <ds-card class="ds-tab-nav">
               <ds-flex>
@@ -145,7 +249,10 @@
                     <!-- TODO: find better solution for rendering errors -->
                     <no-ssr>
                       <ds-number :label="$t('common.post', null, user.contributionsCount)">
-                        <hc-count-to slot="count" :end-val="user.contributionsCount"/>
+                        <hc-count-to
+                          slot="count"
+                          :end-val="user.contributionsCount"
+                        />
                       </ds-number>
                     </no-ssr>
                   </ds-space>
@@ -197,11 +304,18 @@
           </template>
           <template v-else>
             <ds-flex-item :width="{ base: '100%' }">
-              <hc-empty margin="xx-large" icon="file"/>
+              <hc-empty
+                margin="xx-large"
+                icon="file"
+              />
             </ds-flex-item>
           </template>
         </ds-flex>
-        <hc-load-more v-if="hasMore" :loading="$apollo.loading" @click="showMoreContributions"/>
+        <hc-load-more
+          v-if="hasMore"
+          :loading="$apollo.loading"
+          @click="showMoreContributions"
+        />
       </ds-flex-item>
     </ds-flex>
   </div>

From d365f9368b4444581226d68d6e54f40b7b84406d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Mon, 3 Jun 2019 13:54:50 +0200
Subject: [PATCH 20/20] Lint Fixes

---
 webapp/components/Modal/DeleteModal.vue | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/webapp/components/Modal/DeleteModal.vue b/webapp/components/Modal/DeleteModal.vue
index 5ee626f89..63703b8c6 100644
--- a/webapp/components/Modal/DeleteModal.vue
+++ b/webapp/components/Modal/DeleteModal.vue
@@ -2,23 +2,19 @@
   <ds-modal :title="title" :is-open="isOpen" @cancel="cancel">
     <transition name="ds-transition-fade">
       <ds-flex v-if="success" class="hc-modal-success" centered>
-        <sweetalert-icon icon="success"/>
+        <sweetalert-icon icon="success" />
       </ds-flex>
     </transition>
 
     <!-- eslint-disable-next-line vue/no-v-html -->
-    <p v-html="message"/>
+    <p v-html="message" />
 
     <template slot="footer">
       <ds-button class="cancel" icon="close" @click="cancel">{{ $t('delete.cancel') }}</ds-button>
 
-      <ds-button
-        danger
-        class="confirm"
-        icon="trash"
-        :loading="loading"
-        @click="confirm"
-      >{{ $t('delete.submit') }}</ds-button>
+      <ds-button danger class="confirm" icon="trash" :loading="loading" @click="confirm">
+        {{ $t('delete.submit') }}
+      </ds-button>
     </template>
   </ds-modal>
 </template>