X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/75e135869e26a1aeae93f3334668de01c3bb2f69..87ea9fcb021b9b67a79d35cb719a064a34a7784d:/test/integration/client_applications_test.rb diff --git a/test/integration/client_applications_test.rb b/test/integration/client_applications_test.rb index 4c3e9df47..0ac15759e 100644 --- a/test/integration/client_applications_test.rb +++ b/test/integration/client_applications_test.rb @@ -9,7 +9,7 @@ class ClientApplicationsTest < ActionDispatch::IntegrationTest get "/login" assert_response :redirect - assert_redirected_to "controller" => "users", "action" => "login", "cookie_test" => "true" + assert_redirected_to login_path(:cookie_test => "true") follow_redirect! assert_response :success post "/login", :params => { "username" => user.email, "password" => "test", :referer => "/user/#{ERB::Util.u(user.display_name)}" } @@ -17,13 +17,13 @@ class ClientApplicationsTest < ActionDispatch::IntegrationTest follow_redirect! assert_response :success assert_template "users/show" - get "/user/#{ERB::Util.u(user.display_name)}/account" + get "/account/edit" assert_response :success - assert_template "users/account" + assert_template "accounts/edit" # check that the form to allow new client application creations exists assert_in_heading do - assert_select "ul.secondary-actions li a[href='/user/#{ERB::Util.u(user.display_name)}/oauth_clients']" + assert_select "ul.nav.nav-tabs li.nav-item a[href='/user/#{ERB::Util.u(user.display_name)}/oauth_clients']" end # now we follow the link to the oauth client list @@ -76,6 +76,8 @@ class ClientApplicationsTest < ActionDispatch::IntegrationTest # tests, as its too tied into the HTTP headers and stuff that it signs. end + private + ## # utility method to make the HTML screening easier to read. def assert_in_heading(&block)