From f7ef09acbf9e6927c08ed1739d40ee0a5fdd991b Mon Sep 17 00:00:00 2001
From: ALau2088 <alau12004@yahoo.com>
Date: Sat, 18 May 2019 18:20:43 -0700
Subject: [PATCH 01/22] add UpdateComment mutation

---
 backend/src/resolvers/comments.js | 96 +++++++++++++++++++++++++++----
 1 file changed, 84 insertions(+), 12 deletions(-)

diff --git a/backend/src/resolvers/comments.js b/backend/src/resolvers/comments.js
index d4775b235..8023fb334 100644
--- a/backend/src/resolvers/comments.js
+++ b/backend/src/resolvers/comments.js
@@ -16,18 +16,22 @@ export default {
       delete params.postId
 
       if (!params.content || content.length < COMMENT_MIN_LENGTH) {
-        throw new UserInputError(`Comment must be at least ${COMMENT_MIN_LENGTH} character long!`)
+        throw new UserInputError(
+          `Comment must be at least ${COMMENT_MIN_LENGTH} character long!`
+        )
       }
       if (!postId.trim()) {
         throw new UserInputError(NO_POST_ERR_MESSAGE)
       }
 
       const session = context.driver.session()
-      const postQueryRes = await session.run(`
+      const postQueryRes = await session.run(
+        `
         MATCH (post:Post {id: $postId})
-        RETURN post`, {
-        postId
-      }
+        RETURN post`,
+        {
+          postId
+        }
       )
       const [post] = postQueryRes.records.map(record => {
         return record.get('post')
@@ -36,20 +40,88 @@ export default {
       if (!post) {
         throw new UserInputError(NO_POST_ERR_MESSAGE)
       }
-      const comment = await neo4jgraphql(object, params, context, resolveInfo, false)
+      const comment = await neo4jgraphql(
+        object,
+        params,
+        context,
+        resolveInfo,
+        false
+      )
 
-      await session.run(`
+      await session.run(
+        `
         MATCH (post:Post {id: $postId}), (comment:Comment {id: $commentId}), (author:User {id: $userId})
         MERGE (post)<-[:COMMENTS]-(comment)<-[:WROTE]-(author)
-        RETURN post`, {
-        userId: context.user.id,
-        postId,
-        commentId: comment.id
-      }
+        RETURN post`,
+        {
+          userId: context.user.id,
+          postId,
+          commentId: comment.id
+        }
       )
       session.close()
 
       return comment
+    },
+    UpdateComment: async (object, params, context, resolveInfo) => {
+      // Strip element tags and remove leading/trailing white spaces from content
+      const content = params.content.replace(/<(?:.|\n)*?>/gm, '').trim()
+      const { id } = params
+      console.log(id)
+      // Check length of content
+      if (!params.content || content.length < COMMENT_MIN_LENGTH) {
+        throw new UserInputError(
+          `Comment must be at least ${COMMENT_MIN_LENGTH} character long!`
+        )
+      }
+
+      // Check if comment exists
+      const session = context.driver.session()
+      const commentQueryRes = await session.run(
+        `
+        MATCH (comment: COMMENT) 
+        WHERE id(comment)=$id 
+        RETURN comment`,
+        {
+          id
+        }
+      )
+      console.log(id)
+      console.log(commentQueryRes)
+      // Destructure content from session results array
+      const [comment] = commentQueryRes.records.map(record => {
+        console.log(record.get('comment'))
+        return record.get('comment')
+      })
+
+      // Send error message if cannot find a matching comment.
+      // if (!comment) {
+      //   throw new UserInputError(NO_COMMENT_ERR_MESSAGE)
+      // }
+
+      // Update comment.
+      //   const commentRev = await neo4jgraphql(
+      //     object,
+      //     params,
+      //     context,
+      //     resolveInfo,
+      //     false
+      //   )
+
+      //   await session.run(
+      //     `
+      //     MATCH (comment:Comment)
+      //     WHERE id(comment)=$id,
+      //     SET comment.content = $content
+      //     `,
+      //     {
+      //      id,
+      //      content
+      //     }
+      //   )
+      session.close()
+
+      //   return commentRev
     }
   }
 }

From 7ddbab83e98e09cfac41e3ed18ea2fb5eb468faa Mon Sep 17 00:00:00 2001
From: ALau2088 <alau12004@yahoo.com>
Date: Sat, 18 May 2019 23:32:24 -0700
Subject: [PATCH 02/22] 552-update_comment

---
 backend/src/resolvers/comments.js | 54 +++++++++++++++----------------
 1 file changed, 26 insertions(+), 28 deletions(-)

diff --git a/backend/src/resolvers/comments.js b/backend/src/resolvers/comments.js
index 8023fb334..72d2f96fb 100644
--- a/backend/src/resolvers/comments.js
+++ b/backend/src/resolvers/comments.js
@@ -40,6 +40,7 @@ export default {
       if (!post) {
         throw new UserInputError(NO_POST_ERR_MESSAGE)
       }
+
       const comment = await neo4jgraphql(
         object,
         params,
@@ -67,7 +68,6 @@ export default {
       // Strip element tags and remove leading/trailing white spaces from content
       const content = params.content.replace(/<(?:.|\n)*?>/gm, '').trim()
       const { id } = params
-      console.log(id)
       // Check length of content
       if (!params.content || content.length < COMMENT_MIN_LENGTH) {
         throw new UserInputError(
@@ -79,49 +79,47 @@ export default {
       const session = context.driver.session()
       const commentQueryRes = await session.run(
         `
-        MATCH (comment: COMMENT) 
-        WHERE id(comment)=$id 
+        MATCH (comment: Comment { id:$id}) 
         RETURN comment`,
         {
           id
         }
       )
-      console.log(id)
-      console.log(commentQueryRes)
+
       // Destructure content from session results array
       const [comment] = commentQueryRes.records.map(record => {
-        console.log(record.get('comment'))
+        const a = record.get('comment')
+        console.log(a)
         return record.get('comment')
       })
 
       // Send error message if cannot find a matching comment.
-      // if (!comment) {
-      //   throw new UserInputError(NO_COMMENT_ERR_MESSAGE)
-      // }
+      if (!comment) {
+        throw new UserInputError(NO_COMMENT_ERR_MESSAGE)
+      }
 
       // Update comment.
-      //   const commentRev = await neo4jgraphql(
-      //     object,
-      //     params,
-      //     context,
-      //     resolveInfo,
-      //     false
-      //   )
+      const commentRev = await neo4jgraphql(
+        object,
+        params,
+        context,
+        resolveInfo,
+        false
+      )
 
-      //   await session.run(
-      //     `
-      //     MATCH (comment:Comment)
-      //     WHERE id(comment)=$id,
-      //     SET comment.content = $content
-      //     `,
-      //     {
-      //      id,
-      //      content
-      //     }
-      //   )
+      await session.run(
+        `
+        MATCH (comment: Comment { id:$id}) 
+        SET comment.content = 'bbb'
+        `,
+        {
+          id,
+          content
+        }
+      )
       session.close()
 
-      //   return commentRev
+      return commentRev
     }
   }
 }

From 3fe8e9a2886e3f5a1872b4e3612b2ad70aa639de Mon Sep 17 00:00:00 2001
From: ALau2088 <alau12004@yahoo.com>
Date: Sat, 18 May 2019 23:42:17 -0700
Subject: [PATCH 03/22] 552-update_comment

---
 backend/src/resolvers/comments.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/backend/src/resolvers/comments.js b/backend/src/resolvers/comments.js
index 72d2f96fb..6dea8e51b 100644
--- a/backend/src/resolvers/comments.js
+++ b/backend/src/resolvers/comments.js
@@ -88,8 +88,6 @@ export default {
 
       // Destructure content from session results array
       const [comment] = commentQueryRes.records.map(record => {
-        const a = record.get('comment')
-        console.log(a)
         return record.get('comment')
       })
 
@@ -110,7 +108,7 @@ export default {
       await session.run(
         `
         MATCH (comment: Comment { id:$id}) 
-        SET comment.content = 'bbb'
+        SET comment.content = $content
         `,
         {
           id,

From 8a8ed5131e010e75b156b8a80cefe1618dcd9072 Mon Sep 17 00:00:00 2001
From: ALau2088 <alau12004@yahoo.com>
Date: Fri, 24 May 2019 08:03:39 -0700
Subject: [PATCH 04/22] refactor backend and add UI

---
 backend/src/middleware/validation/index.js    |  21 ++-
 backend/src/resolvers/comments.js             |  59 ---------
 webapp/components/Comment.vue                 |  29 ++++-
 webapp/components/ContentMenu.vue             |   2 +-
 .../components/comments/CommentList/index.vue |  20 +--
 .../comments/EditCommentForm/index.vue        | 122 ++++++++++++++++++
 6 files changed, 170 insertions(+), 83 deletions(-)
 create mode 100644 webapp/components/comments/EditCommentForm/index.vue

diff --git a/backend/src/middleware/validation/index.js b/backend/src/middleware/validation/index.js
index de9be72e9..faf95beaf 100644
--- a/backend/src/middleware/validation/index.js
+++ b/backend/src/middleware/validation/index.js
@@ -22,10 +22,29 @@ const validateUrl = async (resolve, root, args, context, info) => {
   }
 }
 
+const validateComment = async (resolve, root, args, context, info) => {
+  const COMMENT_MIN_LENGTH = 1
+  const content = args.content.replace(/<(?:.|\n)*?>/gm, '').trim()
+  if (!args.content || content.length < COMMENT_MIN_LENGTH) {
+    throw new UserInputError(
+      `Comment must be at least ${COMMENT_MIN_LENGTH} character long!`
+    )
+  }
+  const NO_POST_ERR_MESSAGE = 'Comment cannot be created without a post!'
+  const { postId } = args
+  if (!postId) {
+    throw new UserInputError(NO_POST_ERR_MESSAGE)
+  }
+
+  return await resolve(root, args, context, info)
+}
+
 export default {
   Mutation: {
     CreateUser: validateUsername,
     UpdateUser: validateUsername,
-    CreateSocialMedia: validateUrl
+    CreateSocialMedia: validateUrl,
+    CreateComment: validateComment,
+    UpdateComment: validateComment
   }
 }
diff --git a/backend/src/resolvers/comments.js b/backend/src/resolvers/comments.js
index 6dea8e51b..f3cfea378 100644
--- a/backend/src/resolvers/comments.js
+++ b/backend/src/resolvers/comments.js
@@ -1,13 +1,9 @@
 import { neo4jgraphql } from 'neo4j-graphql-js'
 import { UserInputError } from 'apollo-server'
 
-const COMMENT_MIN_LENGTH = 1
-const NO_POST_ERR_MESSAGE = 'Comment cannot be created without a post!'
-
 export default {
   Mutation: {
     CreateComment: async (object, params, context, resolveInfo) => {
-      const content = params.content.replace(/<(?:.|\n)*?>/gm, '').trim()
       const { postId } = params
       // Adding relationship from comment to post by passing in the postId,
       // but we do not want to create the comment with postId as an attribute
@@ -15,15 +11,6 @@ export default {
       // before comment creation.
       delete params.postId
 
-      if (!params.content || content.length < COMMENT_MIN_LENGTH) {
-        throw new UserInputError(
-          `Comment must be at least ${COMMENT_MIN_LENGTH} character long!`
-        )
-      }
-      if (!postId.trim()) {
-        throw new UserInputError(NO_POST_ERR_MESSAGE)
-      }
-
       const session = context.driver.session()
       const postQueryRes = await session.run(
         `
@@ -65,38 +52,6 @@ export default {
       return comment
     },
     UpdateComment: async (object, params, context, resolveInfo) => {
-      // Strip element tags and remove leading/trailing white spaces from content
-      const content = params.content.replace(/<(?:.|\n)*?>/gm, '').trim()
-      const { id } = params
-      // Check length of content
-      if (!params.content || content.length < COMMENT_MIN_LENGTH) {
-        throw new UserInputError(
-          `Comment must be at least ${COMMENT_MIN_LENGTH} character long!`
-        )
-      }
-
-      // Check if comment exists
-      const session = context.driver.session()
-      const commentQueryRes = await session.run(
-        `
-        MATCH (comment: Comment { id:$id}) 
-        RETURN comment`,
-        {
-          id
-        }
-      )
-
-      // Destructure content from session results array
-      const [comment] = commentQueryRes.records.map(record => {
-        return record.get('comment')
-      })
-
-      // Send error message if cannot find a matching comment.
-      if (!comment) {
-        throw new UserInputError(NO_COMMENT_ERR_MESSAGE)
-      }
-
-      // Update comment.
       const commentRev = await neo4jgraphql(
         object,
         params,
@@ -104,20 +59,6 @@ export default {
         resolveInfo,
         false
       )
-
-      await session.run(
-        `
-        MATCH (comment: Comment { id:$id}) 
-        SET comment.content = $content
-        `,
-        {
-          id,
-          content
-        }
-      )
-      session.close()
-
-      return commentRev
     }
   }
 }
diff --git a/webapp/components/Comment.vue b/webapp/components/Comment.vue
index 13edc9c0d..906575880 100644
--- a/webapp/components/Comment.vue
+++ b/webapp/components/Comment.vue
@@ -22,15 +22,20 @@
         :resource="comment"
         style="float-right"
         :is-owner="isAuthor(author.id)"
+        v-on:showEditCommentMenu="editCommentMenu"
       />
     </no-ssr>
     <!-- eslint-disable vue/no-v-html -->
     <!-- TODO: replace editor content with tiptap render view -->
-    <ds-space margin-bottom="small" />
-    <div
-      style="padding-left: 40px;"
-      v-html="comment.contentExcerpt"
-    />
+    <ds-space margin-bottom="small"/>
+    <div v-if="openEditCommentMenu">
+      <hc-edit-comment-form
+        v-bind:comment="comment"
+        v-bind:post="post"
+        v-on:showEditCommentMenu="editCommentMenu"
+      />
+    </div>
+    <div v-else style="padding-left: 40px;" v-html="comment.contentExcerpt"/>
     <!-- eslint-enable vue/no-v-html -->
   </div>
 </template>
@@ -39,13 +44,22 @@
 import { mapGetters } from 'vuex'
 import HcUser from '~/components/User'
 import ContentMenu from '~/components/ContentMenu'
+import HcEditCommentForm from '~/components/comments/EditCommentForm'
+import gql from 'graphql-tag'
 
 export default {
   components: {
     HcUser,
-    ContentMenu
+    ContentMenu,
+    HcEditCommentForm
+  },
+  data() {
+    return {
+      openEditCommentMenu: false
+    }
   },
   props: {
+    post: { type: Object, default: () => {} },
     comment: {
       type: Object,
       default() {
@@ -69,6 +83,9 @@ export default {
   methods: {
     isAuthor(id) {
       return this.user.id === id
+    },
+    editCommentMenu(showMenu) {
+      this.openEditCommentMenu = showMenu
     }
   }
 }
diff --git a/webapp/components/ContentMenu.vue b/webapp/components/ContentMenu.vue
index 29473d6b2..5f4cd54e7 100644
--- a/webapp/components/ContentMenu.vue
+++ b/webapp/components/ContentMenu.vue
@@ -90,7 +90,7 @@ export default {
           name: this.$t(`comment.edit`),
           callback: () => {
             /* eslint-disable-next-line no-console */
-            console.log('EDIT COMMENT')
+            this.$emit('showEditCommentMenu', true)
           },
           icon: 'edit'
         })
diff --git a/webapp/components/comments/CommentList/index.vue b/webapp/components/comments/CommentList/index.vue
index 57b720087..5a682bba6 100644
--- a/webapp/components/comments/CommentList/index.vue
+++ b/webapp/components/comments/CommentList/index.vue
@@ -12,23 +12,11 @@
         >{{ comments.length }}</ds-tag>&nbsp; Comments
       </span>
     </h3>
-    <ds-space margin-bottom="large" />
-    <div
-      v-if="comments && comments.length"
-      id="comments"
-      class="comments"
-    >
-      <comment
-        v-for="comment in comments"
-        :key="comment.id"
-        :comment="comment"
-      />
+    <ds-space margin-bottom="large"/>
+    <div v-if="comments && comments.length" id="comments" class="comments">
+      <comment v-for="comment in comments" :key="comment.id" :comment="comment" :post="post"/>
     </div>
-    <hc-empty
-      v-else
-      name="empty"
-      icon="messages"
-    />
+    <hc-empty v-else name="empty" icon="messages"/>
   </div>
 </template>
 <script>
diff --git a/webapp/components/comments/EditCommentForm/index.vue b/webapp/components/comments/EditCommentForm/index.vue
new file mode 100644
index 000000000..216e47604
--- /dev/null
+++ b/webapp/components/comments/EditCommentForm/index.vue
@@ -0,0 +1,122 @@
+<template>
+  <ds-form v-model="form" @submit="handleSubmit">
+    <template slot-scope="{ errors }">
+      <ds-card>
+        <!-- <no-ssr> -->
+        <hc-editor ref="editor" :users="users" :value="form.content" @input="updateEditorContent"/>
+        <!-- </no-ssr> -->
+        <ds-space/>
+        <ds-flex :gutter="{ base: 'small', md: 'small', sm: 'x-large', xs: 'x-large' }">
+          <ds-flex-item :width="{ base: '0%', md: '50%', sm: '0%', xs: '0%' }"/>
+          <ds-flex-item :width="{ base: '40%', md: '20%', sm: '30%', xs: '30%' }">
+            <ds-button
+              :disabled="disabled"
+              ghost
+              class="cancelBtn"
+              @click.prevent="closeEditWindow"
+            >{{ $t('actions.cancel') }}</ds-button>
+          </ds-flex-item>
+          <ds-flex-item :width="{ base: '40%', md: '20%', sm: '40%', xs: '40%' }">
+            <ds-button
+              type="submit"
+              :loading="loading"
+              :disabled="disabled || errors"
+              primary
+            >{{ $t('post.comment.submit') }}</ds-button>
+          </ds-flex-item>
+        </ds-flex>
+      </ds-card>
+    </template>
+  </ds-form>
+</template>
+
+<script>
+import gql from 'graphql-tag'
+import HcEditor from '~/components/Editor'
+
+export default {
+  components: {
+    HcEditor
+  },
+  props: {
+    post: { type: Object, default: () => {} },
+    comments: { type: Array, default: () => [] },
+    comment: {
+      type: Object,
+      default() {
+        return {}
+      }
+    }
+  },
+  data() {
+    return {
+      disabled: false,
+      loading: false,
+      form: {
+        content: this.comment.contentExcerpt
+      },
+      users: []
+    }
+  },
+  methods: {
+    updateEditorContent(value) {
+      const content = value.replace(/<(?:.|\n)*?>/gm, '').trim()
+      if (content.length < 1) {
+        this.disabled = true
+      } else {
+        this.disabled = false
+      }
+      this.form.content = value
+    },
+    closeEditWindow() {
+      this.$emit('showEditCommentMenu', false)
+    },
+    handleSubmit() {
+      this.loading = true
+      this.disabled = true
+      this.$apollo
+        .mutate({
+          mutation: gql`
+            mutation($postId: ID, $content: String!, $id: ID!) {
+              UpdateComment(postId: $postId, content: $content, id: $id) {
+                id
+                content
+              }
+            }
+          `,
+          variables: {
+            postId: this.post.id,
+            content: this.form.content,
+            id: this.comment.id
+          }
+        })
+        .then(res => {
+          this.loading = false
+          this.$root.$emit('refetchPostComments')
+          this.$toast.success(this.$t('post.comment.submitted'))
+          this.disabled = false
+          this.$emit('showEditCommentMenu', false)
+        })
+        //@Todo close edit comment window
+        .catch(err => {
+          this.$toast.error(err.message)
+        })
+    }
+  },
+  apollo: {
+    User: {
+      query() {
+        return gql(`{
+          User(orderBy: slug_asc) {
+            id
+            slug
+          }
+        }`)
+      },
+      result(result) {
+        this.users = result.data.User
+      }
+    }
+  }
+}
+</script>

From 8c7009097a274c04fa22631429b1c7f57c90cad4 Mon Sep 17 00:00:00 2001
From: ALau2088 <alau12004@yahoo.com>
Date: Fri, 24 May 2019 08:22:56 -0700
Subject: [PATCH 05/22] 552-update_comment

---
 webapp/components/comments/EditCommentForm/index.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/webapp/components/comments/EditCommentForm/index.vue b/webapp/components/comments/EditCommentForm/index.vue
index 216e47604..562b80b48 100644
--- a/webapp/components/comments/EditCommentForm/index.vue
+++ b/webapp/components/comments/EditCommentForm/index.vue
@@ -97,7 +97,6 @@ export default {
           this.disabled = false
           this.$emit('showEditCommentMenu', false)
         })
-        //@Todo close edit comment window
         .catch(err => {
           this.$toast.error(err.message)
         })

From a5f6390f97a2b9e9ec614bc43e4b023b9540e35e Mon Sep 17 00:00:00 2001
From: ALau2088 <alau12004@yahoo.com>
Date: Thu, 30 May 2019 15:47:55 -0700
Subject: [PATCH 06/22] 552-update_comment

---
 backend/src/middleware/validation/index.js |  7 ++++---
 backend/src/resolvers/comments.js          | 10 +++-------
 webapp/package.json                        |  2 +-
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/backend/src/middleware/validation/index.js b/backend/src/middleware/validation/index.js
index faf95beaf..a7238ab03 100644
--- a/backend/src/middleware/validation/index.js
+++ b/backend/src/middleware/validation/index.js
@@ -7,7 +7,9 @@ const validateUsername = async (resolve, root, args, context, info) => {
     /* eslint-disable-next-line no-return-await */
     return await resolve(root, args, context, info)
   } else {
-    throw new UserInputError(`Username must be at least ${USERNAME_MIN_LENGTH} characters long!`)
+    throw new UserInputError(
+      `Username must be at least ${USERNAME_MIN_LENGTH} characters long!`
+    )
   }
 }
 
@@ -35,8 +37,7 @@ const validateComment = async (resolve, root, args, context, info) => {
   if (!postId) {
     throw new UserInputError(NO_POST_ERR_MESSAGE)
   }
-
-  return await resolve(root, args, context, info)
+  return resolve(root, args, context, info)
 }
 
 export default {
diff --git a/backend/src/resolvers/comments.js b/backend/src/resolvers/comments.js
index f3cfea378..2515ba36a 100644
--- a/backend/src/resolvers/comments.js
+++ b/backend/src/resolvers/comments.js
@@ -1,6 +1,8 @@
 import { neo4jgraphql } from 'neo4j-graphql-js'
 import { UserInputError } from 'apollo-server'
 
+const NO_POST_ERR_MESSAGE = 'Comment cannot be created without a post!'
+
 export default {
   Mutation: {
     CreateComment: async (object, params, context, resolveInfo) => {
@@ -52,13 +54,7 @@ export default {
       return comment
     },
     UpdateComment: async (object, params, context, resolveInfo) => {
-      const commentRev = await neo4jgraphql(
-        object,
-        params,
-        context,
-        resolveInfo,
-        false
-      )
+      await neo4jgraphql(object, params, context, resolveInfo, false)
     }
   }
 }
diff --git a/webapp/package.json b/webapp/package.json
index a3e8b44b9..62007112d 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -104,4 +104,4 @@
     "vue-jest": "~3.0.4",
     "vue-svg-loader": "~0.12.0"
   }
-}
\ No newline at end of file
+}

From 788979eedfd82cda726ba2d69b821c43c98fd6bf Mon Sep 17 00:00:00 2001
From: ALau2088 <alau12004@yahoo.com>
Date: Wed, 5 Jun 2019 18:12:22 -0700
Subject: [PATCH 07/22] add update comment jest test

---
 backend/src/middleware/validation/index.js |  3 ++-
 backend/src/resolvers/comments.spec.js     | 20 ++++++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/backend/src/middleware/validation/index.js b/backend/src/middleware/validation/index.js
index a7238ab03..2da25a605 100644
--- a/backend/src/middleware/validation/index.js
+++ b/backend/src/middleware/validation/index.js
@@ -37,7 +37,8 @@ const validateComment = async (resolve, root, args, context, info) => {
   if (!postId) {
     throw new UserInputError(NO_POST_ERR_MESSAGE)
   }
-  return resolve(root, args, context, info)
+  /* eslint-disable-next-line no-return-await */
+  return await resolve(root, args, context, info)
 }
 
 export default {
diff --git a/backend/src/resolvers/comments.spec.js b/backend/src/resolvers/comments.spec.js
index 87a0df270..952850759 100644
--- a/backend/src/resolvers/comments.spec.js
+++ b/backend/src/resolvers/comments.spec.js
@@ -175,4 +175,24 @@ describe('CreateComment', () => {
       expect(Comment).toEqual([{ postId: null }])
     })
   })
+
+describe('UpdateComment', () => {
+  const updateCommentMutation = `
+  mutation($postId: ID, $content: String!, $id: ID!) {
+    UpdateComment(postId: $postId, content: $content, id: $id) {
+      id
+      content
+    }
+  }
+  `
+  updateCommentVariables = {
+    postId: 'p1',
+    content: 'Comment is updated',
+    id: 'c8'
+  }
+
+  it('updates a comment', async () = {
+
+  })
+})
 })

From 8d4ed065c7c5984e9a764ac4ac976cf2c7030751 Mon Sep 17 00:00:00 2001
From: ALau2088 <alau12004@yahoo.com>
Date: Wed, 5 Jun 2019 18:42:17 -0700
Subject: [PATCH 08/22] add post.comment.updated

---
 webapp/components/comments/EditCommentForm/index.vue | 2 +-
 webapp/locales/en.json                               | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/webapp/components/comments/EditCommentForm/index.vue b/webapp/components/comments/EditCommentForm/index.vue
index 562b80b48..5a28062a9 100644
--- a/webapp/components/comments/EditCommentForm/index.vue
+++ b/webapp/components/comments/EditCommentForm/index.vue
@@ -93,7 +93,7 @@ export default {
         .then(res => {
           this.loading = false
           this.$root.$emit('refetchPostComments')
-          this.$toast.success(this.$t('post.comment.submitted'))
+          this.$toast.success(this.$t('post.comment.updated'))
           this.disabled = false
           this.$emit('showEditCommentMenu', false)
         })
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index 186b31d41..975917c78 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -145,7 +145,8 @@
     },
     "comment": {
       "submit": "Comment",
-      "submitted": "Comment Submitted"
+      "submitted": "Comment Submitted",
+      "updated": "Comment Updated"
     }
   },
   "quotes": {

From 0401e3b92947ae8319f4b6238e2da0de0edd9359 Mon Sep 17 00:00:00 2001
From: ALau2088 <alau12004@yahoo.com>
Date: Thu, 6 Jun 2019 15:58:32 -0700
Subject: [PATCH 09/22] add update comment to comments.spec

---
 backend/src/resolvers/comments.spec.js | 59 ++++++++++++++++----------
 1 file changed, 36 insertions(+), 23 deletions(-)

diff --git a/backend/src/resolvers/comments.spec.js b/backend/src/resolvers/comments.spec.js
index 952850759..7784a889f 100644
--- a/backend/src/resolvers/comments.spec.js
+++ b/backend/src/resolvers/comments.spec.js
@@ -20,7 +20,7 @@ afterEach(async () => {
   await factory.cleanDatabase()
 })
 
-describe('CreateComment', () => {
+describe('Comment Functionality', () => {
   const createCommentMutation = `
   mutation($postId: ID, $content: String!) {
     CreateComment(postId: $postId, content: $content) {
@@ -78,7 +78,37 @@ describe('CreateComment', () => {
         }
       }
 
-      await expect(client.request(createCommentMutation, createCommentVariables)).resolves.toMatchObject(expected)
+      await expect(
+        client.request(createCommentMutation, createCommentVariables)
+      ).resolves.toMatchObject(expected)
+    })
+
+    it('updates a comment', async () => {
+      await client.request(createCommentMutation, createCommentVariables)
+
+      const updateCommentMutation = `
+      mutation($postId: ID, $content: String!, $id: ID!) {
+        UpdateComment(postId: $postId, content: $content, id: $id) {
+          id
+          content
+        }
+      }
+      `
+      let updateCommentVariables = {
+        postId: 'p1',
+        content: 'Comment is updated',
+        id: 'c8'
+      }
+
+      const expected = {
+        UpdateComment: {
+          content: 'Comment is updated'
+        }
+      }
+
+      await expect(
+        client.request(updateCommentMutation, updateCommentVariables)
+      ).resolves.toMatchObject(expected)
     })
 
     it('assigns the authenticated user as author', async () => {
@@ -171,28 +201,11 @@ describe('CreateComment', () => {
       }
 
       await client.request(createCommentMutation, createCommentVariables)
-      const { Comment } = await client.request(commentQueryForPostId, commentQueryVariablesByContent)
+      const { Comment } = await client.request(
+        commentQueryForPostId,
+        commentQueryVariablesByContent
+      )
       expect(Comment).toEqual([{ postId: null }])
     })
   })
-
-describe('UpdateComment', () => {
-  const updateCommentMutation = `
-  mutation($postId: ID, $content: String!, $id: ID!) {
-    UpdateComment(postId: $postId, content: $content, id: $id) {
-      id
-      content
-    }
-  }
-  `
-  updateCommentVariables = {
-    postId: 'p1',
-    content: 'Comment is updated',
-    id: 'c8'
-  }
-
-  it('updates a comment', async () = {
-
-  })
-})
 })

From ae9d508ada81ded368cd6adf6463b30d0ea8d410 Mon Sep 17 00:00:00 2001
From: ALau2088 <alau12004@yahoo.com>
Date: Sat, 8 Jun 2019 15:59:15 -0700
Subject: [PATCH 10/22] Revise "updated":"Changes Saved"

---
 webapp/locales/en.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index 50a7b497d..521f681c0 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -154,7 +154,7 @@
     "comment": {
       "submit": "Comment",
       "submitted": "Comment Submitted",
-      "updated": "Comment Updated"
+      "updated": "Changes Saved"
     }
   },
   "comment": {

From 3cc05c0916f66fc7290fe63c62f527e5b7db6752 Mon Sep 17 00:00:00 2001
From: ALau2088 <alau12004@yahoo.com>
Date: Thu, 13 Jun 2019 13:00:20 -0700
Subject: [PATCH 11/22] add backend managecomments tests

---
 .../src/middleware/permissionsMiddleware.js   |   1 +
 backend/src/middleware/validation/index.js    |  10 +-
 backend/src/schema/resolvers/comments.js      |   9 +
 backend/src/schema/resolvers/comments.spec.js | 199 ++++++++++++------
 4 files changed, 147 insertions(+), 72 deletions(-)

diff --git a/backend/src/middleware/permissionsMiddleware.js b/backend/src/middleware/permissionsMiddleware.js
index bc9b4c525..83f5cd29b 100644
--- a/backend/src/middleware/permissionsMiddleware.js
+++ b/backend/src/middleware/permissionsMiddleware.js
@@ -113,6 +113,7 @@ const permissions = shield({
     enable: isModerator,
     disable: isModerator,
     CreateComment: isAuthenticated,
+    UpdateComment: isAuthor,
     DeleteComment: isAuthor,
     // CreateUser: allow,
   },
diff --git a/backend/src/middleware/validation/index.js b/backend/src/middleware/validation/index.js
index ec69b9a3a..e296bb866 100644
--- a/backend/src/middleware/validation/index.js
+++ b/backend/src/middleware/validation/index.js
@@ -22,17 +22,12 @@ const validateUrl = async (resolve, root, args, context, info) => {
   }
 }
 
-const validateComment = async (resolve, root, args, context, info) => {
+const validateUpdateComment = async (resolve, root, args, context, info) => {
   const COMMENT_MIN_LENGTH = 1
   const content = args.content.replace(/<(?:.|\n)*?>/gm, '').trim()
   if (!args.content || content.length < COMMENT_MIN_LENGTH) {
     throw new UserInputError(`Comment must be at least ${COMMENT_MIN_LENGTH} character long!`)
   }
-  const NO_POST_ERR_MESSAGE = 'Comment cannot be created without a post!'
-  const { postId } = args
-  if (!postId) {
-    throw new UserInputError(NO_POST_ERR_MESSAGE)
-  }
   /* eslint-disable-next-line no-return-await */
   return await resolve(root, args, context, info)
 }
@@ -42,7 +37,6 @@ export default {
     CreateUser: validateUsername,
     UpdateUser: validateUsername,
     CreateSocialMedia: validateUrl,
-    CreateComment: validateComment,
-    UpdateComment: validateComment,
+    UpdateComment: validateUpdateComment,
   },
 }
diff --git a/backend/src/schema/resolvers/comments.js b/backend/src/schema/resolvers/comments.js
index f28ef2792..8bca3bb98 100644
--- a/backend/src/schema/resolvers/comments.js
+++ b/backend/src/schema/resolvers/comments.js
@@ -1,11 +1,13 @@
 import { neo4jgraphql } from 'neo4j-graphql-js'
 import { UserInputError } from 'apollo-server'
 
+const COMMENT_MIN_LENGTH = 1
 const NO_POST_ERR_MESSAGE = 'Comment cannot be created without a post!'
 
 export default {
   Mutation: {
     CreateComment: async (object, params, context, resolveInfo) => {
+      const content = params.content.replace(/<(?:.|\n)*?>/gm, '').trim()
       const { postId } = params
       // Adding relationship from comment to post by passing in the postId,
       // but we do not want to create the comment with postId as an attribute
@@ -13,6 +15,13 @@ export default {
       // before comment creation.
       delete params.postId
 
+      if (!params.content || content.length < COMMENT_MIN_LENGTH) {
+        throw new UserInputError(`Comment must be at least ${COMMENT_MIN_LENGTH} character long!`)
+      }
+      if (!postId.trim()) {
+        throw new UserInputError(NO_POST_ERR_MESSAGE)
+      }
+
       const session = context.driver.session()
       const postQueryRes = await session.run(
         `
diff --git a/backend/src/schema/resolvers/comments.spec.js b/backend/src/schema/resolvers/comments.spec.js
index 55b946bb9..00d139a62 100644
--- a/backend/src/schema/resolvers/comments.spec.js
+++ b/backend/src/schema/resolvers/comments.spec.js
@@ -9,9 +9,10 @@ let createCommentVariables
 let createPostVariables
 let createCommentVariablesSansPostId
 let createCommentVariablesWithNonExistentPost
+let asAuthor
 
 beforeEach(async () => {
-  await factory.create('User', {
+  asAuthor = await factory.create('User', {
     email: 'test@example.org',
     password: '1234',
   })
@@ -211,22 +212,9 @@ describe('CreateComment', () => {
   })
 })
 
-describe('DeleteComment', () => {
-  const deleteCommentMutation = gql`
-    mutation($id: ID!) {
-      DeleteComment(id: $id) {
-        id
-      }
-    }
-  `
-
-  let deleteCommentVariables = {
-    id: 'c1',
-  }
-
+describe('ManageComments', () => {
   beforeEach(async () => {
-    const asAuthor = Factory()
-    await asAuthor.create('User', {
+    asAuthor = await factory.create('User', {
       email: 'author@example.org',
       password: '1234',
     })
@@ -245,55 +233,138 @@ describe('DeleteComment', () => {
     })
   })
 
-  describe('unauthenticated', () => {
-    it('throws authorization error', async () => {
-      client = new GraphQLClient(host)
-      await expect(client.request(deleteCommentMutation, deleteCommentVariables)).rejects.toThrow(
-        'Not Authorised',
-      )
-    })
-  })
-
-  describe('authenticated but not the author', () => {
-    beforeEach(async () => {
-      let headers
-      headers = await login({
-        email: 'test@example.org',
-        password: '1234',
-      })
-      client = new GraphQLClient(host, {
-        headers,
-      })
-    })
-
-    it('throws authorization error', async () => {
-      await expect(client.request(deleteCommentMutation, deleteCommentVariables)).rejects.toThrow(
-        'Not Authorised',
-      )
-    })
-  })
-
-  describe('authenticated as author', () => {
-    beforeEach(async () => {
-      let headers
-      headers = await login({
-        email: 'author@example.org',
-        password: '1234',
-      })
-      client = new GraphQLClient(host, {
-        headers,
-      })
-    })
-
-    it('deletes the comment', async () => {
-      const expected = {
-        DeleteComment: {
-          id: 'c1',
-        },
+  describe('UpdateComment', () => {
+    const updateCommentMutation = gql`
+      mutation($content: String!, $id: ID!) {
+        UpdateComment(content: $content, id: $id) {
+          id
+          content
+        }
       }
-      await expect(client.request(deleteCommentMutation, deleteCommentVariables)).resolves.toEqual(
-        expected,
-      )
+    `
+
+    let updateCommentVariables = {
+      id: 'c1',
+      content: 'The comment is updated',
+    }
+
+    describe('unauthenticated', () => {
+      it('throws authorization error', async () => {
+        client = new GraphQLClient(host)
+        await expect(client.request(updateCommentMutation, updateCommentVariables)).rejects.toThrow(
+          'Not Authorised',
+        )
+      })
+    })
+
+    describe('authenticated but not the author', () => {
+      beforeEach(async () => {
+        let headers
+        headers = await login({
+          email: 'test@example.org',
+          password: '1234',
+        })
+        client = new GraphQLClient(host, {
+          headers,
+        })
+      })
+
+      it('throws authorization error', async () => {
+        await expect(client.request(updateCommentMutation, updateCommentVariables)).rejects.toThrow(
+          'Not Authorised',
+        )
+      })
+    })
+
+    describe('authenticated as author', () => {
+      beforeEach(async () => {
+        let headers
+        headers = await login({
+          email: 'author@example.org',
+          password: '1234',
+        })
+        client = new GraphQLClient(host, {
+          headers,
+        })
+      })
+
+      it('updates the comment', async () => {
+        const expected = {
+          UpdateComment: {
+            id: 'c1',
+            content: 'The comment is updated',
+          },
+        }
+        await expect(
+          client.request(updateCommentMutation, updateCommentVariables),
+        ).resolves.toEqual(expected)
+      })
+    })
+  })
+
+  describe('DeleteComment', () => {
+    const deleteCommentMutation = gql`
+      mutation($id: ID!) {
+        DeleteComment(id: $id) {
+          id
+        }
+      }
+    `
+
+    let deleteCommentVariables = {
+      id: 'c1',
+    }
+
+    describe('unauthenticated', () => {
+      it('throws authorization error', async () => {
+        client = new GraphQLClient(host)
+        await expect(client.request(deleteCommentMutation, deleteCommentVariables)).rejects.toThrow(
+          'Not Authorised',
+        )
+      })
+    })
+
+    describe('authenticated but not the author', () => {
+      beforeEach(async () => {
+        let headers
+        headers = await login({
+          email: 'test@example.org',
+          password: '1234',
+        })
+        client = new GraphQLClient(host, {
+          headers,
+        })
+      })
+
+      it('throws authorization error', async () => {
+        await expect(client.request(deleteCommentMutation, deleteCommentVariables)).rejects.toThrow(
+          'Not Authorised',
+        )
+      })
+    })
+
+    describe('authenticated as author', () => {
+      beforeEach(async () => {
+        let headers
+        headers = await login({
+          email: 'author@example.org',
+          password: '1234',
+        })
+        client = new GraphQLClient(host, {
+          headers,
+        })
+      })
+
+      it('deletes the comment', async () => {
+        const expected = {
+          DeleteComment: {
+            id: 'c1',
+          },
+        }
+        await expect(
+          client.request(deleteCommentMutation, deleteCommentVariables),
+        ).resolves.toEqual(expected)
+      })
     })
   })
 })

From 912b94d43c829622fb637fa0318d0675fd992fb8 Mon Sep 17 00:00:00 2001
From: ALau2088 <alau12004@yahoo.com>
Date: Thu, 27 Jun 2019 10:59:53 -0700
Subject: [PATCH 12/22] add EditCommentForm spec.js

---
 backend/src/schema/resolvers/comments.js      |  3 --
 webapp/components/Comment.vue                 |  8 +--
 webapp/components/ContentMenu.vue             |  4 +-
 .../components/comments/CommentList/index.vue | 11 ++--
 .../comments/EditCommentForm/index.vue        | 50 +++++++++----------
 5 files changed, 36 insertions(+), 40 deletions(-)

diff --git a/backend/src/schema/resolvers/comments.js b/backend/src/schema/resolvers/comments.js
index be257d912..d2e296596 100644
--- a/backend/src/schema/resolvers/comments.js
+++ b/backend/src/schema/resolvers/comments.js
@@ -74,9 +74,6 @@ export default {
       session.close()
       return commentReturnedWithAuthor
     },
-    UpdateComment: async (object, params, context, resolveInfo) => {
-      await neo4jgraphql(object, params, context, resolveInfo, false)
-    },
     DeleteComment: async (object, params, context, resolveInfo) => {
       const comment = await neo4jgraphql(object, params, context, resolveInfo, false)
 
diff --git a/webapp/components/Comment.vue b/webapp/components/Comment.vue
index a119328f1..a134787ff 100644
--- a/webapp/components/Comment.vue
+++ b/webapp/components/Comment.vue
@@ -1,13 +1,13 @@
 <template>
   <div v-if="(comment.deleted || comment.disabled) && !isModerator">
     <ds-text style="padding-left: 40px; font-weight: bold;" color="soft">
-      <ds-icon name="ban"/>
+      <ds-icon name="ban" />
       {{ this.$t('comment.content.unavailable-placeholder') }}
     </ds-text>
   </div>
   <div v-else :class="{ comment: true, 'disabled-content': comment.deleted || comment.disabled }">
     <ds-space margin-bottom="x-small">
-      <hc-user :user="author" :date-time="comment.createdAt"/>
+      <hc-user :user="author" :date-time="comment.createdAt" />
     </ds-space>
     <!-- Content Menu (can open Modals) -->
     <no-ssr>
@@ -23,7 +23,7 @@
     </no-ssr>
     <!-- eslint-disable vue/no-v-html -->
     <!-- TODO: replace editor content with tiptap render view -->
-    <ds-space margin-bottom="small"/>
+    <ds-space margin-bottom="small" />
     <div v-if="openEditCommentMenu">
       <hc-edit-comment-form
         v-bind:comment="comment"
@@ -31,7 +31,7 @@
         v-on:showEditCommentMenu="editCommentMenu"
       />
     </div>
-    <div v-else style="padding-left: 40px;" v-html="comment.contentExcerpt"/>
+    <div v-else style="padding-left: 40px;" v-html="comment.contentExcerpt" />
     <!-- eslint-enable vue/no-v-html -->
   </div>
 </template>
diff --git a/webapp/components/ContentMenu.vue b/webapp/components/ContentMenu.vue
index 8f5fe1eff..cb164678a 100644
--- a/webapp/components/ContentMenu.vue
+++ b/webapp/components/ContentMenu.vue
@@ -3,7 +3,7 @@
     <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-icon name="ellipsis-v" />
         </ds-button>
       </slot>
     </template>
@@ -16,7 +16,7 @@
           :parents="item.parents"
           @click.stop.prevent="openItem(item.route, toggleMenu)"
         >
-          <ds-icon :name="item.route.icon"/>
+          <ds-icon :name="item.route.icon" />
           {{ item.route.name }}
         </ds-menu-item>
       </ds-menu>
diff --git a/webapp/components/comments/CommentList/index.vue b/webapp/components/comments/CommentList/index.vue
index 8f1cbc3d0..d1c91fef0 100644
--- a/webapp/components/comments/CommentList/index.vue
+++ b/webapp/components/comments/CommentList/index.vue
@@ -2,17 +2,20 @@
   <div id="comments">
     <h3 style="margin-top: -10px;">
       <span>
-        <ds-icon name="comments"/>
+        <ds-icon name="comments" />
         <ds-tag
           v-if="comments"
           style="margin-top: -4px; margin-left: -12px; position: absolute;"
           color="primary"
           size="small"
           round
-        >{{ comments.length }}</ds-tag>&nbsp; Comments
+        >
+          {{ comments.length }}
+        </ds-tag>
+        &nbsp; Comments
       </span>
     </h3>
-    <ds-space margin-bottom="large"/>
+    <ds-space margin-bottom="large" />
     <div v-if="comments && comments.length" id="comments" class="comments">
       <comment
         v-for="(comment, index) in comments"
@@ -22,7 +25,7 @@
         @deleteComment="comments.splice(index, 1)"
       />
     </div>
-    <hc-empty v-else name="empty" icon="messages"/>
+    <hc-empty v-else name="empty" icon="messages" />
   </div>
 </template>
 <script>
diff --git a/webapp/components/comments/EditCommentForm/index.vue b/webapp/components/comments/EditCommentForm/index.vue
index 5a28062a9..dca6f3264 100644
--- a/webapp/components/comments/EditCommentForm/index.vue
+++ b/webapp/components/comments/EditCommentForm/index.vue
@@ -3,26 +3,25 @@
     <template slot-scope="{ errors }">
       <ds-card>
         <!-- <no-ssr> -->
-        <hc-editor ref="editor" :users="users" :value="form.content" @input="updateEditorContent"/>
+        <hc-editor ref="editor" :users="users" :value="form.content" @input="updateEditorContent" />
         <!-- </no-ssr> -->
-        <ds-space/>
+        <ds-space />
         <ds-flex :gutter="{ base: 'small', md: 'small', sm: 'x-large', xs: 'x-large' }">
-          <ds-flex-item :width="{ base: '0%', md: '50%', sm: '0%', xs: '0%' }"/>
+          <ds-flex-item :width="{ base: '0%', md: '50%', sm: '0%', xs: '0%' }" />
           <ds-flex-item :width="{ base: '40%', md: '20%', sm: '30%', xs: '30%' }">
             <ds-button
               :disabled="disabled"
               ghost
               class="cancelBtn"
               @click.prevent="closeEditWindow"
-            >{{ $t('actions.cancel') }}</ds-button>
+            >
+              {{ $t('actions.cancel') }}
+            </ds-button>
           </ds-flex-item>
           <ds-flex-item :width="{ base: '40%', md: '20%', sm: '40%', xs: '40%' }">
-            <ds-button
-              type="submit"
-              :loading="loading"
-              :disabled="disabled || errors"
-              primary
-            >{{ $t('post.comment.submit') }}</ds-button>
+            <ds-button type="submit" :loading="loading" :disabled="disabled || errors" primary>
+              {{ $t('post.comment.submit') }}
+            </ds-button>
           </ds-flex-item>
         </ds-flex>
       </ds-card>
@@ -36,26 +35,24 @@ import HcEditor from '~/components/Editor'
 
 export default {
   components: {
-    HcEditor
+    HcEditor,
   },
   props: {
-    post: { type: Object, default: () => {} },
-    comments: { type: Array, default: () => [] },
     comment: {
       type: Object,
       default() {
         return {}
-      }
-    }
+      },
+    },
   },
   data() {
     return {
       disabled: false,
       loading: false,
       form: {
-        content: this.comment.contentExcerpt
+        content: this.comment.contentExcerpt,
       },
-      users: []
+      users: [],
     }
   },
   methods: {
@@ -77,22 +74,21 @@ export default {
       this.$apollo
         .mutate({
           mutation: gql`
-            mutation($postId: ID, $content: String!, $id: ID!) {
-              UpdateComment(postId: $postId, content: $content, id: $id) {
+            mutation($content: String!, $id: ID!) {
+              UpdateComment(content: $content, id: $id) {
                 id
                 content
               }
             }
           `,
           variables: {
-            postId: this.post.id,
             content: this.form.content,
-            id: this.comment.id
-          }
+            id: this.comment.id,
+          },
         })
         .then(res => {
           this.loading = false
-          this.$root.$emit('refetchPostComments')
+
           this.$toast.success(this.$t('post.comment.updated'))
           this.disabled = false
           this.$emit('showEditCommentMenu', false)
@@ -100,7 +96,7 @@ export default {
         .catch(err => {
           this.$toast.error(err.message)
         })
-    }
+    },
   },
   apollo: {
     User: {
@@ -114,8 +110,8 @@ export default {
       },
       result(result) {
         this.users = result.data.User
-      }
-    }
-  }
+      },
+    },
+  },
 }
 </script>

From c7dc2f6a5c3f6bf09722260853b9986b7c881339 Mon Sep 17 00:00:00 2001
From: Matt Rider <mattwr18@gmail.com>
Date: Mon, 15 Jul 2019 19:09:33 -0300
Subject: [PATCH 13/22] Hide CommentForm when an edit is in progress

- Follow @Tirokk PR review
---
 webapp/components/Comment.vue                 | 40 ++++++++++---------
 .../components/comments/CommentForm/index.vue |  8 +++-
 .../components/comments/CommentForm/spec.js   |  1 +
 .../comments/EditCommentForm/index.vue        |  5 +++
 webapp/store/editor.js                        |  7 ++++
 5 files changed, 41 insertions(+), 20 deletions(-)

diff --git a/webapp/components/Comment.vue b/webapp/components/Comment.vue
index f0155afa8..1fdfad7cf 100644
--- a/webapp/components/Comment.vue
+++ b/webapp/components/Comment.vue
@@ -35,24 +35,22 @@
           @showEditCommentMenu="editCommentMenu"
         />
       </div>
-      <div
-        v-if="isCollapsed && !openEditCommentMenu"
-        v-html="comment.contentExcerpt"
-        style="padding-left: 40px;"
-      />
-      <div
-        v-show="comment.content !== comment.contentExcerpt"
-        style="text-align: right;  margin-right: 20px; margin-top: -12px;"
-      >
-        <a v-if="isCollapsed" style="padding-left: 40px;" @click="isCollapsed = !isCollapsed">
-          {{ $t('comment.show.more') }}
-        </a>
-      </div>
-      <div v-if="!isCollapsed" v-html="comment.content" style="padding-left: 40px;" />
-      <div style="text-align: right;  margin-right: 20px; margin-top: -12px;">
-        <a v-if="!isCollapsed" @click="isCollapsed = !isCollapsed" style="padding-left: 40px; ">
-          {{ $t('comment.show.less') }}
-        </a>
+      <div v-show="!openEditCommentMenu">
+        <div v-if="isCollapsed" v-html="comment.contentExcerpt" style="padding-left: 40px;" />
+        <div
+          v-show="comment.content !== comment.contentExcerpt"
+          style="text-align: right;  margin-right: 20px; margin-top: -12px;"
+        >
+          <a v-if="isCollapsed" style="padding-left: 40px;" @click="isCollapsed = !isCollapsed">
+            {{ $t('comment.show.more') }}
+          </a>
+        </div>
+        <div v-if="!isCollapsed" v-html="comment.content" style="padding-left: 40px;" />
+        <div style="text-align: right;  margin-right: 20px; margin-top: -12px;">
+          <a v-if="!isCollapsed" @click="isCollapsed = !isCollapsed" style="padding-left: 40px; ">
+            {{ $t('comment.show.less') }}
+          </a>
+        </div>
       </div>
       <ds-space margin-bottom="small" />
     </ds-card>
@@ -61,7 +59,7 @@
 
 <script>
 import gql from 'graphql-tag'
-import { mapGetters } from 'vuex'
+import { mapGetters, mapMutations } from 'vuex'
 import HcUser from '~/components/User'
 import ContentMenu from '~/components/ContentMenu'
 import HcEditCommentForm from '~/components/comments/EditCommentForm'
@@ -126,11 +124,15 @@ export default {
     },
   },
   methods: {
+    ...mapMutations({
+      setEditPending: 'editor/SET_EDIT_PENDING',
+    }),
     isAuthor(id) {
       return this.user.id === id
     },
     editCommentMenu(showMenu) {
       this.openEditCommentMenu = showMenu
+      this.setEditPending(showMenu)
     },
     async deleteCommentCallback() {
       try {
diff --git a/webapp/components/comments/CommentForm/index.vue b/webapp/components/comments/CommentForm/index.vue
index 14dcace43..e0e0058e5 100644
--- a/webapp/components/comments/CommentForm/index.vue
+++ b/webapp/components/comments/CommentForm/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <ds-form v-model="form" @submit="handleSubmit">
+  <ds-form v-show="!editPending" v-model="form" @submit="handleSubmit">
     <template slot-scope="{ errors }">
       <ds-card>
         <hc-editor ref="editor" :users="users" :value="form.content" @input="updateEditorContent" />
@@ -27,6 +27,7 @@ import gql from 'graphql-tag'
 import HcEditor from '~/components/Editor/Editor'
 import PostCommentsQuery from '~/graphql/PostCommentsQuery.js'
 import CommentMutations from '~/graphql/CommentMutations.js'
+import { mapGetters } from 'vuex'
 
 export default {
   components: {
@@ -46,6 +47,11 @@ export default {
       users: [],
     }
   },
+  computed: {
+    ...mapGetters({
+      editPending: 'editor/editPending',
+    }),
+  },
   methods: {
     updateEditorContent(value) {
       const content = value.replace(/<(?:.|\n)*?>/gm, '').trim()
diff --git a/webapp/components/comments/CommentForm/spec.js b/webapp/components/comments/CommentForm/spec.js
index c3622151c..8420c97ba 100644
--- a/webapp/components/comments/CommentForm/spec.js
+++ b/webapp/components/comments/CommentForm/spec.js
@@ -40,6 +40,7 @@ describe('CommentForm.vue', () => {
       'editor/placeholder': () => {
         return 'some cool placeholder'
       },
+      'editor/editPending': () => false,
     }
     const store = new Vuex.Store({
       getters,
diff --git a/webapp/components/comments/EditCommentForm/index.vue b/webapp/components/comments/EditCommentForm/index.vue
index c17425596..02ed17465 100644
--- a/webapp/components/comments/EditCommentForm/index.vue
+++ b/webapp/components/comments/EditCommentForm/index.vue
@@ -32,6 +32,7 @@
 <script>
 import gql from 'graphql-tag'
 import HcEditor from '~/components/Editor/Editor'
+import { mapMutations } from 'vuex'
 
 export default {
   components: {
@@ -56,6 +57,9 @@ export default {
     }
   },
   methods: {
+    ...mapMutations({
+      setEditPending: 'editor/SET_EDIT_PENDING',
+    }),
     updateEditorContent(value) {
       const content = value.replace(/<(?:.|\n)*?>/gm, '').trim()
       if (content.length < 1) {
@@ -92,6 +96,7 @@ export default {
           this.$toast.success(this.$t('post.comment.updated'))
           this.disabled = false
           this.$emit('showEditCommentMenu', false)
+          this.setEditPending(false)
         })
         .catch(err => {
           this.$toast.error(err.message)
diff --git a/webapp/store/editor.js b/webapp/store/editor.js
index 9c5f665a0..cbf9d9289 100644
--- a/webapp/store/editor.js
+++ b/webapp/store/editor.js
@@ -1,6 +1,7 @@
 export const state = () => {
   return {
     placeholder: null,
+    editPending: false,
   }
 }
 
@@ -8,10 +9,16 @@ export const getters = {
   placeholder(state) {
     return state.placeholder
   },
+  editPending(state) {
+    return state.editPending
+  },
 }
 
 export const mutations = {
   SET_PLACEHOLDER_TEXT(state, text) {
     state.placeholder = text
   },
+  SET_EDIT_PENDING(state, boolean) {
+    state.editPending = boolean
+  },
 }

From 9203f7310dd59ee88ab72a24620db9cd1d94205e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Tue, 16 Jul 2019 09:46:01 +0200
Subject: [PATCH 14/22] Edit Comment `content` not `contentExcerpt`

Comment button now only active, if the comment has changed.
Remove `console.log`.
---
 webapp/components/ContentMenu.vue             |  2 --
 .../comments/EditCommentForm/index.vue        | 19 +++++--------------
 2 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/webapp/components/ContentMenu.vue b/webapp/components/ContentMenu.vue
index 5088260f7..0ac885597 100644
--- a/webapp/components/ContentMenu.vue
+++ b/webapp/components/ContentMenu.vue
@@ -79,8 +79,6 @@ export default {
         routes.push({
           name: this.$t(`comment.menu.edit`),
           callback: () => {
-            /* eslint-disable-next-line no-console */
-            console.log('EDIT COMMENT')
             this.$emit('showEditCommentMenu', true)
           },
           icon: 'edit',
diff --git a/webapp/components/comments/EditCommentForm/index.vue b/webapp/components/comments/EditCommentForm/index.vue
index 02ed17465..1d226283a 100644
--- a/webapp/components/comments/EditCommentForm/index.vue
+++ b/webapp/components/comments/EditCommentForm/index.vue
@@ -9,12 +9,7 @@
         <ds-flex :gutter="{ base: 'small', md: 'small', sm: 'x-large', xs: 'x-large' }">
           <ds-flex-item :width="{ base: '0%', md: '50%', sm: '0%', xs: '0%' }" />
           <ds-flex-item :width="{ base: '40%', md: '20%', sm: '30%', xs: '30%' }">
-            <ds-button
-              :disabled="disabled"
-              ghost
-              class="cancelBtn"
-              @click.prevent="closeEditWindow"
-            >
+            <ds-button ghost class="cancelBtn" @click.prevent="closeEditWindow">
               {{ $t('actions.cancel') }}
             </ds-button>
           </ds-flex-item>
@@ -48,10 +43,10 @@ export default {
   },
   data() {
     return {
-      disabled: false,
+      disabled: true,
       loading: false,
       form: {
-        content: this.comment.contentExcerpt,
+        content: this.comment.content,
       },
       users: [],
     }
@@ -61,12 +56,8 @@ export default {
       setEditPending: 'editor/SET_EDIT_PENDING',
     }),
     updateEditorContent(value) {
-      const content = value.replace(/<(?:.|\n)*?>/gm, '').trim()
-      if (content.length < 1) {
-        this.disabled = true
-      } else {
-        this.disabled = false
-      }
+      const sanitizedContent = value.replace(/<(?:.|\n)*?>/gm, '').trim()
+      this.disabled = value === this.comment.content || sanitizedContent.length < 1
       this.form.content = value
     },
     closeEditWindow() {

From a019c8c311cc226ec43570f92e9f2d7aba4d6819 Mon Sep 17 00:00:00 2001
From: Matt Rider <mattwr18@gmail.com>
Date: Tue, 16 Jul 2019 07:53:57 -0300
Subject: [PATCH 15/22] Revert unintended changes, refactor

- rename some variables in comments.spec.js while dealing with merge conflicts
- rename EditCommentForm/index.vue with new naming convention
- add comment to explain absense of <no-ssr>
- use a comments content for edit comment form content, not excerpt
---
 backend/src/middleware/validation/index.js    |  4 +--
 backend/src/schema/resolvers/comments.spec.js | 32 +++++++++++++------
 webapp/components/Comment.vue                 |  4 +--
 .../{index.vue => EditCommentForm.vue}        | 11 +++----
 4 files changed, 31 insertions(+), 20 deletions(-)
 rename webapp/components/comments/EditCommentForm/{index.vue => EditCommentForm.vue} (94%)

diff --git a/backend/src/middleware/validation/index.js b/backend/src/middleware/validation/index.js
index 2a1bf0cfa..8fba13529 100644
--- a/backend/src/middleware/validation/index.js
+++ b/backend/src/middleware/validation/index.js
@@ -17,8 +17,8 @@ const validateUpdateComment = async (resolve, root, args, context, info) => {
   if (!args.content || content.length < COMMENT_MIN_LENGTH) {
     throw new UserInputError(`Comment must be at least ${COMMENT_MIN_LENGTH} character long!`)
   }
-  /* eslint-disable-next-line no-return-await */
-  return await resolve(root, args, context, info)
+
+  return resolve(root, args, context, info)
 }
 
 export default {
diff --git a/backend/src/schema/resolvers/comments.spec.js b/backend/src/schema/resolvers/comments.spec.js
index 0143e83f8..88cdbe37a 100644
--- a/backend/src/schema/resolvers/comments.spec.js
+++ b/backend/src/schema/resolvers/comments.spec.js
@@ -188,22 +188,24 @@ describe('CreateComment', () => {
 })
 
 describe('ManageComments', () => {
-  let manageCommentsUserParams
+  let authorParams
   beforeEach(async () => {
-    manageCommentsUserParams = {
+    authorParams = {
       email: 'author@example.org',
       password: '1234',
     }
-    createCommentVariables = {
+    const asAuthor = Factory()
+    await asAuthor.create('User', authorParams)
+    await asAuthor.authenticateAs(authorParams)
+    await asAuthor.create('Post', {
+      id: 'p1',
+      content: 'Post to be commented',
+    })
+    await asAuthor.create('Comment', {
       id: 'c456',
       postId: 'p1',
-      content: "I'm authorised to comment",
-    }
-    await factory.create('User', manageCommentsUserParams)
-    headers = await login(manageCommentsUserParams)
-    client = new GraphQLClient(host, { headers })
-    await client.request(createPostMutation, createPostVariables)
-    await client.request(createCommentMutation, createCommentVariables)
+      content: 'Comment to be deleted',
+    })
   })
 
   describe('UpdateComment', () => {
@@ -249,6 +251,11 @@ describe('ManageComments', () => {
     })
 
     describe('authenticated as author', () => {
+      beforeEach(async () => {
+        headers = await login(authorParams)
+        client = new GraphQLClient(host, { headers })
+      })
+
       it('updates the comment', async () => {
         const expected = {
           UpdateComment: {
@@ -304,6 +311,11 @@ describe('ManageComments', () => {
     })
 
     describe('authenticated as author', () => {
+      beforeEach(async () => {
+        headers = await login(authorParams)
+        client = new GraphQLClient(host, { headers })
+      })
+
       it('deletes the comment', async () => {
         const expected = {
           DeleteComment: {
diff --git a/webapp/components/Comment.vue b/webapp/components/Comment.vue
index 1fdfad7cf..7684c3f75 100644
--- a/webapp/components/Comment.vue
+++ b/webapp/components/Comment.vue
@@ -11,7 +11,7 @@
   </div>
   <div v-else :class="{ comment: true, 'disabled-content': comment.deleted || comment.disabled }">
     <ds-card>
-      <ds-space margin-bottom="x-small">
+      <ds-space margin-bottom="small">
         <hc-user :user="author" :date-time="comment.createdAt" />
       </ds-space>
       <!-- Content Menu (can open Modals) -->
@@ -62,7 +62,7 @@ import gql from 'graphql-tag'
 import { mapGetters, mapMutations } from 'vuex'
 import HcUser from '~/components/User'
 import ContentMenu from '~/components/ContentMenu'
-import HcEditCommentForm from '~/components/comments/EditCommentForm'
+import HcEditCommentForm from '~/components/comments/EditCommentForm/EditCommentForm'
 
 export default {
   data: function() {
diff --git a/webapp/components/comments/EditCommentForm/index.vue b/webapp/components/comments/EditCommentForm/EditCommentForm.vue
similarity index 94%
rename from webapp/components/comments/EditCommentForm/index.vue
rename to webapp/components/comments/EditCommentForm/EditCommentForm.vue
index 02ed17465..83ba12862 100644
--- a/webapp/components/comments/EditCommentForm/index.vue
+++ b/webapp/components/comments/EditCommentForm/EditCommentForm.vue
@@ -2,9 +2,8 @@
   <ds-form v-model="form" @submit="handleSubmit">
     <template slot-scope="{ errors }">
       <ds-card>
-        <!-- <no-ssr> -->
+        <!-- with no-ssr the content is not shown -->
         <hc-editor ref="editor" :users="users" :value="form.content" @input="updateEditorContent" />
-        <!-- </no-ssr> -->
         <ds-space />
         <ds-flex :gutter="{ base: 'small', md: 'small', sm: 'x-large', xs: 'x-large' }">
           <ds-flex-item :width="{ base: '0%', md: '50%', sm: '0%', xs: '0%' }" />
@@ -51,7 +50,7 @@ export default {
       disabled: false,
       loading: false,
       form: {
-        content: this.comment.contentExcerpt,
+        content: this.comment.content,
       },
       users: [],
     }
@@ -90,7 +89,7 @@ export default {
             id: this.comment.id,
           },
         })
-        .then(res => {
+        .then(() => {
           this.loading = false
 
           this.$toast.success(this.$t('post.comment.updated'))
@@ -113,8 +112,8 @@ export default {
           }
         }`)
       },
-      result(result) {
-        this.users = result.data.User
+      result({ data: { User } }) {
+        this.users = User
       },
     },
   },

From 3b88c472068ea6df7c6a30ebaf262df52bbde5b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Tue, 16 Jul 2019 15:48:38 +0200
Subject: [PATCH 16/22] Update the `contentExcerpt`

Co-Authored-By: mattwr18 <mattwr18@gmail.com>
---
 .../EditCommentForm/EditCommentForm.vue       | 22 ++++++++-----------
 webapp/graphql/CommentMutations.js            |  9 ++++++++
 webapp/graphql/CommentQuery.js                |  4 ++--
 webapp/graphql/PostQuery.js                   |  8 +++----
 4 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/webapp/components/comments/EditCommentForm/EditCommentForm.vue b/webapp/components/comments/EditCommentForm/EditCommentForm.vue
index 10c7d457c..e647131b8 100644
--- a/webapp/components/comments/EditCommentForm/EditCommentForm.vue
+++ b/webapp/components/comments/EditCommentForm/EditCommentForm.vue
@@ -27,6 +27,7 @@
 import gql from 'graphql-tag'
 import HcEditor from '~/components/Editor/Editor'
 import { mapMutations } from 'vuex'
+import CommentMutations from '~/graphql/CommentMutations.js'
 
 export default {
   components: {
@@ -67,14 +68,7 @@ export default {
       this.disabled = true
       this.$apollo
         .mutate({
-          mutation: gql`
-            mutation($content: String!, $id: ID!) {
-              UpdateComment(content: $content, id: $id) {
-                id
-                content
-              }
-            }
-          `,
+          mutation: CommentMutations().UpdateComment,
           variables: {
             content: this.form.content,
             id: this.comment.id,
@@ -96,12 +90,14 @@ export default {
   apollo: {
     User: {
       query() {
-        return gql(`{
-          User(orderBy: slug_asc) {
-            id
-            slug
+        return gql`
+          {
+            User(orderBy: slug_asc) {
+              id
+              slug
+            }
           }
-        }`)
+        `
       },
       result({ data: { User } }) {
         this.users = User
diff --git a/webapp/graphql/CommentMutations.js b/webapp/graphql/CommentMutations.js
index e47e25d6a..6b0f653fc 100644
--- a/webapp/graphql/CommentMutations.js
+++ b/webapp/graphql/CommentMutations.js
@@ -20,5 +20,14 @@ export default () => {
         }
       }
     `,
+    UpdateComment: gql`
+      mutation($content: String!, $id: ID!) {
+        UpdateComment(content: $content, id: $id) {
+          id
+          content
+          contentExcerpt
+        }
+      }
+    `,
   }
 }
diff --git a/webapp/graphql/CommentQuery.js b/webapp/graphql/CommentQuery.js
index 3696f1964..4d82165f0 100644
--- a/webapp/graphql/CommentQuery.js
+++ b/webapp/graphql/CommentQuery.js
@@ -2,7 +2,7 @@ import gql from 'graphql-tag'
 
 export default app => {
   const lang = app.$i18n.locale().toUpperCase()
-  return gql(`
+  return gql`
     query Comment($postId: ID) {
       Comment(postId: $postId) {
         id
@@ -30,5 +30,5 @@ export default app => {
         }
       }
     }
-  `)
+  `
 }
diff --git a/webapp/graphql/PostQuery.js b/webapp/graphql/PostQuery.js
index cac80d9b1..d2bba23ef 100644
--- a/webapp/graphql/PostQuery.js
+++ b/webapp/graphql/PostQuery.js
@@ -2,7 +2,7 @@ import gql from 'graphql-tag'
 
 export default i18n => {
   const lang = i18n.locale().toUpperCase()
-  return gql(`
+  return gql`
       query Post($slug: String!) {
         Post(slug: $slug) {
           id
@@ -73,12 +73,12 @@ export default i18n => {
           shoutedByCurrentUser
         }
       }
-    `)
+    `
 }
 
 export const filterPosts = i18n => {
   const lang = i18n.locale().toUpperCase()
-  return gql(`
+  return gql`
   query Post($filter: _PostFilter, $first: Int, $offset: Int) {
     Post(filter: $filter, first: $first, offset: $offset) {
       id
@@ -118,5 +118,5 @@ export const filterPosts = i18n => {
       shoutedCount
     }
   }
-`)
+`
 }

From 1c53c58f42cdca4c77da6e287105cffd0d6e2866 Mon Sep 17 00:00:00 2001
From: Matt Rider <mattwr18@gmail.com>
Date: Tue, 16 Jul 2019 14:54:13 -0300
Subject: [PATCH 17/22] Add backend validation tests to expose non-validation

- remove validation/index.js as it's not being used
- move validations to validationMiddleware.js where it validates
---
 backend/src/middleware/validation/index.js    | 29 ------------
 .../validation/validationMiddleware.js        | 11 +++++
 backend/src/schema/resolvers/comments.spec.js | 44 +++++++++++++++++++
 3 files changed, 55 insertions(+), 29 deletions(-)
 delete mode 100644 backend/src/middleware/validation/index.js

diff --git a/backend/src/middleware/validation/index.js b/backend/src/middleware/validation/index.js
deleted file mode 100644
index 8fba13529..000000000
--- a/backend/src/middleware/validation/index.js
+++ /dev/null
@@ -1,29 +0,0 @@
-import { UserInputError } from 'apollo-server'
-
-const validateUrl = async (resolve, root, args, context, info) => {
-  const { url } = args
-  const isValid = url.match(/^(?:https?:\/\/)(?:[^@\n])?(?:www\.)?([^:/\n?]+)/g)
-  if (isValid) {
-    /* eslint-disable-next-line no-return-await */
-    return await resolve(root, args, context, info)
-  } else {
-    throw new UserInputError('Input is not a URL')
-  }
-}
-
-const validateUpdateComment = async (resolve, root, args, context, info) => {
-  const COMMENT_MIN_LENGTH = 1
-  const content = args.content.replace(/<(?:.|\n)*?>/gm, '').trim()
-  if (!args.content || content.length < COMMENT_MIN_LENGTH) {
-    throw new UserInputError(`Comment must be at least ${COMMENT_MIN_LENGTH} character long!`)
-  }
-
-  return resolve(root, args, context, info)
-}
-
-export default {
-  Mutation: {
-    CreateSocialMedia: validateUrl,
-    UpdateComment: validateUpdateComment,
-  },
-}
diff --git a/backend/src/middleware/validation/validationMiddleware.js b/backend/src/middleware/validation/validationMiddleware.js
index 77282b6b5..319a9a6c0 100644
--- a/backend/src/middleware/validation/validationMiddleware.js
+++ b/backend/src/middleware/validation/validationMiddleware.js
@@ -45,9 +45,20 @@ const validateCommentCreation = async (resolve, root, args, context, info) => {
   }
 }
 
+const validateUpdateComment = async (resolve, root, args, context, info) => {
+  const COMMENT_MIN_LENGTH = 1
+  const content = args.content.replace(/<(?:.|\n)*?>/gm, '').trim()
+  if (!args.content || content.length < COMMENT_MIN_LENGTH) {
+    throw new UserInputError(`Comment must be at least ${COMMENT_MIN_LENGTH} character long!`)
+  }
+
+  return resolve(root, args, context, info)
+}
+
 export default {
   Mutation: {
     CreateSocialMedia: validate(socialMediaSchema),
     CreateComment: validateCommentCreation,
+    UpdateComment: validateUpdateComment,
   },
 }
diff --git a/backend/src/schema/resolvers/comments.spec.js b/backend/src/schema/resolvers/comments.spec.js
index 88cdbe37a..8ed062728 100644
--- a/backend/src/schema/resolvers/comments.spec.js
+++ b/backend/src/schema/resolvers/comments.spec.js
@@ -267,6 +267,50 @@ describe('ManageComments', () => {
           client.request(updateCommentMutation, updateCommentVariables),
         ).resolves.toEqual(expected)
       })
+
+      it('throw an error if an empty string is sent from the editor as content', async () => {
+        updateCommentVariables = {
+          id: 'c456',
+          content: '<p></p>',
+        }
+
+        await expect(client.request(updateCommentMutation, updateCommentVariables)).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 () => {
+        updateCommentVariables = {
+          id: 'c456',
+          content: '<p></p>',
+        }
+
+        await expect(client.request(updateCommentMutation, updateCommentVariables)).rejects.toThrow(
+          'Comment must be at least 1 character long!',
+        )
+      })
+
+      it('throws an error if postId is sent as an empty string', async () => {
+        updateCommentVariables = {
+          id: 'c456',
+          content: '<p></p>',
+        }
+
+        await expect(client.request(updateCommentMutation, updateCommentVariables)).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 () => {
+        updateCommentVariables = {
+          id: 'c456',
+          content: '<p></p>',
+        }
+
+        await expect(client.request(updateCommentMutation, updateCommentVariables)).rejects.toThrow(
+          'Comment must be at least 1 character long!',
+        )
+      })
     })
   })
 

From 0f91cced2475f1058010a18b604812376b084fb6 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 17 Jul 2019 04:25:09 +0000
Subject: [PATCH 18/22] Bump cypress-file-upload from 3.3.1 to 3.3.2

Bumps [cypress-file-upload](https://github.com/abramenal/cypress-file-upload) from 3.3.1 to 3.3.2.
- [Release notes](https://github.com/abramenal/cypress-file-upload/releases)
- [Commits](https://github.com/abramenal/cypress-file-upload/compare/v3.3.1...v3.3.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index b4447bdd2..87ec4e9ef 100644
--- a/package.json
+++ b/package.json
@@ -24,7 +24,7 @@
     "cross-env": "^5.2.0",
     "cypress": "^3.4.0",
     "cypress-cucumber-preprocessor": "^1.12.0",
-    "cypress-file-upload": "^3.3.1",
+    "cypress-file-upload": "^3.3.2",
     "cypress-plugin-retries": "^1.2.2",
     "dotenv": "^8.0.0",
     "faker": "Marak/faker.js#master",
diff --git a/yarn.lock b/yarn.lock
index 4bd56b6ec..b3e4af00b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1827,10 +1827,10 @@ cypress-cucumber-preprocessor@^1.12.0:
     glob "^7.1.2"
     through "^2.3.8"
 
-cypress-file-upload@^3.3.1:
-  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/cypress-file-upload/-/cypress-file-upload-3.3.1.tgz#19bb6c296ffc492dbfae8a7511c94d6b4d0ad4d5"
-  integrity sha512-iUtq/a30i73JXx9sUj5HhmuEV9pHMV2/7C06H8/zFDSgFweFSwKL0SSprQu8Ewf7cAEsExBKigwlLQYFdTW8PA==
+cypress-file-upload@^3.3.2:
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/cypress-file-upload/-/cypress-file-upload-3.3.2.tgz#d9bb00cac756fd4b5f68079f19745fe40d97fdd4"
+  integrity sha512-39CW6/rTmn7AGa+ZrD37R+ANnnWAesbUj2RpBfbpRzV+KTAlF+m9Djbd2f325w0JGY0A2eO0w6TYYo+NvBTnoA==
 
 cypress-plugin-retries@^1.2.2:
   version "1.2.2"

From 5430a5e990d178dd21c448b2375e85031c27b6e2 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 17 Jul 2019 04:25:49 +0000
Subject: [PATCH 19/22] Bump apollo-server-testing from 2.6.9 to 2.7.0 in
 /backend

Bumps [apollo-server-testing](https://github.com/apollographql/apollo-server) from 2.6.9 to 2.7.0.
- [Release notes](https://github.com/apollographql/apollo-server/releases)
- [Changelog](https://github.com/apollographql/apollo-server/blob/master/CHANGELOG.md)
- [Commits](https://github.com/apollographql/apollo-server/compare/apollo-server-testing@2.6.9...apollo-server-testing@2.7.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 backend/package.json |   2 +-
 backend/yarn.lock    | 113 +++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 109 insertions(+), 6 deletions(-)

diff --git a/backend/package.json b/backend/package.json
index 16b0df487..c22bfe857 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -89,7 +89,7 @@
     "@babel/plugin-proposal-throw-expressions": "^7.2.0",
     "@babel/preset-env": "~7.5.4",
     "@babel/register": "~7.4.4",
-    "apollo-server-testing": "~2.6.9",
+    "apollo-server-testing": "~2.7.0",
     "babel-core": "~7.0.0-0",
     "babel-eslint": "~10.0.2",
     "babel-jest": "~24.8.0",
diff --git a/backend/yarn.lock b/backend/yarn.lock
index 23ebc2de3..829ab85f2 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -1336,6 +1336,14 @@ apollo-cache-control@0.7.5:
     apollo-server-env "2.4.0"
     graphql-extensions "0.7.7"
 
+apollo-cache-control@0.8.0:
+  version "0.8.0"
+  resolved "https://registry.yarnpkg.com/apollo-cache-control/-/apollo-cache-control-0.8.0.tgz#08b157e5f8cd86f63608b05d45222de0725ebd5a"
+  integrity sha512-BBnfUmSWRws5dRSDD+R56RLJCE9v6xQuob+i/1Ju9EX4LZszU5JKVmxEvnkJ1bk/BkihjoQXTnP6fJCnt6fCmA==
+  dependencies:
+    apollo-server-env "2.4.0"
+    graphql-extensions "0.8.0"
+
 apollo-cache-inmemory@~1.6.2:
   version "1.6.2"
   resolved "https://registry.yarnpkg.com/apollo-cache-inmemory/-/apollo-cache-inmemory-1.6.2.tgz#bbf2e4e1eacdf82b2d526f5c2f3b37e5acee3c5e"
@@ -1377,6 +1385,14 @@ apollo-datasource@0.5.0:
     apollo-server-caching "0.4.0"
     apollo-server-env "2.4.0"
 
+apollo-datasource@0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/apollo-datasource/-/apollo-datasource-0.6.0.tgz#823d6be8a3804613b5c56d2972c07db662293fc6"
+  integrity sha512-DOzzYWEOReYRu2vWPKEulqlTb9Xjg67sjVCzve5MXa7GUXjfr8IKioljvfoBMlqm/PpbJVk2ci4n5NIFqoYsrQ==
+  dependencies:
+    apollo-server-caching "0.5.0"
+    apollo-server-env "2.4.0"
+
 apollo-engine-reporting-protobuf@0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/apollo-engine-reporting-protobuf/-/apollo-engine-reporting-protobuf-0.3.1.tgz#a581257fa8e3bb115ce38bf1b22e052d1475ad69"
@@ -1384,6 +1400,13 @@ apollo-engine-reporting-protobuf@0.3.1:
   dependencies:
     protobufjs "^6.8.6"
 
+apollo-engine-reporting-protobuf@0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/apollo-engine-reporting-protobuf/-/apollo-engine-reporting-protobuf-0.4.0.tgz#e34c192d86493b33a73181fd6be75721559111ec"
+  integrity sha512-cXHZSienkis8v4RhqB3YG3DkaksqLpcxApRLTpRMs7IXNozgV7CUPYGFyFBEra1ZFgUyHXx4G9MpelV+n2cCfA==
+  dependencies:
+    protobufjs "^6.8.6"
+
 apollo-engine-reporting@1.3.6:
   version "1.3.6"
   resolved "https://registry.yarnpkg.com/apollo-engine-reporting/-/apollo-engine-reporting-1.3.6.tgz#579ba2da85ff848bd92be1b0f1ad61f0c57e3585"
@@ -1396,6 +1419,18 @@ apollo-engine-reporting@1.3.6:
     async-retry "^1.2.1"
     graphql-extensions "0.7.7"
 
+apollo-engine-reporting@1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/apollo-engine-reporting/-/apollo-engine-reporting-1.4.0.tgz#3a9bd011b271593e16d7057044898d0a817b197d"
+  integrity sha512-NMiO3h1cuEBt6QZNGHxivwuyZQnoU/2MMx0gUA8Gyy1ERBhK6P235qoMnvoi34rLmqJuyGPX6tXcab8MpMIzYQ==
+  dependencies:
+    apollo-engine-reporting-protobuf "0.4.0"
+    apollo-graphql "^0.3.3"
+    apollo-server-env "2.4.0"
+    apollo-server-types "0.2.0"
+    async-retry "^1.2.1"
+    graphql-extensions "0.8.0"
+
 apollo-env@0.5.1:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/apollo-env/-/apollo-env-0.5.1.tgz#b9b0195c16feadf0fe9fd5563edb0b9b7d9e97d3"
@@ -1464,6 +1499,13 @@ apollo-server-caching@0.4.0:
   dependencies:
     lru-cache "^5.0.0"
 
+apollo-server-caching@0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/apollo-server-caching/-/apollo-server-caching-0.5.0.tgz#446a37ce2d4e24c81833e276638330a634f7bd46"
+  integrity sha512-l7ieNCGxUaUAVAAp600HjbUJxVaxjJygtPV0tPTe1Q3HkPy6LEWoY6mNHV7T268g1hxtPTxcdRu7WLsJrg7ufw==
+  dependencies:
+    lru-cache "^5.0.0"
+
 apollo-server-core@2.6.9:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/apollo-server-core/-/apollo-server-core-2.6.9.tgz#75542ad206782e5c31a023b54962e9fdc6404a91"
@@ -1490,6 +1532,34 @@ apollo-server-core@2.6.9:
     subscriptions-transport-ws "^0.9.11"
     ws "^6.0.0"
 
+apollo-server-core@2.7.0:
+  version "2.7.0"
+  resolved "https://registry.yarnpkg.com/apollo-server-core/-/apollo-server-core-2.7.0.tgz#c444347dea11149b5b453890506e43dc7e711257"
+  integrity sha512-CXjXAkgcMBCJZpsZgfAY5W7f5thdxUhn75UgzeH28RTUZ2aKi/LjoCixPWRSF1lU4vuEWneAnM8Vg/KCD+29lQ==
+  dependencies:
+    "@apollographql/apollo-tools" "^0.3.6"
+    "@apollographql/graphql-playground-html" "1.6.24"
+    "@types/ws" "^6.0.0"
+    apollo-cache-control "0.8.0"
+    apollo-datasource "0.6.0"
+    apollo-engine-reporting "1.4.0"
+    apollo-engine-reporting-protobuf "0.4.0"
+    apollo-server-caching "0.5.0"
+    apollo-server-env "2.4.0"
+    apollo-server-errors "2.3.1"
+    apollo-server-plugin-base "0.6.0"
+    apollo-server-types "0.2.0"
+    apollo-tracing "0.8.0"
+    fast-json-stable-stringify "^2.0.0"
+    graphql-extensions "0.8.0"
+    graphql-subscriptions "^1.0.0"
+    graphql-tag "^2.9.2"
+    graphql-tools "^4.0.0"
+    graphql-upload "^8.0.2"
+    sha.js "^2.4.11"
+    subscriptions-transport-ws "^0.9.11"
+    ws "^6.0.0"
+
 apollo-server-env@2.4.0:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/apollo-server-env/-/apollo-server-env-2.4.0.tgz#6611556c6b627a1636eed31317d4f7ea30705872"
@@ -1526,12 +1596,28 @@ apollo-server-plugin-base@0.5.8:
   resolved "https://registry.yarnpkg.com/apollo-server-plugin-base/-/apollo-server-plugin-base-0.5.8.tgz#77b4127aff4e3514a9d49e3cc61256aee4d9422e"
   integrity sha512-ICbaXr0ycQZL5llbtZhg8zyHbxuZ4khdAJsJgiZaUXXP6+F47XfDQ5uwnl/4Sq9fvkpwS0ctvfZ1D+Ks4NvUzA==
 
-apollo-server-testing@~2.6.9:
-  version "2.6.9"
-  resolved "https://registry.yarnpkg.com/apollo-server-testing/-/apollo-server-testing-2.6.9.tgz#6c1d20a89c0676bf32714405d729c302d62adfb1"
-  integrity sha512-MQfXAjNsI63O9sY60tQnGy102sqJSr++Yzm+IR44WrK3Z7FHUDisoh6UATly04EDGtO034xtqukzdUNQCK7+rw==
+apollo-server-plugin-base@0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/apollo-server-plugin-base/-/apollo-server-plugin-base-0.6.0.tgz#4186296ea5d52cfe613961d252a8a2f9e13e6ba6"
+  integrity sha512-BjfyWpHyKwHOe819gk3wEFwbnVp9Xvos03lkkYTTcXS/8G7xO78aUcE65mmyAC56/ZQ0aodNFkFrhwNtWBQWUQ==
   dependencies:
-    apollo-server-core "2.6.9"
+    apollo-server-types "0.2.0"
+
+apollo-server-testing@~2.7.0:
+  version "2.7.0"
+  resolved "https://registry.yarnpkg.com/apollo-server-testing/-/apollo-server-testing-2.7.0.tgz#df8f8fb0df85f9781b6822fc92ee36fdc039b024"
+  integrity sha512-geBTK5T8mqZ2UOscC3oHQ/QoKMINLK+Mmq5ZfZe9UhmdXi+WqQ3/6B+3HMoQ7eQ7D6bNILe8b7N2EKuyUkePdg==
+  dependencies:
+    apollo-server-core "2.7.0"
+
+apollo-server-types@0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/apollo-server-types/-/apollo-server-types-0.2.0.tgz#270d7298f709fd8237ebfa48753249e5286df5f2"
+  integrity sha512-5dgiyXsM90vnfmdXO1ixHvsLn0d9NP4tWufmr3ZmjKv00r4JAQNUaUdgOSGbRIKoHELQGwxUuTySTZ/tYfGaNQ==
+  dependencies:
+    apollo-engine-reporting-protobuf "0.4.0"
+    apollo-server-caching "0.5.0"
+    apollo-server-env "2.4.0"
 
 apollo-server@~2.6.9:
   version "2.6.9"
@@ -1552,6 +1638,14 @@ apollo-tracing@0.7.4:
     apollo-server-env "2.4.0"
     graphql-extensions "0.7.7"
 
+apollo-tracing@0.8.0:
+  version "0.8.0"
+  resolved "https://registry.yarnpkg.com/apollo-tracing/-/apollo-tracing-0.8.0.tgz#28cd9c61a4db12b2c24dad67fdedd309806c1650"
+  integrity sha512-cNOtOlyZ56iJRsCjnxjM1V0SnQ2ZZttuyoeOejdat6llPfk5bfYTVOKMjdbSfDvU33LS9g9sqNJCT0MwrEPFKQ==
+  dependencies:
+    apollo-server-env "2.4.0"
+    graphql-extensions "0.8.0"
+
 apollo-utilities@1.3.2, apollo-utilities@^1.0.1, apollo-utilities@^1.3.0, apollo-utilities@^1.3.2:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/apollo-utilities/-/apollo-utilities-1.3.2.tgz#8cbdcf8b012f664cd6cb5767f6130f5aed9115c9"
@@ -3649,6 +3743,15 @@ graphql-extensions@0.7.7:
     "@apollographql/apollo-tools" "^0.3.6"
     apollo-server-env "2.4.0"
 
+graphql-extensions@0.8.0:
+  version "0.8.0"
+  resolved "https://registry.yarnpkg.com/graphql-extensions/-/graphql-extensions-0.8.0.tgz#b3fe7915aa84eef5a39135840840cc4d2e700c46"
+  integrity sha512-zV9RefkusIXqi9ZJtl7IJ5ecjDKdb7PLAb5E3CmxX3OK1GwNCIubp0vE7Fp4fXlCUKgTB1Woubs0zj71JT8o0A==
+  dependencies:
+    "@apollographql/apollo-tools" "^0.3.6"
+    apollo-server-env "2.4.0"
+    apollo-server-types "0.2.0"
+
 graphql-iso-date@~3.6.1:
   version "3.6.1"
   resolved "https://registry.yarnpkg.com/graphql-iso-date/-/graphql-iso-date-3.6.1.tgz#bd2d0dc886e0f954cbbbc496bbf1d480b57ffa96"

From d4a054a5e2d43e1483134dac7a689b7fd0e80561 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 17 Jul 2019 04:26:22 +0000
Subject: [PATCH 20/22] Bump eslint-plugin-jest from 22.8.0 to 22.9.0 in
 /webapp

Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 22.8.0 to 22.9.0.
- [Release notes](https://github.com/jest-community/eslint-plugin-jest/releases)
- [Changelog](https://github.com/jest-community/eslint-plugin-jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jest-community/eslint-plugin-jest/compare/v22.8.0...v22.9.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 webapp/package.json | 2 +-
 webapp/yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/webapp/package.json b/webapp/package.json
index 4af679f9d..1a717854b 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -95,7 +95,7 @@
     "eslint-config-standard": "~12.0.0",
     "eslint-loader": "~2.2.1",
     "eslint-plugin-import": "~2.18.0",
-    "eslint-plugin-jest": "~22.8.0",
+    "eslint-plugin-jest": "~22.9.0",
     "eslint-plugin-node": "~9.1.0",
     "eslint-plugin-prettier": "~3.1.0",
     "eslint-plugin-promise": "~4.2.1",
diff --git a/webapp/yarn.lock b/webapp/yarn.lock
index dace72d94..c4a70f789 100644
--- a/webapp/yarn.lock
+++ b/webapp/yarn.lock
@@ -4320,10 +4320,10 @@ eslint-plugin-import@~2.18.0:
     read-pkg-up "^2.0.0"
     resolve "^1.11.0"
 
-eslint-plugin-jest@~22.8.0:
-  version "22.8.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-22.8.0.tgz#242ef5459e8da25d2c41438e95eb546e03d7fae1"
-  integrity sha512-2VftZMfILmlhL3VMq5ptHRIuyyXb3ShDEDb1J1UjvWNzm4l+UK/YmwNuTuJcM0gv8pJuOfiR/8ZptJ8Ou68pFw==
+eslint-plugin-jest@~22.9.0:
+  version "22.9.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-22.9.0.tgz#2573dbcb4f1066b96a6e6d3b9aa439c80b28975a"
+  integrity sha512-V89BUiwf76FHlhj1mlNhNyvpzTy8VbWCh2RZpKYz/XDSl/pcuwFiE/LMt7r3q1sRKygzEMjbYeDob8MMuvakXg==
 
 eslint-plugin-node@~9.1.0:
   version "9.1.0"

From 2342f984ce73345f633fecd408d4a74eacc2e60f Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 17 Jul 2019 04:27:48 +0000
Subject: [PATCH 21/22] Bump eslint-plugin-jest from 22.8.0 to 22.9.0 in
 /backend

Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest) from 22.8.0 to 22.9.0.
- [Release notes](https://github.com/jest-community/eslint-plugin-jest/releases)
- [Changelog](https://github.com/jest-community/eslint-plugin-jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jest-community/eslint-plugin-jest/compare/v22.8.0...v22.9.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 backend/package.json | 2 +-
 backend/yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/backend/package.json b/backend/package.json
index 16b0df487..31a19907e 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -99,7 +99,7 @@
     "eslint-config-prettier": "~6.0.0",
     "eslint-config-standard": "~12.0.0",
     "eslint-plugin-import": "~2.18.0",
-    "eslint-plugin-jest": "~22.8.0",
+    "eslint-plugin-jest": "~22.9.0",
     "eslint-plugin-node": "~9.1.0",
     "eslint-plugin-prettier": "~3.1.0",
     "eslint-plugin-promise": "~4.2.1",
diff --git a/backend/yarn.lock b/backend/yarn.lock
index 23ebc2de3..80fd49be1 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -2989,10 +2989,10 @@ eslint-plugin-import@~2.18.0:
     read-pkg-up "^2.0.0"
     resolve "^1.11.0"
 
-eslint-plugin-jest@~22.8.0:
-  version "22.8.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-22.8.0.tgz#242ef5459e8da25d2c41438e95eb546e03d7fae1"
-  integrity sha512-2VftZMfILmlhL3VMq5ptHRIuyyXb3ShDEDb1J1UjvWNzm4l+UK/YmwNuTuJcM0gv8pJuOfiR/8ZptJ8Ou68pFw==
+eslint-plugin-jest@~22.9.0:
+  version "22.9.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-22.9.0.tgz#2573dbcb4f1066b96a6e6d3b9aa439c80b28975a"
+  integrity sha512-V89BUiwf76FHlhj1mlNhNyvpzTy8VbWCh2RZpKYz/XDSl/pcuwFiE/LMt7r3q1sRKygzEMjbYeDob8MMuvakXg==
 
 eslint-plugin-node@~9.1.0:
   version "9.1.0"

From f7da4a2bdf9d0f800608b0db393023a610653225 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Wed, 17 Jul 2019 09:26:03 +0200
Subject: [PATCH 22/22] Rewrite the Backend test that are doublets to make
 sense

---
 backend/src/schema/resolvers/comments.spec.js | 28 +++++++++++--------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/backend/src/schema/resolvers/comments.spec.js b/backend/src/schema/resolvers/comments.spec.js
index 8ed062728..890ba5feb 100644
--- a/backend/src/schema/resolvers/comments.spec.js
+++ b/backend/src/schema/resolvers/comments.spec.js
@@ -253,7 +253,9 @@ describe('ManageComments', () => {
     describe('authenticated as author', () => {
       beforeEach(async () => {
         headers = await login(authorParams)
-        client = new GraphQLClient(host, { headers })
+        client = new GraphQLClient(host, {
+          headers,
+        })
       })
 
       it('updates the comment', async () => {
@@ -279,10 +281,10 @@ describe('ManageComments', () => {
         )
       })
 
-      it('throws an error if a comment sent from the editor does not contain a single character', async () => {
+      it('throws an error if a comment sent from the editor does not contain a single letter character', async () => {
         updateCommentVariables = {
           id: 'c456',
-          content: '<p></p>',
+          content: '<p> </p>',
         }
 
         await expect(client.request(updateCommentMutation, updateCommentVariables)).rejects.toThrow(
@@ -290,25 +292,25 @@ describe('ManageComments', () => {
         )
       })
 
-      it('throws an error if postId is sent as an empty string', async () => {
+      it('throws an error if commentId is sent as an empty string', async () => {
         updateCommentVariables = {
-          id: 'c456',
-          content: '<p></p>',
+          id: '',
+          content: '<p>Hello</p>',
         }
 
         await expect(client.request(updateCommentMutation, updateCommentVariables)).rejects.toThrow(
-          'Comment must be at least 1 character long!',
+          'Not Authorised!',
         )
       })
 
-      it('throws an error if content is sent as an string of empty characters', async () => {
+      it('throws an error if the comment does not exist in the database', async () => {
         updateCommentVariables = {
-          id: 'c456',
-          content: '<p></p>',
+          id: 'c1000',
+          content: '<p>Hello</p>',
         }
 
         await expect(client.request(updateCommentMutation, updateCommentVariables)).rejects.toThrow(
-          'Comment must be at least 1 character long!',
+          'Not Authorised!',
         )
       })
     })
@@ -357,7 +359,9 @@ describe('ManageComments', () => {
     describe('authenticated as author', () => {
       beforeEach(async () => {
         headers = await login(authorParams)
-        client = new GraphQLClient(host, { headers })
+        client = new GraphQLClient(host, {
+          headers,
+        })
       })
 
       it('deletes the comment', async () => {