fix source indent of SessionsControllerTest

git-svn-id: http://svn.redmine.org/redmine/trunk@20339 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA
2020-11-12 12:30:57 +00:00
parent c1a203267b
commit 44e51105b1

View File

@@ -37,10 +37,7 @@ class SessionsControllerTest < Redmine::ControllerTest
token = Token.create!(:user_id => 2, :action => 'session', :created_on => 10.hours.ago, :updated_on => 10.hours.ago) token = Token.create!(:user_id => 2, :action => 'session', :created_on => 10.hours.ago, :updated_on => 10.hours.ago)
created = token.reload.created_on created = token.reload.created_on
get :index, :session => { get(:index, :session => {:user_id => 2, :tk => token.value})
:user_id => 2,
:tk => token.value
}
assert_response :success assert_response :success
token.reload token.reload
assert_equal created.to_i, token.created_on.to_i assert_equal created.to_i, token.created_on.to_i
@@ -53,18 +50,13 @@ class SessionsControllerTest < Redmine::ControllerTest
token = Token.create!(:user_id => 2, :action => 'session', :created_on => created, :updated_on => created) token = Token.create!(:user_id => 2, :action => 'session', :created_on => created, :updated_on => created)
with_settings :session_lifetime => '0', :session_timeout => '0' do with_settings :session_lifetime => '0', :session_timeout => '0' do
get :index, :session => { get(:index, :session => {:user_id => 2, :tk => token.value})
:user_id => 2,
:tk => token.value
}
assert_response :success assert_response :success
end end
end end
def test_user_session_without_token_should_be_reset def test_user_session_without_token_should_be_reset
get :index, :session => { get(:index, :session => {:user_id => 2})
:user_id => 2
}
assert_redirected_to 'http://test.host/login?back_url=http%3A%2F%2Ftest.host%2F' assert_redirected_to 'http://test.host/login?back_url=http%3A%2F%2Ftest.host%2F'
end end
@@ -73,10 +65,13 @@ class SessionsControllerTest < Redmine::ControllerTest
token = Token.create!(:user_id => 2, :action => 'session', :created_on => created, :updated_on => created) token = Token.create!(:user_id => 2, :action => 'session', :created_on => created, :updated_on => created)
with_settings :session_timeout => '720' do with_settings :session_timeout => '720' do
get :index, :session => { get(
:index,
:session => {
:user_id => 2, :user_id => 2,
:tk => token.value :tk => token.value
} }
)
assert_redirected_to 'http://test.host/login?back_url=http%3A%2F%2Ftest.host%2F' assert_redirected_to 'http://test.host/login?back_url=http%3A%2F%2Ftest.host%2F'
end end
end end
@@ -86,10 +81,13 @@ class SessionsControllerTest < Redmine::ControllerTest
token = Token.create!(:user_id => 2, :action => 'session', :created_on => created, :updated_on => created) token = Token.create!(:user_id => 2, :action => 'session', :created_on => created, :updated_on => created)
with_settings :session_timeout => '720' do with_settings :session_timeout => '720' do
get :index, :session => { get(
:index,
:session => {
:user_id => 2, :user_id => 2,
:tk => token.value :tk => token.value
} }
)
assert_response :success assert_response :success
end end
end end
@@ -99,10 +97,13 @@ class SessionsControllerTest < Redmine::ControllerTest
token = Token.create!(:user_id => 2, :action => 'session', :created_on => created, :updated_on => created) token = Token.create!(:user_id => 2, :action => 'session', :created_on => created, :updated_on => created)
with_settings :session_timeout => '60' do with_settings :session_timeout => '60' do
get :index, :session => { get(
:index,
:session => {
:user_id => 2, :user_id => 2,
:tk => token.value :tk => token.value
} }
)
assert_redirected_to 'http://test.host/login?back_url=http%3A%2F%2Ftest.host%2F' assert_redirected_to 'http://test.host/login?back_url=http%3A%2F%2Ftest.host%2F'
end end
end end
@@ -112,10 +113,13 @@ class SessionsControllerTest < Redmine::ControllerTest
token = Token.create!(:user_id => 2, :action => 'session', :created_on => created, :updated_on => created) token = Token.create!(:user_id => 2, :action => 'session', :created_on => created, :updated_on => created)
with_settings :session_timeout => '60' do with_settings :session_timeout => '60' do
get :index, :session => { get(
:index,
:session => {
:user_id => 2, :user_id => 2,
:tk => token.value :tk => token.value
} }
)
assert_response :success assert_response :success
end end
end end
@@ -128,10 +132,13 @@ class SessionsControllerTest < Redmine::ControllerTest
autologin_token = Token.create!(:user_id => 2, :action => 'autologin', :created_on => 1.day.ago) autologin_token = Token.create!(:user_id => 2, :action => 'autologin', :created_on => 1.day.ago)
@request.cookies['autologin'] = autologin_token.value @request.cookies['autologin'] = autologin_token.value
get :index, :session => { get(
:index,
:session => {
:user_id => 2, :user_id => 2,
:tk => token.value :tk => token.value
} }
)
assert_equal 2, session[:user_id] assert_equal 2, session[:user_id]
assert_response :success assert_response :success
assert_not_equal token.value, session[:tk] assert_not_equal token.value, session[:tk]
@@ -147,10 +154,13 @@ class SessionsControllerTest < Redmine::ControllerTest
token = Token.create!(:user_id => 2, :action => 'session', :created_on => created, :updated_on => created) token = Token.create!(:user_id => 2, :action => 'session', :created_on => created, :updated_on => created)
with_settings :session_timeout => '60' do with_settings :session_timeout => '60' do
get :index, :session => { get(
:index,
:session => {
:user_id => user.id, :user_id => user.id,
:tk => token.value :tk => token.value
} }
)
assert_redirected_to 'http://test.host/login?back_url=http%3A%2F%2Ftest.host%2F' assert_redirected_to 'http://test.host/login?back_url=http%3A%2F%2Ftest.host%2F'
assert_include "Veuillez vous reconnecter", flash[:error] assert_include "Veuillez vous reconnecter", flash[:error]
assert_equal :fr, current_language assert_equal :fr, current_language