remove trailing white-spaces from test/integration/account_test.rb.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6655 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA committed 2011-08-27 02:11:34 +00:00
1 parent 4b60e577ca
commit 3791487569
1 file changed
+44 -44
+44 -44
View File
@@ -1,16 +1,16 @@
# redMine - project management software # Redmine - project management software
# Copyright (C) 2006-2007 Jean-Philippe Lang # Copyright (C) 2006-2011 Jean-Philippe Lang
# #
# This program is free software; you can redistribute it and/or # This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License # modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2 # as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version. # of the License, or (at your option) any later version.
# #
# This program is distributed in the hope that it will be useful, # This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of # but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details. # GNU General Public License for more details.
# #
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software # along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
@@ -31,17 +31,17 @@ class AccountTest < ActionController::IntegrationTest
get "my/page" get "my/page"
assert_redirected_to "/login?back_url=http%3A%2F%2Fwww.example.com%2Fmy%2Fpage" assert_redirected_to "/login?back_url=http%3A%2F%2Fwww.example.com%2Fmy%2Fpage"
log_user('jsmith', 'jsmith') log_user('jsmith', 'jsmith')
get "my/account" get "my/account"
assert_response :success assert_response :success
assert_template "my/account" assert_template "my/account"
end end
def test_autologin def test_autologin
user = User.find(1) user = User.find(1)
Setting.autologin = "7" Setting.autologin = "7"
Token.delete_all Token.delete_all
# User logs in with 'autologin' checked # User logs in with 'autologin' checked
post '/login', :username => user.login, :password => 'admin', :autologin => 1 post '/login', :username => user.login, :password => 'admin', :autologin => 1
assert_redirected_to '/my/page' assert_redirected_to '/my/page'
@@ -51,14 +51,14 @@ class AccountTest < ActionController::IntegrationTest
assert_equal 'autologin', token.action assert_equal 'autologin', token.action
assert_equal user.id, session[:user_id] assert_equal user.id, session[:user_id]
assert_equal token.value, cookies['autologin'] assert_equal token.value, cookies['autologin']
# Session is cleared # Session is cleared
reset! reset!
User.current = nil User.current = nil
# Clears user's last login timestamp # Clears user's last login timestamp
user.update_attribute :last_login_on, nil user.update_attribute :last_login_on, nil
assert_nil user.reload.last_login_on assert_nil user.reload.last_login_on
# User comes back with his autologin cookie # User comes back with his autologin cookie
cookies[:autologin] = token.value cookies[:autologin] = token.value
get '/my/page' get '/my/page'
@@ -68,103 +68,103 @@ class AccountTest < ActionController::IntegrationTest
assert_not_nil user.reload.last_login_on assert_not_nil user.reload.last_login_on
assert user.last_login_on.utc > 10.second.ago.utc assert user.last_login_on.utc > 10.second.ago.utc
end end
def test_lost_password def test_lost_password
Token.delete_all Token.delete_all
get "account/lost_password" get "account/lost_password"
assert_response :success assert_response :success
assert_template "account/lost_password" assert_template "account/lost_password"
post "account/lost_password", :mail => 'jSmith@somenet.foo' post "account/lost_password", :mail => 'jSmith@somenet.foo'
assert_redirected_to "/login" assert_redirected_to "/login"
token = Token.find(:first) token = Token.find(:first)
assert_equal 'recovery', token.action assert_equal 'recovery', token.action
assert_equal 'jsmith@somenet.foo', token.user.mail assert_equal 'jsmith@somenet.foo', token.user.mail
assert !token.expired? assert !token.expired?
get "account/lost_password", :token => token.value get "account/lost_password", :token => token.value
assert_response :success assert_response :success
assert_template "account/password_recovery" assert_template "account/password_recovery"
post "account/lost_password", :token => token.value, :new_password => 'newpass', :new_password_confirmation => 'newpass' post "account/lost_password", :token => token.value, :new_password => 'newpass', :new_password_confirmation => 'newpass'
assert_redirected_to "/login" assert_redirected_to "/login"
assert_equal 'Password was successfully updated.', flash[:notice] assert_equal 'Password was successfully updated.', flash[:notice]
log_user('jsmith', 'newpass') log_user('jsmith', 'newpass')
assert_equal 0, Token.count assert_equal 0, Token.count
end end
def test_register_with_automatic_activation def test_register_with_automatic_activation
Setting.self_registration = '3' Setting.self_registration = '3'
get 'account/register' get 'account/register'
assert_response :success assert_response :success
assert_template 'account/register' assert_template 'account/register'
post 'account/register', :user => {:login => "newuser", :language => "en", :firstname => "New", :lastname => "User", :mail => "newuser@foo.bar"}, post 'account/register', :user => {:login => "newuser", :language => "en", :firstname => "New", :lastname => "User", :mail => "newuser@foo.bar"},
:password => "newpass", :password_confirmation => "newpass" :password => "newpass", :password_confirmation => "newpass"
assert_redirected_to '/my/account' assert_redirected_to '/my/account'
follow_redirect! follow_redirect!
assert_response :success assert_response :success
assert_template 'my/account' assert_template 'my/account'
user = User.find_by_login('newuser') user = User.find_by_login('newuser')
assert_not_nil user assert_not_nil user
assert user.active? assert user.active?
assert_not_nil user.last_login_on assert_not_nil user.last_login_on
end end
def test_register_with_manual_activation def test_register_with_manual_activation
Setting.self_registration = '2' Setting.self_registration = '2'
post 'account/register', :user => {:login => "newuser", :language => "en", :firstname => "New", :lastname => "User", :mail => "newuser@foo.bar"}, post 'account/register', :user => {:login => "newuser", :language => "en", :firstname => "New", :lastname => "User", :mail => "newuser@foo.bar"},
:password => "newpass", :password_confirmation => "newpass" :password => "newpass", :password_confirmation => "newpass"
assert_redirected_to '/login' assert_redirected_to '/login'
assert !User.find_by_login('newuser').active? assert !User.find_by_login('newuser').active?
end end
def test_register_with_email_activation def test_register_with_email_activation
Setting.self_registration = '1' Setting.self_registration = '1'
Token.delete_all Token.delete_all
post 'account/register', :user => {:login => "newuser", :language => "en", :firstname => "New", :lastname => "User", :mail => "newuser@foo.bar"}, post 'account/register', :user => {:login => "newuser", :language => "en", :firstname => "New", :lastname => "User", :mail => "newuser@foo.bar"},
:password => "newpass", :password_confirmation => "newpass" :password => "newpass", :password_confirmation => "newpass"
assert_redirected_to '/login' assert_redirected_to '/login'
assert !User.find_by_login('newuser').active? assert !User.find_by_login('newuser').active?
token = Token.find(:first) token = Token.find(:first)
assert_equal 'register', token.action assert_equal 'register', token.action
assert_equal 'newuser@foo.bar', token.user.mail assert_equal 'newuser@foo.bar', token.user.mail
assert !token.expired? assert !token.expired?
get 'account/activate', :token => token.value get 'account/activate', :token => token.value
assert_redirected_to '/login' assert_redirected_to '/login'
log_user('newuser', 'newpass') log_user('newuser', 'newpass')
end end
if Object.const_defined?(:Mocha) if Object.const_defined?(:Mocha)
def test_onthefly_registration def test_onthefly_registration
# disable registration # disable registration
Setting.self_registration = '0' Setting.self_registration = '0'
AuthSource.expects(:authenticate).returns({:login => 'foo', :firstname => 'Foo', :lastname => 'Smith', :mail => 'foo@bar.com', :auth_source_id => 66}) AuthSource.expects(:authenticate).returns({:login => 'foo', :firstname => 'Foo', :lastname => 'Smith', :mail => 'foo@bar.com', :auth_source_id => 66})
post 'account/login', :username => 'foo', :password => 'bar' post 'account/login', :username => 'foo', :password => 'bar'
assert_redirected_to '/my/page' assert_redirected_to '/my/page'
user = User.find_by_login('foo') user = User.find_by_login('foo')
assert user.is_a?(User) assert user.is_a?(User)
assert_equal 66, user.auth_source_id assert_equal 66, user.auth_source_id
assert user.hashed_password.blank? assert user.hashed_password.blank?
end end
def test_onthefly_registration_with_invalid_attributes def test_onthefly_registration_with_invalid_attributes
# disable registration # disable registration
Setting.self_registration = '0' Setting.self_registration = '0'
AuthSource.expects(:authenticate).returns({:login => 'foo', :lastname => 'Smith', :auth_source_id => 66}) AuthSource.expects(:authenticate).returns({:login => 'foo', :lastname => 'Smith', :auth_source_id => 66})
post 'account/login', :username => 'foo', :password => 'bar' post 'account/login', :username => 'foo', :password => 'bar'
assert_response :success assert_response :success
assert_template 'account/register' assert_template 'account/register'
@@ -172,34 +172,34 @@ class AccountTest < ActionController::IntegrationTest
assert_tag :input, :attributes => { :name => 'user[lastname]', :value => 'Smith' } assert_tag :input, :attributes => { :name => 'user[lastname]', :value => 'Smith' }
assert_no_tag :input, :attributes => { :name => 'user[login]' } assert_no_tag :input, :attributes => { :name => 'user[login]' }
assert_no_tag :input, :attributes => { :name => 'user[password]' } assert_no_tag :input, :attributes => { :name => 'user[password]' }
post 'account/register', :user => {:firstname => 'Foo', :lastname => 'Smith', :mail => 'foo@bar.com'} post 'account/register', :user => {:firstname => 'Foo', :lastname => 'Smith', :mail => 'foo@bar.com'}
assert_redirected_to '/my/account' assert_redirected_to '/my/account'
user = User.find_by_login('foo') user = User.find_by_login('foo')
assert user.is_a?(User) assert user.is_a?(User)
assert_equal 66, user.auth_source_id assert_equal 66, user.auth_source_id
assert user.hashed_password.blank? assert user.hashed_password.blank?
end end
def test_login_and_logout_should_clear_session def test_login_and_logout_should_clear_session
get '/login' get '/login'
sid = session[:session_id] sid = session[:session_id]
post '/login', :username => 'admin', :password => 'admin' post '/login', :username => 'admin', :password => 'admin'
assert_redirected_to '/my/page' assert_redirected_to '/my/page'
assert_not_equal sid, session[:session_id], "login should reset session" assert_not_equal sid, session[:session_id], "login should reset session"
assert_equal 1, session[:user_id] assert_equal 1, session[:user_id]
sid = session[:session_id] sid = session[:session_id]
get '/' get '/'
assert_equal sid, session[:session_id] assert_equal sid, session[:session_id]
get '/logout' get '/logout'
assert_not_equal sid, session[:session_id], "logout should reset session" assert_not_equal sid, session[:session_id], "logout should reset session"
assert_nil session[:user_id] assert_nil session[:user_id]
end end
else else
puts 'Mocha is missing. Skipping tests.' puts 'Mocha is missing. Skipping tests.'
end end