Commit 316dd059568c3769ece5837015e35eb304486a4e
1 parent
404845b8
Exists in
master
and in
29 other branches
Fix AccountController tests
Showing
1 changed file
with
2 additions
and
2 deletions
Show diff stats
test/functional/account_controller_test.rb
@@ -148,7 +148,7 @@ class AccountControllerTest < ActionController::TestCase | @@ -148,7 +148,7 @@ class AccountControllerTest < ActionController::TestCase | ||
148 | def test_should_delete_token_on_logout | 148 | def test_should_delete_token_on_logout |
149 | login_as :johndoe | 149 | login_as :johndoe |
150 | get :logout | 150 | get :logout |
151 | - assert_equal @response.cookies["auth_token"], [] | 151 | + assert_nil @response.cookies["auth_token"] |
152 | end | 152 | end |
153 | 153 | ||
154 | # "remember_me" feature is disabled; uncommend this if it is enabled again. | 154 | # "remember_me" feature is disabled; uncommend this if it is enabled again. |
@@ -662,7 +662,7 @@ class AccountControllerTest < ActionController::TestCase | @@ -662,7 +662,7 @@ class AccountControllerTest < ActionController::TestCase | ||
662 | assert_response :success | 662 | assert_response :success |
663 | post :login, :user => {:login => 'testuser', :password => 'test123'} | 663 | post :login, :user => {:login => 'testuser', :password => 'test123'} |
664 | assert_not_nil session[:user] | 664 | assert_not_nil session[:user] |
665 | - assert_redirected_to :controller => 'profile_editor', :profile => 'testuser' | 665 | + assert_redirected_to :controller => 'profile_editor', :profile => 'testuser', :action => 'index' |
666 | end | 666 | end |
667 | 667 | ||
668 | should 'not activate user when activation code is missing' do | 668 | should 'not activate user when activation code is missing' do |