From: Tom Hughes <tom@compton.nu>
Date: Sun, 21 Jan 2024 14:43:17 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/4490'
X-Git-Tag: live~1578
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/cef7d82c729ffcd1ddd05eabfef8314ce884789d?hp=ebbebf8e570f44faf2e8e3715481f0364dae83e1

Merge remote-tracking branch 'upstream/pull/4490'
---

diff --git a/test/test_helper.rb b/test/test_helper.rb
index 9d06d2353..222e65764 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -243,9 +243,11 @@ module ActiveSupport
 
     def sign_in_as(user)
       visit login_path
-      fill_in "username", :with => user.email
-      fill_in "password", :with => "test"
-      click_on "Login", :match => :first
+      within "form", :text => "Email Address or Username" do
+        fill_in "username", :with => user.email
+        fill_in "password", :with => "test"
+        click_on "Login"
+      end
     end
 
     def session_for(user)