Commit cd27350d authored by Sean McGivern's avatar Sean McGivern

Merge branch 'fix-mirror-spec' into 'master'

Remove some racing expectations

Closes #9648

See merge request gitlab-org/gitlab-ee!9490
parents 86cec512 6d71f9f8
...@@ -140,11 +140,8 @@ describe 'Project mirror', :js do ...@@ -140,11 +140,8 @@ describe 'Project mirror', :js do
click_without_sidekiq 'Regenerate key' click_without_sidekiq 'Regenerate key'
find('.js-regenerate-public-ssh-key-confirm-modal .js-confirm').click find('.js-regenerate-public-ssh-key-confirm-modal .js-confirm').click
expect(page).to have_selector(".fa-spinner")
wait_for_requests wait_for_requests
expect(page).not_to have_selector(".fa-spinner")
expect(page).not_to have_content(first_key) expect(page).not_to have_content(first_key)
expect(page).to have_content(import_data.reload.ssh_public_key) expect(page).to have_content(import_data.reload.ssh_public_key)
end end
...@@ -164,11 +161,8 @@ describe 'Project mirror', :js do ...@@ -164,11 +161,8 @@ describe 'Project mirror', :js do
select('Pull', from: 'Mirror direction') select('Pull', from: 'Mirror direction')
click_on 'Detect host keys' click_on 'Detect host keys'
expect(page).to have_selector(".fa-spinner")
wait_for_requests wait_for_requests
expect(page).not_to have_selector(".fa-spinner")
expect(page).to have_content(key.fingerprint) expect(page).to have_content(key.fingerprint)
click_on 'Input host keys manually' click_on 'Input host keys manually'
...@@ -187,11 +181,7 @@ describe 'Project mirror', :js do ...@@ -187,11 +181,7 @@ describe 'Project mirror', :js do
select('Pull', from: 'Mirror direction') select('Pull', from: 'Mirror direction')
click_on 'Detect host keys' click_on 'Detect host keys'
expect(page).to have_selector(".fa-spinner")
wait_for_requests wait_for_requests
expect(page).not_to have_selector(".fa-spinner")
end end
# Appears in the flash # Appears in the flash
......
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