diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-19 01:45:44 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-19 01:45:44 +0000 |
commit | 85dc423f7090da0a52c73eb66faf22ddb20efff9 (patch) | |
tree | 9160f299afd8c80c038f08e1545be119f5e3f1e1 /qa/qa/page/merge_request/show.rb | |
parent | 15c2c8c66dbe422588e5411eee7e68f1fa440bb8 (diff) | |
download | gitlab-ce-85dc423f7090da0a52c73eb66faf22ddb20efff9.tar.gz |
Add latest changes from gitlab-org/gitlab@13-4-stable-ee
Diffstat (limited to 'qa/qa/page/merge_request/show.rb')
-rw-r--r-- | qa/qa/page/merge_request/show.rb | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/qa/qa/page/merge_request/show.rb b/qa/qa/page/merge_request/show.rb index 906ad490bb1..0b80ba84fa4 100644 --- a/qa/qa/page/merge_request/show.rb +++ b/qa/qa/page/merge_request/show.rb @@ -8,7 +8,7 @@ module QA include Page::Component::Issuable::Sidebar view 'app/assets/javascripts/vue_merge_request_widget/components/mr_widget_header.vue' do - element :dropdown_toggle + element :download_dropdown element :download_email_patches element :download_plain_diff element :open_in_web_ide_button @@ -53,10 +53,6 @@ module QA element :diffs_tab end - view 'app/assets/javascripts/diffs/components/diff_table_cell.vue' do - element :diff_comment - end - view 'app/assets/javascripts/diffs/components/inline_diff_table_row.vue' do element :new_diff_line end @@ -131,7 +127,7 @@ module QA def add_comment_to_diff(text) wait_until(sleep_interval: 5) do - has_text?("No newline at end of file") + has_css?('a[data-linenumber="1"]') end all_elements(:new_diff_line, minimum: 1).first.hover click_element(:diff_comment) @@ -255,12 +251,12 @@ module QA end def view_email_patches - click_element :dropdown_toggle + click_element :download_dropdown visit_link_in_element(:download_email_patches) end def view_plain_diff - click_element :dropdown_toggle + click_element :download_dropdown visit_link_in_element(:download_plain_diff) end @@ -275,7 +271,8 @@ module QA end def click_open_in_web_ide - click_element :open_in_web_ide_button + click_element(:open_in_web_ide_button) + wait_for_requests end end end |