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

[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 f8055ebc76f7d8d7616514b7f211b0a8eb2ccd02..e7e5b75759b2ab58b743f3562159196306d0ee90 100644 (file)
--- a/test/integration/client_applications_test.rb
+++ b/test/integration/client_applications_test.rb
@@ -8,7 +8,6 @@ class ClientApplicationsTest < ActionDispatch::IntegrationTest
     user = create(:user)
 
     get "/login"
-    assert_response :redirect
     assert_redirected_to login_path(:cookie_test => "true")
     follow_redirect!
     assert_response :success
@@ -17,13 +16,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
@@ -65,7 +64,7 @@ class ClientApplicationsTest < ActionDispatch::IntegrationTest
     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
 
   ##