X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/9f0ea60679c5e13ec321572f02afa5d265ce0c46..a45af012b4c0a3f3d92bbe3da4a96356c31e2b4b:/test/integration/client_application_test.rb diff --git a/test/integration/client_application_test.rb b/test/integration/client_application_test.rb index 80da36deb..f34a9c430 100644 --- a/test/integration/client_application_test.rb +++ b/test/integration/client_application_test.rb @@ -17,10 +17,13 @@ class ClientApplicationTest < ActionController::IntegrationTest follow_redirect! assert_response :success assert_template 'user/view' + get '/user/test2/account' + assert_response :success + assert_template 'user/account' # check that the form to allow new client application creations exists - assert_in_body do - assert_select "a[href='/user/test2/oauth_clients']" + assert_in_heading do + assert_select "ul.secondary-actions li a[href='/user/test2/oauth_clients']" end # now we follow the link to the oauth client list @@ -33,8 +36,10 @@ class ClientApplicationTest < ActionController::IntegrationTest # now we follow the link to the new oauth client page get '/user/test2/oauth_clients/new' assert_response :success - assert_in_body do + assert_in_heading do assert_select "h1", "Register a new application" + end + assert_in_body do assert_select "form[action='/user/test2/oauth_clients']" do [ :name, :url, :callback_url, :support_url ].each do |inp| assert_select "input[name=?]", "client_application[#{inp}]" @@ -71,6 +76,20 @@ class ClientApplicationTest < ActionController::IntegrationTest # tests, as its too tied into the HTTP headers and stuff that it signs. end + ## + # utility method to make the HTML screening easier to read. + def assert_in_heading + assert_select "html:root" do + assert_select "body" do + assert_select "div.wrapper" do + assert_select "div.content-heading" do + yield + end + end + end + end + end + ## # utility method to make the HTML screening easier to read. def assert_in_body