Commit 42abd4b9 authored by Douglas Barbosa Alexandre's avatar Douglas Barbosa Alexandre

Merge branch 'fix_hung_request_specs_when_fully_decomposed' into 'master'

Fix hanging feature specs when decomposed

See merge request gitlab-org/gitlab!81112
parents 3ea580ea ffed8986
...@@ -11,6 +11,8 @@ RSpec.describe "Admin Runners" do ...@@ -11,6 +11,8 @@ RSpec.describe "Admin Runners" do
admin = create(:admin) admin = create(:admin)
sign_in(admin) sign_in(admin)
gitlab_enable_admin_mode_sign_in(admin) gitlab_enable_admin_mode_sign_in(admin)
wait_for_requests
end end
describe "Runners page", :js do describe "Runners page", :js do
......
...@@ -13,6 +13,8 @@ RSpec.describe 'Expand and collapse diffs', :js do ...@@ -13,6 +13,8 @@ RSpec.describe 'Expand and collapse diffs', :js do
sign_in(admin) sign_in(admin)
gitlab_enable_admin_mode_sign_in(admin) gitlab_enable_admin_mode_sign_in(admin)
wait_for_requests
# Ensure that undiffable.md is in .gitattributes # Ensure that undiffable.md is in .gitattributes
project.repository.copy_gitattributes(branch) project.repository.copy_gitattributes(branch)
visit project_commit_path(project, project.commit(branch)) visit project_commit_path(project, project.commit(branch))
......
...@@ -17,6 +17,8 @@ RSpec.describe 'Triggers', :js do ...@@ -17,6 +17,8 @@ RSpec.describe 'Triggers', :js do
@project.add_guest(guest_user) @project.add_guest(guest_user)
visit project_settings_ci_cd_path(@project) visit project_settings_ci_cd_path(@project)
wait_for_requests
end end
shared_examples 'triggers page' do shared_examples 'triggers page' do
......
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