X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/e657cff464b6db8384b56236ad9491223a22b1e2..6235025f19d04e2ba99085657c672b8d577c013a:/test/integration/client_application_test.rb diff --git a/test/integration/client_application_test.rb b/test/integration/client_application_test.rb index 0af226085..80da36deb 100644 --- a/test/integration/client_application_test.rb +++ b/test/integration/client_application_test.rb @@ -7,24 +7,35 @@ class ClientApplicationTest < ActionController::IntegrationTest # run through the procedure of creating a client application and checking # that it shows up on the user's account page. def test_create_application - post '/login', {'user[email]' => "test@example.com", 'user[password]' => "test", :referer => '/user/test/account'} + get '/login' assert_response :redirect + assert_redirected_to "controller" => "user", "action" => "login", "cookie_test" => "true" follow_redirect! assert_response :success - assert_template 'user/account' + post '/login', {'username' => "test@example.com", 'password' => "test", :referer => '/user/test2'} + assert_response :redirect + follow_redirect! + assert_response :success + assert_template 'user/view' # check that the form to allow new client application creations exists assert_in_body do - assert_select "h2", "Application Developers" - assert_select "a[href='/oauth_clients/new']" + assert_select "a[href='/user/test2/oauth_clients']" + end + + # now we follow the link to the oauth client list + get '/user/test2/oauth_clients' + assert_response :success + assert_in_body do + assert_select "a[href='/user/test2/oauth_clients/new']" end # now we follow the link to the new oauth client page - get '/oauth_clients/new' + get '/user/test2/oauth_clients/new' assert_response :success assert_in_body do assert_select "h1", "Register a new application" - assert_select "form[action='/oauth_clients']" 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}]" end @@ -34,7 +45,7 @@ class ClientApplicationTest < ActionController::IntegrationTest end end - post '/oauth_clients', { + post '/user/test2/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', @@ -46,10 +57,10 @@ class ClientApplicationTest < ActionController::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/test/account' + get '/user/test2/oauth_clients' assert_response :success - assert_template 'user/account' - assert_in_body { assert_select "li>div>a", "My New App" } + assert_template 'oauth_clients/index' + assert_in_body { assert_select "div>a", "My New App" } end ##