Regex fix merged

[selectricity] / test / functional / account_controller_test.rb

diff --git a/test/functional/account_controller_test.rb b/test/functional/account_controller_test.rb
index 3c8cd2265b95ef3d2c27795c71b559f1e56a9bf2..21e20ac1a8d4934f8dea623ffebe3cadc6883139 100644 (file)
--- a/test/functional/account_controller_test.rb
+++ b/test/functional/account_controller_test.rb
@@ -25,22 +25,23 @@ class AccountControllerTest < Test::Unit::TestCase
 
   def test_should_fail_login_and_not_redirect
     post :login, :login => 'quentin', :password => 'bad password'
 
   def test_should_fail_login_and_not_redirect
     post :login, :login => 'quentin', :password => 'bad password'

-    assert_nil session[:user]
-    assert_response :success
+        assert_nil session[:user]
+        assert_nil session[:user_id]
+        assert_response :success

   end
 
   def test_should_allow_signup
     assert_difference User, :count do
   end
 
   def test_should_allow_signup
     assert_difference User, :count do

-      create_user
-      assert_response :redirect
+    create_user
+    assert_response :redirect

     end
   end
 
   def test_should_require_login_on_signup
     assert_no_difference User, :count do
     end
   end
 
   def test_should_require_login_on_signup
     assert_no_difference User, :count do

-      create_user(:login => nil)
-      assert assigns(:user).errors.on(:login)
-      assert_response :success
+    create_user(:login => nil)
+    assert assigns(:user).errors.on(:login)
+    assert_response :success

     end
   end
 
     end
   end
 


@@ -72,6 +73,7 @@ class AccountControllerTest < Test::Unit::TestCase
     login_as :quentin
     get :logout
     assert_nil session[:user]
     login_as :quentin
     get :logout
     assert_nil session[:user]

+    assert_nil session[:user_id]

     assert_response :redirect
   end
 
     assert_response :redirect
   end