Automatic merge of gitlab-org/gitlab-ce master

app/assets/javascripts/notes/components/note_actions.vue

@@ -165,7 +165,7 @@ export default {
         v-gl-tooltip
         type="button"
         title="Edit comment"
-        class="note-action-button js-note-edit btn btn-transparent"
+        class="note-action-button js-note-edit btn btn-transparent qa-note-edit-button"
         @click="onEdit"
       >
         <icon name="pencil" css-classes="link-highlight" />

qa/qa/page/component/note.rb

@@ -10,6 +10,10 @@ module QA
             element :discussion_option
           end
 
+          base.view 'app/assets/javascripts/notes/components/note_actions.vue' do
+            element :note_edit_button
+          end
+
           base.view 'app/assets/javascripts/notes/components/note_form.vue' do
             element :reply_input
             element :reply_comment_button
@@ -49,6 +53,12 @@ module QA
         def expand_replies
           click_element :expand_replies
         end
+
+        def edit_comment(text)
+          click_element :note_edit_button
+          fill_element :reply_input, text
+          click_element :reply_comment_button
+        end
       end
     end
   end

qa/qa/specs/features/browser_ui/2_plan/issue/comment_issue_spec.rb

+# frozen_string_literal: true
+
+module QA
+  context 'Plan' do
+    describe 'Issue comments' do
+      it 'user comments on an issue and edits the comment' do
+        Runtime::Browser.visit(:gitlab, Page::Main::Login)
+        Page::Main::Login.act { sign_in_using_credentials }
+
+        issue = Resource::Issue.fabricate_via_api! do |issue|
+          issue.title = 'issue title'
+        end
+        issue.visit!
+
+        Page::Project::Issue::Show.perform do |issue_show_page|
+          first_version_of_comment = 'First version of the comment'
+          second_version_of_comment = 'Second version of the comment'
+
+          issue_show_page.comment(first_version_of_comment)
+
+          expect(issue_show_page).to have_content(first_version_of_comment)
+
+          issue_show_page.edit_comment(second_version_of_comment)
+
+          expect(issue_show_page).to have_content(second_version_of_comment)
+          expect(issue_show_page).not_to have_content(first_version_of_comment)
+        end
+      end
+    end
+  end
+end