From 4c3b7287573298deaa523080fc1877393dc5c58a Mon Sep 17 00:00:00 2001 From: Rodrigo Virgilio Date: Sat, 8 Aug 2026 13:41:08 +0100 Subject: [PATCH] Fix flaky system tests for account request and partner group editing --- spec/system/account_request_system_spec.rb | 10 ++++++---- spec/system/partner_system_spec.rb | 7 ++++--- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/spec/system/account_request_system_spec.rb b/spec/system/account_request_system_spec.rb index d34dd86673..4350df53bf 100644 --- a/spec/system/account_request_system_spec.rb +++ b/spec/system/account_request_system_spec.rb @@ -35,12 +35,14 @@ expect(AccountRequest.count).to eq(0) - expect { click_button 'Submit' }.to change(AccountRequest, :count).by(1) + click_button 'Submit' - created_account_request = AccountRequest.last - - # Request Received + # Wait for the redirect before asserting on the count, otherwise the + # async form submission may not have been processed yet. expect(page).to have_content('Request Received!') + expect(AccountRequest.count).to eq(1) + + created_account_request = AccountRequest.last expect(page).to have_content("We've sent you a email with instructions on next steps at #{created_account_request.email}!") # Access link within email they would have received diff --git a/spec/system/partner_system_spec.rb b/spec/system/partner_system_spec.rb index 2e525e4136..d4c9d1d9fe 100644 --- a/spec/system/partner_system_spec.rb +++ b/spec/system/partner_system_spec.rb @@ -766,9 +766,10 @@ def post_refresh visit partners_path click_on 'Groups' - assert page.has_content? existing_partner_group.name, wait: page_content_wait - - click_on 'Edit' + within '#nav-partner-groups', wait: page_content_wait do + assert page.has_content? existing_partner_group.name + click_on 'Edit' + end post_refresh end