diff --git a/test/functional/account_controller_openid_test.rb b/test/functional/account_controller_openid_test.rb index bfb78d107..fcf207544 100644 --- a/test/functional/account_controller_openid_test.rb +++ b/test/functional/account_controller_openid_test.rb @@ -43,17 +43,23 @@ class AccountControllerOpenidTest < Redmine::ControllerTest existing_user.login = 'cool_user' assert existing_user.save! - post :login, :params => { + post( + :login, + :params => { :openid_url => existing_user.identity_url } + ) assert_redirected_to '/my/page' end def test_login_with_invalid_openid_provider Setting.self_registration = '0' - post :login, :params => { + post( + :login, + :params => { :openid_url => 'http;//openid.example.com/good_user' } + ) assert_redirected_to home_url end @@ -67,17 +73,23 @@ class AccountControllerOpenidTest < Redmine::ControllerTest existing_user.login = 'cool_user' assert existing_user.save! - post :login, :params => { + post( + :login, + :params => { :openid_url => existing_user.identity_url } + ) assert_redirected_to '/login' end def test_login_with_openid_with_new_user_created Setting.self_registration = '3' - post :login, :params => { + post( + :login, + :params => { :openid_url => 'http://openid.example.com/good_user' } + ) assert_redirected_to '/my/account' user = User.find_by_login('cool_user') assert user @@ -87,9 +99,12 @@ class AccountControllerOpenidTest < Redmine::ControllerTest def test_login_with_openid_with_new_user_and_self_registration_off Setting.self_registration = '0' - post :login, :params => { + post( + :login, + :params => { :openid_url => 'http://openid.example.com/good_user' } + ) assert_redirected_to home_url user = User.find_by_login('cool_user') assert_nil user @@ -97,9 +112,12 @@ class AccountControllerOpenidTest < Redmine::ControllerTest def test_login_with_openid_with_new_user_created_with_email_activation_should_have_a_token Setting.self_registration = '1' - post :login, :params => { + post( + :login, + :params => { :openid_url => 'http://openid.example.com/good_user' } + ) assert_redirected_to '/login' user = User.find_by_login('cool_user') assert user @@ -110,9 +128,12 @@ class AccountControllerOpenidTest < Redmine::ControllerTest def test_login_with_openid_with_new_user_created_with_manual_activation Setting.self_registration = '2' - post :login, :params => { + post( + :login, + :params => { :openid_url => 'http://openid.example.com/good_user' } + ) assert_redirected_to '/login' user = User.find_by_login('cool_user') assert user @@ -125,9 +146,12 @@ class AccountControllerOpenidTest < Redmine::ControllerTest existing_user.login = 'cool_user' assert existing_user.save! - post :login, :params => { + post( + :login, + :params => { :openid_url => 'http://openid.example.com/good_user' } + ) assert_response :success assert_select 'input[name=?][value=?]', 'user[identity_url]', 'http://openid.example.com/good_user' @@ -136,9 +160,12 @@ class AccountControllerOpenidTest < Redmine::ControllerTest def test_login_with_openid_with_new_user_with_missing_information_should_register Setting.self_registration = '3' - post :login, :params => { + post( + :login, + :params => { :openid_url => 'http://openid.example.com/good_blank_user' } + ) assert_response :success assert_select 'input[name=?]', 'user[login]' @@ -161,7 +188,9 @@ class AccountControllerOpenidTest < Redmine::ControllerTest Setting.self_registration = '3' assert_difference 'User.count' do - post :register, :params => { + post( + :register, + :params => { :user => { :login => 'good_blank_user', :password => '', @@ -170,9 +199,9 @@ class AccountControllerOpenidTest < Redmine::ControllerTest :lastname => 'User', :mail => 'user@somedomain.com', :identity_url => 'http://openid.example.com/good_blank_user' - } } + ) assert_response 302 end