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

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

diff --git a/test/integration/client_applications_test.rb b/test/integration/client_applications_test.rb
index 269d3633d0f8dc9c4568187b138184789fd004e4..ee6d277bb66681b393d83984570e66f91f666362 100644 (file)
--- a/test/integration/client_applications_test.rb
+++ b/test/integration/client_applications_test.rb
@@ -17,9 +17,9 @@ class ClientApplicationsTest < ActionDispatch::IntegrationTest
     follow_redirect!
     assert_response :success
     assert_template "users/show"
     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_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
 
     # check that the form to allow new client application creations exists
     assert_in_heading do


@@ -65,7 +65,7 @@ class ClientApplicationsTest < ActionDispatch::IntegrationTest
     get "/user/#{ERB::Util.u(user.display_name)}/oauth_clients"
     assert_response :success
     assert_template "oauth_clients/index"
     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" }
+    assert_in_body { assert_select "li>a", "My New App" }

   end
 
   ##
   end
 
   ##