Commit beba8dea authored by Ramya Authappan's avatar Ramya Authappan

Merge branch 'qa-fix-wait-on-relalted-issue' into 'master'

Fix hit miss of "Show all activity" button

Closes gitlab-org/quality/nightly#66

See merge request gitlab-org/gitlab-ee!9314
parents d38d3a37 2497cfbb
...@@ -214,7 +214,7 @@ export default { ...@@ -214,7 +214,7 @@ export default {
}" }"
class="related-issues-token-body" class="related-issues-token-body"
> >
<div v-if="isFetching" class="related-issues-loading-icon"> <div v-if="isFetching" class="related-issues-loading-icon qa-related-issues-loading-icon">
<gl-loading-icon <gl-loading-icon
ref="loadingIcon" ref="loadingIcon"
label="Fetching related issues" label="Fetching related issues"
......
...@@ -56,6 +56,7 @@ module QA ...@@ -56,6 +56,7 @@ module QA
module Issue module Issue
autoload :Index, 'qa/ee/page/project/issue/index' autoload :Index, 'qa/ee/page/project/issue/index'
autoload :Show, 'qa/ee/page/project/issue/show'
end end
module Settings module Settings
......
# frozen_string_literal: true
module QA
module EE
module Page
module Project
module Issue
module Show
def self.prepended(page)
page.module_eval do
view 'ee/app/assets/javascripts/related_issues/components/related_issues_block.vue' do
element :related_issues_loading_icon
end
end
end
def wait_for_related_issues_to_load
wait(reload: false) do
has_no_element?(:related_issues_loading_icon)
end
end
end
end
end
end
end
end
...@@ -5,6 +5,7 @@ module QA ...@@ -5,6 +5,7 @@ module QA
module Project module Project
module Issue module Issue
class Show < Page::Base class Show < Page::Base
prepend QA::EE::Page::Project::Issue::Show
include Page::Component::Issuable::Common include Page::Component::Issuable::Common
include Page::Component::Note include Page::Component::Note
......
...@@ -49,6 +49,7 @@ module QA ...@@ -49,6 +49,7 @@ module QA
issue.visit! issue.visit!
Page::Project::Issue::Show.perform do |show_page| Page::Project::Issue::Show.perform do |show_page|
show_page.wait_for_related_issues_to_load
show_page.select_all_activities_filter show_page.select_all_activities_filter
show_page.comment("/epic #{epic.web_url}") show_page.comment("/epic #{epic.web_url}")
show_page.comment("/remove_epic") show_page.comment("/remove_epic")
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment