From: Toshi MARUYAMA Date: Wed, 1 Jun 2011 11:05:04 +0000 (+0000) Subject: remove trailing white-spaces from test/functional/account_controller_test.rb. X-Git-Tag: 1.3.0~1876 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=c9ba5662e8426e392cad029de92628f43f23b145;p=redmine.git remove trailing white-spaces from test/functional/account_controller_test.rb. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5989 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- diff --git a/test/functional/account_controller_test.rb b/test/functional/account_controller_test.rb index 2abc2fc3a..3226544e3 100644 --- a/test/functional/account_controller_test.rb +++ b/test/functional/account_controller_test.rb @@ -1,16 +1,16 @@ -# redMine - project management software -# Copyright (C) 2006-2007 Jean-Philippe Lang +# Redmine - project management software +# Copyright (C) 2006-2011 Jean-Philippe Lang # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License # as published by the Free Software Foundation; either version 2 # of the License, or (at your option) any later version. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. @@ -23,20 +23,20 @@ class AccountController; def rescue_action(e) raise e end; end class AccountControllerTest < ActionController::TestCase fixtures :users, :roles - + def setup @controller = AccountController.new @request = ActionController::TestRequest.new @response = ActionController::TestResponse.new User.current = nil end - + def test_login_should_redirect_to_back_url_param # request.uri is "test.host" in test environment post :login, :username => 'jsmith', :password => 'jsmith', :back_url => 'http%3A%2F%2Ftest.host%2Fissues%2Fshow%2F1' assert_redirected_to '/issues/show/1' end - + def test_login_should_not_redirect_to_another_host post :login, :username => 'jsmith', :password => 'jsmith', :back_url => 'http%3A%2F%2Ftest.foo%2Ffake' assert_redirected_to '/my/page' @@ -50,9 +50,9 @@ class AccountControllerTest < ActionController::TestCase :attributes => { :class => "flash error" }, :content => /Invalid user or password/ end - + if Object.const_defined?(:OpenID) - + def test_login_with_openid_for_existing_user Setting.self_registration = '3' Setting.openid = '1' @@ -73,7 +73,7 @@ class AccountControllerTest < ActionController::TestCase post :login, :openid_url => 'http;//openid.example.com/good_user' assert_redirected_to home_url end - + def test_login_with_openid_for_existing_non_active_user Setting.self_registration = '2' Setting.openid = '1' @@ -120,7 +120,7 @@ class AccountControllerTest < ActionController::TestCase token = Token.find_by_user_id_and_action(user.id, 'register') assert token end - + def test_login_with_openid_with_new_user_created_with_manual_activation Setting.self_registration = '2' Setting.openid = '1' @@ -130,30 +130,30 @@ class AccountControllerTest < ActionController::TestCase assert user assert_equal User::STATUS_REGISTERED, user.status end - + def test_login_with_openid_with_new_user_with_conflict_should_register Setting.self_registration = '3' Setting.openid = '1' existing_user = User.new(:firstname => 'Cool', :lastname => 'User', :mail => 'user@somedomain.com') existing_user.login = 'cool_user' assert existing_user.save! - + post :login, :openid_url => 'http://openid.example.com/good_user' assert_response :success assert_template 'register' assert assigns(:user) assert_equal 'http://openid.example.com/good_user', assigns(:user)[:identity_url] end - + def test_setting_openid_should_return_true_when_set_to_true Setting.openid = '1' assert_equal true, Setting.openid? end - + else puts "Skipping openid tests." end - + def test_logout @request.session[:user_id] = 2 get :logout @@ -167,12 +167,12 @@ class AccountControllerTest < ActionController::TestCase Setting.self_registration = '3' get :register end - + should_respond_with :success should_render_template :register should_assign_to :user end - + context "with self registration off" do setup do Setting.self_registration = '0' @@ -197,7 +197,7 @@ class AccountControllerTest < ActionController::TestCase :mail => 'register@example.com' } end - + should_respond_with :redirect should_assign_to :user should_redirect_to('my page') { {:controller => 'my', :action => 'account'} } @@ -210,7 +210,7 @@ class AccountControllerTest < ActionController::TestCase assert_equal User::STATUS_ACTIVE, user.status end end - + context "with self registration off" do setup do Setting.self_registration = '0' @@ -220,5 +220,4 @@ class AccountControllerTest < ActionController::TestCase should_redirect_to('/') { home_url } end end - end