X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/124ec2e9d560e0df291e5a8e5aa67ef5db2f5d46..18e418cc4c01ba1ea17daa1bf114e1fd05328df1:/test/integration/client_applications_test.rb

diff --git a/test/integration/client_applications_test.rb b/test/integration/client_applications_test.rb
index 83325657c..b50a990c6 100644
--- a/test/integration/client_applications_test.rb
+++ b/test/integration/client_applications_test.rb
@@ -9,38 +9,38 @@ class ClientApplicationsTest < ActionDispatch::IntegrationTest
 
     get "/login"
     assert_response :redirect
-    assert_redirected_to "controller" => "user", "action" => "login", "cookie_test" => "true"
+    assert_redirected_to "controller" => "users", "action" => "login", "cookie_test" => "true"
     follow_redirect!
     assert_response :success
-    post "/login", "username" => user.email, "password" => "test", :referer => "/user/#{URI.encode(user.display_name)}"
+    post "/login", :params => { "username" => user.email, "password" => "test", :referer => "/user/#{ERB::Util.u(user.display_name)}" }
     assert_response :redirect
     follow_redirect!
     assert_response :success
-    assert_template "user/view"
-    get "/user/#{URI.encode(user.display_name)}/account"
+    assert_template "users/show"
+    get "/user/#{ERB::Util.u(user.display_name)}/account"
     assert_response :success
-    assert_template "user/account"
+    assert_template "users/account"
 
     # check that the form to allow new client application creations exists
     assert_in_heading do
-      assert_select "ul.secondary-actions li a[href='/user/#{URI.encode(user.display_name)}/oauth_clients']"
+      assert_select "ul.secondary-actions li a[href='/user/#{ERB::Util.u(user.display_name)}/oauth_clients']"
     end
 
     # now we follow the link to the oauth client list
-    get "/user/#{URI.encode(user.display_name)}/oauth_clients"
+    get "/user/#{ERB::Util.u(user.display_name)}/oauth_clients"
     assert_response :success
     assert_in_body do
-      assert_select "a[href='/user/#{URI.encode(user.display_name)}/oauth_clients/new']"
+      assert_select "a[href='/user/#{ERB::Util.u(user.display_name)}/oauth_clients/new']"
     end
 
     # now we follow the link to the new oauth client page
-    get "/user/#{URI.encode(user.display_name)}/oauth_clients/new"
+    get "/user/#{ERB::Util.u(user.display_name)}/oauth_clients/new"
     assert_response :success
     assert_in_heading do
       assert_select "h1", "Register a new application"
     end
     assert_in_body do
-      assert_select "form[action='/user/#{URI.encode(user.display_name)}/oauth_clients']" do
+      assert_select "form[action='/user/#{ERB::Util.u(user.display_name)}/oauth_clients']" do
         [:name, :url, :callback_url, :support_url].each do |inp|
           assert_select "input[name=?]", "client_application[#{inp}]"
         end
@@ -50,10 +50,11 @@ class ClientApplicationsTest < ActionDispatch::IntegrationTest
       end
     end
 
-    post "/user/#{URI.encode(user.display_name)}/oauth_clients", "client_application[name]" => "My New App",
-                                                                 "client_application[url]" => "http://my.new.app.org/",
-                                                                 "client_application[callback_url]" => "http://my.new.app.org/callback",
-                                                                 "client_application[support_url]" => "http://my.new.app.org/support"
+    post "/user/#{ERB::Util.u(user.display_name)}/oauth_clients",
+         :params => { "client_application[name]" => "My New App",
+                      "client_application[url]" => "http://my.new.app.org/",
+                      "client_application[callback_url]" => "http://my.new.app.org/callback",
+                      "client_application[support_url]" => "http://my.new.app.org/support" }
     assert_response :redirect
     follow_redirect!
     assert_response :success
@@ -61,7 +62,7 @@ class ClientApplicationsTest < ActionDispatch::IntegrationTest
     assert_equal "Registered the information successfully", flash[:notice]
 
     # now go back to the account page and check its listed under this user
-    get "/user/#{URI.encode(user.display_name)}/oauth_clients"
+    get "/user/#{ERB::Util.u(user.display_name)}/oauth_clients"
     assert_response :success
     assert_template "oauth_clients/index"
     assert_in_body { assert_select "div>a", "My New App" }