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

[rails.git] / test / integration / user_roles_test.rb

diff --git a/test/integration/user_roles_test.rb b/test/integration/user_roles_test.rb
index 3f6c242488e73136b63b5ff8a461cc367d98d8c4..000ea0316082041096b216301e5c3a81d897facf 100644 (file)
--- a/test/integration/user_roles_test.rb
+++ b/test/integration/user_roles_test.rb
@@ -32,7 +32,7 @@ class UserRolesTest < ActionDispatch::IntegrationTest
     assert_response :success
 
     target_user = create(:user)
-    post "/user/#{URI.encode(target_user.display_name)}/role/#{role}/#{action}"
+    post "/user/#{ERB::Util.u(target_user.display_name)}/role/#{role}/#{action}"
     assert_redirected_to :controller => "user", :action => "view", :display_name => target_user.display_name
 
     reset!
@@ -50,7 +50,7 @@ class UserRolesTest < ActionDispatch::IntegrationTest
     assert_response :success
 
     target_user = create(:user)
-    post "/user/#{URI.encode(target_user.display_name)}/role/#{role}/#{action}"
+    post "/user/#{ERB::Util.u(target_user.display_name)}/role/#{role}/#{action}"
     assert_redirected_to :controller => "user", :action => "view", :display_name => target_user.display_name
 
     reset!