jro_apps/redmine Commit - r8662:9f6496b0bccb

Fixed registration form broken by r8479....

Jean-Philippe Lang -

r8662:9f6496b0bccb

parent child

Context file:

r8662:9f6496b0bccb

Collapse all files

app/controllers/account_controller.rb +1 -1

                     end
                   else
                     @user.login = params[:user][:login]
-                    @user.password, @user.password_confirmation = params[:password], params[:password_confirmation]
+                    @user.password, @user.password_confirmation = params[:user][:password], params[:user][:password_confirmation]
                     case Setting.self_registration
                     when '1'

test/functional/account_controller_test.rb +7 0

                   assert_response :success
                   assert_template 'register'
                   assert_not_nil assigns(:user)
+                  assert_tag 'input', :attributes => {:name => 'user[password]'}
+                  assert_tag 'input', :attributes => {:name => 'user[password_confirmation]'}
                 end
               end
                   end
                   user = User.first(:order => 'id DESC')
                   assert_equal 'register', user.login
+                  assert_equal 'John', user.firstname
+                  assert_equal 'Doe', user.lastname
+                  assert_equal 'register@example.com', user.mail
+                  assert user.check_password?('test')
                   assert user.active?
                 end
               end

test/integration/account_test.rb +6 -6

                 assert_response :success
                 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'
                 follow_redirect!
                 assert_response :success
               def test_register_with_manual_activation
                 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 !User.find_by_login('newuser').active?
               end
                 Setting.self_registration = '1'
                 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 !User.find_by_login('newuser').active?

General Comments 0

Write
Preview

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

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	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