| @@ -96,7 +96,7 class AccountController < ApplicationController | |||
|
|
96 | 96 | end |
|
|
97 | 97 | else |
|
|
98 | 98 | @user.login = params[:user][:login] |
|
|
99 | @user.password, @user.password_confirmation = params[:password], params[:password_confirmation] | |
|
|
99 | @user.password, @user.password_confirmation = params[:user][:password], params[:user][:password_confirmation] | |
|
|
100 | 100 | |
|
|
101 | 101 | case Setting.self_registration |
|
|
102 | 102 | when '1' |
| @@ -167,6 +167,9 class AccountControllerTest < ActionController::TestCase | |||
|
|
167 | 167 | assert_response :success |
|
|
168 | 168 | assert_template 'register' |
|
|
169 | 169 | assert_not_nil assigns(:user) |
|
|
170 | ||
|
|
171 | assert_tag 'input', :attributes => {:name => 'user[password]'} | |
|
|
172 | assert_tag 'input', :attributes => {:name => 'user[password_confirmation]'} | |
|
|
170 | 173 | end |
|
|
171 | 174 | end |
|
|
172 | 175 | |
| @@ -193,6 +196,10 class AccountControllerTest < ActionController::TestCase | |||
|
|
193 | 196 | end |
|
|
194 | 197 | user = User.first(:order => 'id DESC') |
|
|
195 | 198 | assert_equal 'register', user.login |
|
|
199 | assert_equal 'John', user.firstname | |
|
|
200 | assert_equal 'Doe', user.lastname | |
|
|
201 | assert_equal 'register@example.com', user.mail | |
|
|
202 | assert user.check_password?('test') | |
|
|
196 | 203 | assert user.active? |
|
|
197 | 204 | end |
|
|
198 | 205 | end |
| @@ -103,8 +103,8 class AccountTest < ActionController::IntegrationTest | |||
|
|
103 | 103 | assert_response :success |
|
|
104 | 104 | assert_template 'account/register' |
|
|
105 | 105 | |
|
|
106 |
post 'account/register', :user => {:login => "newuser", :language => "en", :firstname => "New", :lastname => "User", :mail => "newuser@foo.bar" |
|
|
|
107 | :password => "newpass", :password_confirmation => "newpass" | |
|
|
106 | post 'account/register', :user => {:login => "newuser", :language => "en", :firstname => "New", :lastname => "User", :mail => "newuser@foo.bar", | |
|
|
107 | :password => "newpass", :password_confirmation => "newpass"} | |
|
|
108 | 108 | assert_redirected_to '/my/account' |
|
|
109 | 109 | follow_redirect! |
|
|
110 | 110 | assert_response :success |
| @@ -119,8 +119,8 class AccountTest < ActionController::IntegrationTest | |||
|
|
119 | 119 | def test_register_with_manual_activation |
|
|
120 | 120 | Setting.self_registration = '2' |
|
|
121 | 121 | |
|
|
122 |
post 'account/register', :user => {:login => "newuser", :language => "en", :firstname => "New", :lastname => "User", :mail => "newuser@foo.bar" |
|
|
|
123 | :password => "newpass", :password_confirmation => "newpass" | |
|
|
122 | post 'account/register', :user => {:login => "newuser", :language => "en", :firstname => "New", :lastname => "User", :mail => "newuser@foo.bar", | |
|
|
123 | :password => "newpass", :password_confirmation => "newpass"} | |
|
|
124 | 124 | assert_redirected_to '/login' |
|
|
125 | 125 | assert !User.find_by_login('newuser').active? |
|
|
126 | 126 | end |
| @@ -129,8 +129,8 class AccountTest < ActionController::IntegrationTest | |||
|
|
129 | 129 | Setting.self_registration = '1' |
|
|
130 | 130 | Token.delete_all |
|
|
131 | 131 | |
|
|
132 |
post 'account/register', :user => {:login => "newuser", :language => "en", :firstname => "New", :lastname => "User", :mail => "newuser@foo.bar" |
|
|
|
133 | :password => "newpass", :password_confirmation => "newpass" | |
|
|
132 | post 'account/register', :user => {:login => "newuser", :language => "en", :firstname => "New", :lastname => "User", :mail => "newuser@foo.bar", | |
|
|
133 | :password => "newpass", :password_confirmation => "newpass"} | |
|
|
134 | 134 | assert_redirected_to '/login' |
|
|
135 | 135 | assert !User.find_by_login('newuser').active? |
|
|
136 | 136 | |
General Comments 0
You need to be logged in to leave comments.
Login now