Merge branch 'master' of gitlab_gitlab:gitlab-org/gitlab-cerunner-metrics-extractor

1 files changed, 20 insertions, 2 deletions

diff --git a/qa/qa/page/component/note.rb b/qa/qa/page/component/note.rb
index 07e191f1c9b..34fde045091 100644
--- a/qa/qa/page/component/note.rb
+++ b/qa/qa/page/component/note.rb
@@ -10,19 +10,27 @@ 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
           end
 
           base.view 'app/assets/javascripts/notes/components/discussion_actions.vue' do
-            element :discussion_reply
+            element :discussion_reply_tab
           end
 
           base.view 'app/assets/javascripts/notes/components/toggle_replies_widget.vue' do
             element :expand_replies
             element :collapse_replies
           end
+
+          base.view 'app/assets/javascripts/diffs/components/diff_file_header.vue' do
+            element :toggle_comments_button
+          end
         end
 
         def start_discussion(text)
@@ -32,8 +40,12 @@ module QA
           click_element :comment_button
         end
 
+        def toggle_comments
+          all_elements(:toggle_comments_button).last.click
+        end
+
         def type_reply_to_discussion(reply_text)
-          all_elements(:discussion_reply).last.click
+          all_elements(:discussion_reply_tab).last.click
           fill_element :reply_input, reply_text
         end
 
@@ -49,6 +61,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