cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into openid

Browse source 
Conflicts:
	app/controllers/user_controller.rb
This commit is contained in:
Tom Hughes 2010-10-05 00:23:04 +01:00
commit c016bf6c15
37 changed files with 484 additions and 106 deletions
Download patch file Download diff file Expand all files Collapse all files

2
test/integration/user_creation_test.rb
View file

@ -203,7 +203,7 @@ class UserCreationTest < ActionController::IntegrationTest
assert_equal register_email.to[0], new_email
# Check that the confirm account url is correct
confirm_regex = Regexp.new("/user/confirm\\?confirm_string=([a-zA-Z0-9]*)")
confirm_regex = Regexp.new("/user/redirect_tester/confirm\\?confirm_string=([a-zA-Z0-9]*)")
assert_match(confirm_regex, register_email.body)
confirm_string = confirm_regex.match(register_email.body)[1]