Merge branch 'qa-staging-33-wait-for-viewers-to-load' into 'master'
Fix push_http_private_token_spec by waiting for viewers to load Closes gitlab-org/quality/staging#33 See merge request gitlab-org/gitlab-ce!25030
This commit is contained in:
commit
d5e9eef08d
|
@ -1,2 +1,2 @@
|
||||||
.text-center.prepend-top-default.append-bottom-default
|
.text-center.prepend-top-default.append-bottom-default
|
||||||
= icon('spinner spin 2x', 'aria-hidden' => 'true', 'aria-label' => 'Loading content…')
|
= icon('spinner spin 2x', 'aria-hidden' => 'true', 'aria-label' => 'Loading content…', class: 'qa-spinner')
|
||||||
|
|
|
@ -51,6 +51,16 @@ module QA
|
||||||
element :branches_dropdown
|
element :branches_dropdown
|
||||||
end
|
end
|
||||||
|
|
||||||
|
view 'app/views/projects/blob/viewers/_loading.html.haml' do
|
||||||
|
element :spinner
|
||||||
|
end
|
||||||
|
|
||||||
|
def wait_for_viewers_to_load
|
||||||
|
wait(reload: false) do
|
||||||
|
has_no_element?(:spinner)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
def create_first_new_file!
|
def create_first_new_file!
|
||||||
within_element(:quick_actions) do
|
within_element(:quick_actions) do
|
||||||
click_link_with_text 'New file'
|
click_link_with_text 'New file'
|
||||||
|
|
|
@ -22,7 +22,11 @@ module QA
|
||||||
end
|
end
|
||||||
|
|
||||||
push.project.visit!
|
push.project.visit!
|
||||||
Page::Project::Show.perform(&:wait_for_push)
|
|
||||||
|
Page::Project::Show.perform do |page|
|
||||||
|
page.wait_for_push
|
||||||
|
page.wait_for_viewers_to_load
|
||||||
|
end
|
||||||
|
|
||||||
expect(page).to have_content('README.md')
|
expect(page).to have_content('README.md')
|
||||||
expect(page).to have_content('This is a test project')
|
expect(page).to have_content('This is a test project')
|
||||||
|
|
Loading…
Reference in New Issue