summaryrefslogtreecommitdiff
path: root/qa/qa/page/component
diff options
context:
space:
mode:
authorTomislav Nikic <tnikic@gitlab.com>2019-07-27 04:23:34 +0000
committerDan Davison <ddavison@gitlab.com>2019-07-27 04:23:34 +0000
commit972573e35183c50de37ce7eec1346f20a23bfca1 (patch)
tree6e3cd1f16ea85a79f04ef4c4f494a7ab5d0fa4c9 /qa/qa/page/component
parent7dccb44448aed3227072154f2385383c54f2d4f6 (diff)
downloadgitlab-ce-972573e35183c50de37ce7eec1346f20a23bfca1.tar.gz
Adding changes to CE from EE
All the changes done to files that are also inside CE and need to be ported.
Diffstat (limited to 'qa/qa/page/component')
-rw-r--r--qa/qa/page/component/note.rb12
1 files changed, 10 insertions, 2 deletions
diff --git a/qa/qa/page/component/note.rb b/qa/qa/page/component/note.rb
index fe324574f4d..34fde045091 100644
--- a/qa/qa/page/component/note.rb
+++ b/qa/qa/page/component/note.rb
@@ -20,13 +20,17 @@ module QA
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)
@@ -36,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