| @@ -43,7 +43,7 class AccountController < ApplicationController | |||||
| 43 | self.logged_user = nil |
|
43 | self.logged_user = nil | |
| 44 | else |
|
44 | else | |
| 45 | # Authenticate user |
|
45 | # Authenticate user | |
| 46 |
user = User.try_to_login(params[: |
|
46 | user = User.try_to_login(params[:username], params[:password]) | |
| 47 | if user |
|
47 | if user | |
| 48 | self.logged_user = user |
|
48 | self.logged_user = user | |
| 49 | # generate a key and set cookie if autologin |
|
49 | # generate a key and set cookie if autologin | |
| @@ -2,8 +2,8 | |||||
| 2 | <% form_tag({:action=> "login"}) do %> |
|
2 | <% form_tag({:action=> "login"}) do %> | |
| 3 | <table> |
|
3 | <table> | |
| 4 | <tr> |
|
4 | <tr> | |
| 5 |
<td align="right"><label for=" |
|
5 | <td align="right"><label for="username"><%=l(:field_login)%>:</label></td> | |
| 6 |
<td align="left"><p><%= text_field_tag ' |
|
6 | <td align="left"><p><%= text_field_tag 'username', nil, :size => 40 %></p></td> | |
| 7 | </tr> |
|
7 | </tr> | |
| 8 | <tr> |
|
8 | <tr> | |
| 9 | <td align="right"><label for="password"><%=l(:field_password)%>:</label></td> |
|
9 | <td align="right"><label for="password"><%=l(:field_password)%>:</label></td> | |
| @@ -28,6 +28,6 | |||||
| 28 | </td> |
|
28 | </td> | |
| 29 | </tr> |
|
29 | </tr> | |
| 30 | </table> |
|
30 | </table> | |
| 31 |
<%= javascript_tag "Form.Element.focus(' |
|
31 | <%= javascript_tag "Form.Element.focus('username');" %> | |
| 32 | <% end %> |
|
32 | <% end %> | |
| 33 | </div> |
|
33 | </div> | |
| @@ -45,7 +45,7 class AccountControllerTest < Test::Unit::TestCase | |||||
| 45 | end |
|
45 | end | |
| 46 |
|
46 | |||
| 47 | def test_login_with_wrong_password |
|
47 | def test_login_with_wrong_password | |
| 48 |
post :login, : |
|
48 | post :login, :username => 'admin', :password => 'bad' | |
| 49 | assert_response :success |
|
49 | assert_response :success | |
| 50 | assert_template 'login' |
|
50 | assert_template 'login' | |
| 51 | assert_tag 'div', |
|
51 | assert_tag 'div', | |
| @@ -56,7 +56,7 class AccountControllerTest < Test::Unit::TestCase | |||||
| 56 | def test_autologin |
|
56 | def test_autologin | |
| 57 | Setting.autologin = "7" |
|
57 | Setting.autologin = "7" | |
| 58 | Token.delete_all |
|
58 | Token.delete_all | |
| 59 |
post :login, : |
|
59 | post :login, :username => 'admin', :password => 'admin', :autologin => 1 | |
| 60 | assert_redirected_to 'my/page' |
|
60 | assert_redirected_to 'my/page' | |
| 61 | token = Token.find :first |
|
61 | token = Token.find :first | |
| 62 | assert_not_nil token |
|
62 | assert_not_nil token | |
| @@ -49,7 +49,7 class Test::Unit::TestCase | |||||
| 49 | assert_equal nil, session[:user_id] |
|
49 | assert_equal nil, session[:user_id] | |
| 50 | assert_response :success |
|
50 | assert_response :success | |
| 51 | assert_template "account/login" |
|
51 | assert_template "account/login" | |
| 52 |
post "/account/login", : |
|
52 | post "/account/login", :username => login, :password => password | |
| 53 | assert_redirected_to "my/page" |
|
53 | assert_redirected_to "my/page" | |
| 54 | assert_equal login, User.find(session[:user_id]).login |
|
54 | assert_equal login, User.find(session[:user_id]).login | |
| 55 | end |
|
55 | end | |
General Comments 0
You need to be logged in to leave comments.
Login now