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

[rails.git] / test / controllers / oauth2_authorized_applications_controller_test.rb

diff --git a/test/controllers/oauth2_authorized_applications_controller_test.rb b/test/controllers/oauth2_authorized_applications_controller_test.rb
index c01f7d6f325c55e8a2bbd33d09ce29cb03163911..584d00ce859992958c3749f97e0218abfdb85085 100644 (file)
--- a/test/controllers/oauth2_authorized_applications_controller_test.rb
+++ b/test/controllers/oauth2_authorized_applications_controller_test.rb
@@ -25,7 +25,6 @@ class Oauth2AuthorizedApplicationsControllerTest < ActionDispatch::IntegrationTe
     create(:oauth_application)
 
     get oauth_authorized_applications_path
     create(:oauth_application)
 
     get oauth_authorized_applications_path

-    assert_response :redirect

     assert_redirected_to login_path(:referer => oauth_authorized_applications_path)
 
     session_for(user)
     assert_redirected_to login_path(:referer => oauth_authorized_applications_path)
 
     session_for(user)


@@ -45,7 +44,6 @@ class Oauth2AuthorizedApplicationsControllerTest < ActionDispatch::IntegrationTe
     create(:oauth_access_token, :resource_owner_id => user.id, :application => application1, :scopes => %w[read_prefs write_diary])
 
     get oauth_authorized_applications_path
     create(:oauth_access_token, :resource_owner_id => user.id, :application => application1, :scopes => %w[read_prefs write_diary])
 
     get oauth_authorized_applications_path

-    assert_response :redirect

     assert_redirected_to login_path(:referer => oauth_authorized_applications_path)
 
     session_for(user)
     assert_redirected_to login_path(:referer => oauth_authorized_applications_path)
 
     session_for(user)


@@ -58,7 +56,7 @@ class Oauth2AuthorizedApplicationsControllerTest < ActionDispatch::IntegrationTe
       assert_select "li", :count => 3
       assert_select "li", :text => "Read user preferences"
       assert_select "li", :text => "Modify user preferences"
       assert_select "li", :count => 3
       assert_select "li", :text => "Read user preferences"
       assert_select "li", :text => "Modify user preferences"

-      assert_select "li", :text => "Create diary entries, comments and make friends"
+      assert_select "li", :text => "Create diary entries and comments"

     end
   end
 
     end
   end
 


@@ -78,7 +76,6 @@ class Oauth2AuthorizedApplicationsControllerTest < ActionDispatch::IntegrationTe
     session_for(user)
 
     delete oauth_authorized_application_path(:id => application1.id)
     session_for(user)
 
     delete oauth_authorized_application_path(:id => application1.id)

-    assert_response :redirect

     assert_redirected_to oauth_authorized_applications_path
 
     get oauth_authorized_applications_path
     assert_redirected_to oauth_authorized_applications_path
 
     get oauth_authorized_applications_path