VladPolskiy/gitlabhq
1
0
Fork 0
mirror of https://github.com/gitlabhq/gitlabhq.git synced 2025-08-20 16:30:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add latest changes from gitlab-org/gitlab@master

Browse Source
This commit is contained in:
GitLab Bot
2020-01-07 06:08:04 +00:00
parent 3a593ca70b
commit 7d81614e3f
3 changed files with 29 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/assets/javascripts/mr_tabs_popover/components/popover.vue
View File

@ -57,7 +57,12 @@ export default {
<icon name="external-link" :size="10" /> <icon name="external-link" :size="10" />
</gl-link> </gl-link>
</p> </p>
<gl-button variant="primary" size="sm" @click="onDismiss"> <gl-button
variant="primary"
size="sm"
data-qa-selector="dismiss_popover_button"
@click="onDismiss"
>
{{ __('Got it') }} {{ __('Got it') }}
</gl-button> </gl-button>
</gl-popover> </gl-popover>

2
app/assets/javascripts/vue_shared/components/notes/skeleton_note.vue
View File

@ -12,7 +12,7 @@ export default {
</script> </script>
<template> <template>
<timeline-entry-item class="note note-wrapper"> <timeline-entry-item class="note note-wrapper" data-qa-selector="skeleton_note">
<div class="timeline-icon"></div> <div class="timeline-icon"></div>
<div class="timeline-content"> <div class="timeline-content">
<div class="note-header"></div> <div class="note-header"></div>

30
qa/qa/page/merge_request/show.rb
View File

@ -6,6 +6,10 @@ module QA
class Show < Page::Base class Show < Page::Base
include Page::Component::Note include Page::Component::Note
view 'app/assets/javascripts/mr_tabs_popover/components/popover.vue' do
element :dismiss_popover_button
end
view 'app/assets/javascripts/vue_merge_request_widget/components/mr_widget_header.vue' do view 'app/assets/javascripts/vue_merge_request_widget/components/mr_widget_header.vue' do
element :dropdown_toggle element :dropdown_toggle
element :download_email_patches element :download_email_patches
@ -42,6 +46,10 @@ module QA
element :squash_checkbox element :squash_checkbox
end end
view 'app/assets/javascripts/vue_shared/components/notes/skeleton_note.vue' do
element :skeleton_note
end
view 'app/views/projects/merge_requests/show.html.haml' do view 'app/views/projects/merge_requests/show.html.haml' do
element :notes_tab element :notes_tab
element :diffs_tab element :diffs_tab
@ -69,28 +77,30 @@ module QA
has_text?("No newline at end of file") has_text?("No newline at end of file")
end end
all_elements(:new_diff_line).first.hover all_elements(:new_diff_line).first.hover
click_element :diff_comment click_element(:diff_comment)
fill_element :reply_input, text fill_element(:reply_input, text)
end end
def click_discussions_tab def click_discussions_tab
click_element :notes_tab click_element(:notes_tab)
finished_loading? wait_for_loading
end end
def click_diffs_tab def click_diffs_tab
click_element :diffs_tab click_element(:diffs_tab)
finished_loading? wait_for_loading
click_element(:dismiss_popover_button) if has_element?(:dismiss_popover_button)
end end
def click_pipeline_link def click_pipeline_link
click_element :pipeline_link click_element(:pipeline_link)
end end
def edit! def edit!
click_element :edit_button click_element(:edit_button)
end end
def fast_forward_possible? def fast_forward_possible?
@ -203,6 +213,10 @@ module QA
has_element?(:merge_request_error_content) has_element?(:merge_request_error_content)
end end
end end
def wait_for_loading
finished_loading? && has_no_element?(:skeleton_note)
end
end end
end end
end end