jro_apps/redmine Commit - r2384:876fb69271ed

Added tests for the other OpenID authentication cases. #699...

Eric Davis -

r2384:876fb69271ed

parent child

Context file:

r2384:876fb69271ed

app/controllers/account_controller.rb +3 -3

                     user = User.find_or_initialize_by_identity_url(identity_url)
                     if user.new_record?
                       # Create on the fly
-                      user.login = registration['nickname']
+                      user.login = registration['nickname'] unless registration['nickname'].nil?
-                      user.mail = registration['email']
+                      user.mail = registration['email'] unless registration['email'].nil?
-                      user.firstname, user.lastname = registration['fullname'].split(' ')
+                      user.firstname, user.lastname = registration['fullname'].split(' ') unless registration['fullname'].nil?
                       user.random_password
                       if user.save
                         successful_authentication(user)

test/functional/account_controller_test.rb +15 -3

@@ -70,12 +70,24 class AccountControllerTest < Test::Unit::TestCase
70	end	70	end
71		71
72	def test_login_with_openid_with_new_user_created	72	def test_login_with_openid_with_new_user_created
73		73	post :login, :openid_url => 'http://openid.example.com/good_user'
		74	assert_redirected_to 'my/page'
		75	user = User.find_by_login('cool_user')
		76	assert user
		77	assert_equal 'Cool', user.firstname
		78	assert_equal 'User', user.lastname
74	end	79	end
75		80
76		81	def test_login_with_openid_with_new_user_with_conflict_should_register
77	def test_login_with_openid_with_new_user_with_conflict	82	existing_user = User.new(:firstname => 'Cool', :lastname => 'User', :mail => 'user@somedomain.com')
		83	existing_user.login = 'cool_user'
		84	assert existing_user.save!
78		85
		86	post :login, :openid_url => 'http://openid.example.com/good_user'
		87	assert_response :success
		88	assert_template 'register'
		89	assert assigns(:user)
		90	assert_equal 'http://openid.example.com/good_user', assigns(:user)[:identity_url]
79	end	91	end
80		92
81	def test_autologin	93	def test_autologin

test/test_helper.rb +1 -1

             require File.expand_path(File.dirname(__FILE__) + "/../config/environment")
             require 'test_help'
             require File.expand_path(File.dirname(__FILE__) + '/helper_testcase')
-            load File.join(RAILS_ROOT,'test', 'mocks', 'open_id_authentication_mock.rb')
+            require File.join(RAILS_ROOT,'test', 'mocks', 'open_id_authentication_mock.rb')
             class Test::Unit::TestCase
               # Transactional fixtures accelerate your tests by wrapping each test method

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages