1
0
mirror of https://github.com/meineerde/redmine.git synced 2025-12-20 15:31:12 +00:00

fix source indent of EmailAddressesControllerTest

git-svn-id: http://svn.redmine.org/redmine/trunk@20270 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA 2020-11-06 12:59:50 +00:00
parent 35afc6de06
commit 2cf28cdaf4

View File

@ -28,9 +28,7 @@ class EmailAddressesControllerTest < Redmine::ControllerTest
def test_index_with_no_additional_emails def test_index_with_no_additional_emails
@request.session[:user_id] = 2 @request.session[:user_id] = 2
get :index, :params => { get(:index, :params => {:user_id => 2})
:user_id => 2
}
assert_response :success assert_response :success
end end
@ -38,9 +36,7 @@ class EmailAddressesControllerTest < Redmine::ControllerTest
@request.session[:user_id] = 2 @request.session[:user_id] = 2
EmailAddress.create!(:user_id => 2, :address => 'another@somenet.foo') EmailAddress.create!(:user_id => 2, :address => 'another@somenet.foo')
get :index, :params => { get(:index, :params => {:user_id => 2})
:user_id => 2
}
assert_response :success assert_response :success
assert_select '.email', :text => 'another@somenet.foo' assert_select '.email', :text => 'another@somenet.foo'
end end
@ -49,39 +45,35 @@ class EmailAddressesControllerTest < Redmine::ControllerTest
@request.session[:user_id] = 2 @request.session[:user_id] = 2
EmailAddress.create!(:user_id => 2, :address => 'another@somenet.foo') EmailAddress.create!(:user_id => 2, :address => 'another@somenet.foo')
get :index, :params => { get(:index, :params => {:user_id => 2}, :xhr => true)
:user_id => 2
},
:xhr => true
assert_response :success assert_response :success
assert_include 'another@somenet.foo', response.body assert_include 'another@somenet.foo', response.body
end end
def test_index_by_admin_should_be_allowed def test_index_by_admin_should_be_allowed
@request.session[:user_id] = 1 @request.session[:user_id] = 1
get :index, :params => { get(:index, :params => {:user_id => 2})
:user_id => 2
}
assert_response :success assert_response :success
end end
def test_index_by_another_user_should_be_denied def test_index_by_another_user_should_be_denied
@request.session[:user_id] = 3 @request.session[:user_id] = 3
get :index, :params => { get(:index, :params => {:user_id => 2})
:user_id => 2
}
assert_response 403 assert_response 403
end end
def test_create def test_create
@request.session[:user_id] = 2 @request.session[:user_id] = 2
assert_difference 'EmailAddress.count' do assert_difference 'EmailAddress.count' do
post :create, :params => { post(
:create,
:params => {
:user_id => 2, :user_id => 2,
:email_address => { :email_address => {
:address => 'another@somenet.foo' :address => 'another@somenet.foo'
} }
} }
)
assert_response 302 assert_response 302
assert_redirected_to '/users/2/email_addresses' assert_redirected_to '/users/2/email_addresses'
end end
@ -93,13 +85,16 @@ class EmailAddressesControllerTest < Redmine::ControllerTest
def test_create_as_js def test_create_as_js
@request.session[:user_id] = 2 @request.session[:user_id] = 2
assert_difference 'EmailAddress.count' do assert_difference 'EmailAddress.count' do
post :create, :params => { post(
:create,
:params => {
:user_id => 2, :user_id => 2,
:email_address => { :email_address => {
:address => 'another@somenet.foo' :address => 'another@somenet.foo'
} }
}, },
:xhr => true :xhr => true
)
assert_response 200 assert_response 200
end end
end end
@ -107,12 +102,15 @@ class EmailAddressesControllerTest < Redmine::ControllerTest
def test_create_with_failure def test_create_with_failure
@request.session[:user_id] = 2 @request.session[:user_id] = 2
assert_no_difference 'EmailAddress.count' do assert_no_difference 'EmailAddress.count' do
post :create, :params => { post(
:create,
:params => {
:user_id => 2, :user_id => 2,
:email_address => { :email_address => {
:address => 'invalid' :address => 'invalid'
} }
} }
)
assert_response :success assert_response :success
assert_select_error /email is invalid/i assert_select_error /email is invalid/i
end end
@ -123,12 +121,15 @@ class EmailAddressesControllerTest < Redmine::ControllerTest
with_settings :email_domains_denied => 'black.example' do with_settings :email_domains_denied => 'black.example' do
assert_no_difference 'EmailAddress.count' do assert_no_difference 'EmailAddress.count' do
post :create, :params => { post(
:create,
:params => {
:user_id => 2, :user_id => 2,
:email_address => { :email_address => {
:address => 'another@black.example' :address => 'another@black.example'
} }
} }
)
assert_response :success assert_response :success
assert_select_error 'Email is invalid' assert_select_error 'Email is invalid'
end end
@ -136,12 +137,15 @@ class EmailAddressesControllerTest < Redmine::ControllerTest
with_settings :email_domains_allowed => 'white.example' do with_settings :email_domains_allowed => 'white.example' do
assert_no_difference 'EmailAddress.count' do assert_no_difference 'EmailAddress.count' do
post :create, :params => { post(
:create,
:params => {
:user_id => 2, :user_id => 2,
:email_address => { :email_address => {
:address => 'something@example.fr' :address => 'something@example.fr'
} }
} }
)
assert_response :success assert_response :success
assert_select_error 'Email is invalid' assert_select_error 'Email is invalid'
end end
@ -151,12 +155,15 @@ class EmailAddressesControllerTest < Redmine::ControllerTest
def test_create_should_send_security_notification def test_create_should_send_security_notification
@request.session[:user_id] = 2 @request.session[:user_id] = 2
ActionMailer::Base.deliveries.clear ActionMailer::Base.deliveries.clear
post :create, :params => { post(
:create,
:params => {
:user_id => 2, :user_id => 2,
:email_address => { :email_address => {
:address => 'something@example.fr' :address => 'something@example.fr'
} }
} }
)
mail = ActionMailer::Base.deliveries.last mail = ActionMailer::Base.deliveries.last
assert_not_nil mail assert_not_nil mail
assert_mail_body_match '0.0.0.0', mail assert_mail_body_match '0.0.0.0', mail
@ -173,11 +180,14 @@ class EmailAddressesControllerTest < Redmine::ControllerTest
@request.session[:user_id] = 2 @request.session[:user_id] = 2
email = EmailAddress.create!(:user_id => 2, :address => 'another@somenet.foo') email = EmailAddress.create!(:user_id => 2, :address => 'another@somenet.foo')
put :update, :params => { put(
:update,
:params => {
:user_id => 2, :user_id => 2,
:id => email.id, :id => email.id,
:notify => '0' :notify => '0'
} }
)
assert_response 302 assert_response 302
assert_equal false, email.reload.notify assert_equal false, email.reload.notify
@ -187,12 +197,15 @@ class EmailAddressesControllerTest < Redmine::ControllerTest
@request.session[:user_id] = 2 @request.session[:user_id] = 2
email = EmailAddress.create!(:user_id => 2, :address => 'another@somenet.foo') email = EmailAddress.create!(:user_id => 2, :address => 'another@somenet.foo')
put :update, :params => { put(
:update,
:params => {
:user_id => 2, :user_id => 2,
:id => email.id, :id => email.id,
:notify => '0' :notify => '0'
}, },
:xhr => true :xhr => true
)
assert_response 200 assert_response 200
assert_equal false, email.reload.notify assert_equal false, email.reload.notify
@ -203,12 +216,15 @@ class EmailAddressesControllerTest < Redmine::ControllerTest
email = EmailAddress.create!(:user_id => 2, :address => 'another@somenet.foo') email = EmailAddress.create!(:user_id => 2, :address => 'another@somenet.foo')
ActionMailer::Base.deliveries.clear ActionMailer::Base.deliveries.clear
put :update, :params => { put(
:update,
:params => {
:user_id => 2, :user_id => 2,
:id => email.id, :id => email.id,
:notify => '0' :notify => '0'
}, },
:xhr => true :xhr => true
)
mail = ActionMailer::Base.deliveries.last mail = ActionMailer::Base.deliveries.last
assert_not_nil mail assert_not_nil mail
assert_mail_body_match I18n.t(:mail_body_security_notification_notify_disabled, value: 'another@somenet.foo'), mail assert_mail_body_match I18n.t(:mail_body_security_notification_notify_disabled, value: 'another@somenet.foo'), mail
@ -222,10 +238,13 @@ class EmailAddressesControllerTest < Redmine::ControllerTest
email = EmailAddress.create!(:user_id => 2, :address => 'another@somenet.foo') email = EmailAddress.create!(:user_id => 2, :address => 'another@somenet.foo')
assert_difference 'EmailAddress.count', -1 do assert_difference 'EmailAddress.count', -1 do
delete :destroy, :params => { delete(
:destroy,
:params => {
:user_id => 2, :user_id => 2,
:id => email.id :id => email.id
} }
)
assert_response 302 assert_response 302
assert_redirected_to '/users/2/email_addresses' assert_redirected_to '/users/2/email_addresses'
end end
@ -236,11 +255,14 @@ class EmailAddressesControllerTest < Redmine::ControllerTest
email = EmailAddress.create!(:user_id => 2, :address => 'another@somenet.foo') email = EmailAddress.create!(:user_id => 2, :address => 'another@somenet.foo')
assert_difference 'EmailAddress.count', -1 do assert_difference 'EmailAddress.count', -1 do
delete :destroy, :params => { delete(
:destroy,
:params => {
:user_id => 2, :user_id => 2,
:id => email.id :id => email.id
}, },
:xhr => true :xhr => true
)
assert_response 200 assert_response 200
end end
end end
@ -249,10 +271,13 @@ class EmailAddressesControllerTest < Redmine::ControllerTest
@request.session[:user_id] = 2 @request.session[:user_id] = 2
assert_no_difference 'EmailAddress.count' do assert_no_difference 'EmailAddress.count' do
delete :destroy, :params => { delete(
:destroy,
:params => {
:user_id => 2, :user_id => 2,
:id => User.find(2).email_address.id :id => User.find(2).email_address.id
} }
)
assert_response 404 assert_response 404
end end
end end
@ -262,11 +287,14 @@ class EmailAddressesControllerTest < Redmine::ControllerTest
email = EmailAddress.create!(:user_id => 2, :address => 'another@somenet.foo') email = EmailAddress.create!(:user_id => 2, :address => 'another@somenet.foo')
ActionMailer::Base.deliveries.clear ActionMailer::Base.deliveries.clear
delete :destroy, :params => { delete(
:destroy,
:params => {
:user_id => 2, :user_id => 2,
:id => email.id :id => email.id
}, },
:xhr => true :xhr => true
)
mail = ActionMailer::Base.deliveries.last mail = ActionMailer::Base.deliveries.last
assert_not_nil mail assert_not_nil mail
assert_mail_body_match I18n.t(:mail_body_security_notification_remove, field: I18n.t(:field_mail), value: 'another@somenet.foo'), mail assert_mail_body_match I18n.t(:mail_body_security_notification_remove, field: I18n.t(:field_mail), value: 'another@somenet.foo'), mail