Merge branch 'ml-qa-retry-visit' into 'master'

Retry visiting URL if not successful

Closes #35707

See merge request gitlab-org/gitlab!19732

qa/qa/resource/base.rb

@@ -64,7 +64,13 @@ module QA
       end
 
       def visit!
-        visit(web_url)
+        Runtime::Logger.debug("Visiting #{web_url}")
+
+        Support::Retrier.retry_until do
+          visit(web_url)
+
+          wait { current_url == web_url }
+        end
       end
 
       def populate(*attributes)
@@ -72,7 +78,9 @@ module QA
       end
 
       def wait(max: 60, interval: 0.1)
-        QA::Support::Waiter.wait(max: max, interval: interval)
+        QA::Support::Waiter.wait(max: max, interval: interval) do
+          yield
+        end
       end
 
       private

qa/spec/resource/base_spec.rb

@@ -269,6 +269,8 @@ describe QA::Resource::Base do
     end
 
     it 'calls #visit with the underlying #web_url' do
+      allow(resource).to receive(:current_url).and_return(subject.current_url)
+
       resource.web_url = subject.current_url
       resource.visit!