Add latest changes from gitlab-org/gitlab@master

2 files changed, 4 insertions, 1 deletions

diff --git a/app/assets/javascripts/design_management/components/design_overlay.vue b/app/assets/javascripts/design_management/components/design_overlay.vue
index 674415ec449..4ce6395140e 100644
--- a/app/assets/javascripts/design_management/components/design_overlay.vue
+++ b/app/assets/javascripts/design_management/components/design_overlay.vue
@@ -262,6 +262,7 @@ export default {
   <div
     class="gl-absolute gl-top-0 gl-left-0 frame"
     :style="overlayStyle"
+    data-testid="design-overlay"
     @mousemove="onOverlayMousemove"
     @mouseleave="onNoteMouseup"
   >
@@ -287,6 +288,7 @@ export default {
       :is-inactive="isNoteInactive(note)"
       :is-resolved="note.resolved"
       is-on-image
+      data-testid="note-pin"
       @mousedown.stop="onNoteMousedown($event, note)"
       @mouseup.stop="onNoteMouseup(note)"
     />
@@ -294,6 +296,7 @@ export default {
     <design-note-pin
       v-if="currentCommentForm"
       :position="currentCommentPositionStyle"
+      data-testid="comment-badge"
       @mousedown.stop="onNoteMousedown"
       @mouseup.stop="onNoteMouseup"
     />
diff --git a/app/assets/javascripts/design_management/graphql.js b/app/assets/javascripts/design_management/graphql.js
index 8c44c5a5d0a..cef2d5e1a18 100644
--- a/app/assets/javascripts/design_management/graphql.js
+++ b/app/assets/javascripts/design_management/graphql.js
@@ -14,7 +14,7 @@ import { CREATE_DESIGN_TODO_EXISTS_ERROR } from './utils/error_messages';
 
 Vue.use(VueApollo);
 
-const resolvers = {
+export const resolvers = {
   Mutation: {
     updateActiveDiscussion: (_, { id = null, source }, { cache }) => {
       const sourceData = cache.readQuery({ query: activeDiscussionQuery });