Commit d5e9eef0 authored by Mark Lapierre's avatar Mark Lapierre

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
parents c220bee5 b4c2dd73
.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
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!
within_element(:quick_actions) do
click_link_with_text 'New file'
......
......@@ -22,7 +22,11 @@ module QA
end
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('This is a test project')
......
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