4 files changed, 9 insertions, 6 deletions
diff --git a/users/test/functional/sessions_controller_test.rb b/users/test/functional/sessions_controller_test.rb
index 8b49005..fe7903f 100644
--- a/users/test/functional/sessions_controller_test.rb
+++ b/users/test/functional/sessions_controller_test.rb
@@ -17,11 +17,11 @@ class SessionsControllerTest < ActionController::TestCase
     assert_template "sessions/new"
   end
 
-  test "redirect to root_url if logged in" do
+  test "redirect to home_url if logged in" do
     login
     get :new
     assert_response :redirect
-    assert_redirected_to root_url
+    assert_redirected_to home_url
   end
 
   test "renders json" do
@@ -53,7 +53,7 @@ class SessionsControllerTest < ActionController::TestCase
     expect_logout
     delete :destroy
     assert_response :redirect
-    assert_redirected_to root_url
+    assert_redirected_to home_url
   end
 
 end
diff --git a/users/test/functional/users_controller_test.rb b/users/test/functional/users_controller_test.rb
index 9c5f8d9..002a011 100644
--- a/users/test/functional/users_controller_test.rb
+++ b/users/test/functional/users_controller_test.rb
@@ -103,7 +103,7 @@ class UsersControllerTest < ActionController::TestCase
     delete :destroy, :id => @current_user.id
 
     assert_response :redirect
-    assert_redirected_to root_path
+    assert_redirected_to home_path
   end
 
   test "non-admin can't destroy user" do
diff --git a/users/test/integration/browser/account_test.rb b/users/test/integration/browser/account_test.rb
index 4cefe35..3785b72 100644
--- a/users/test/integration/browser/account_test.rb
+++ b/users/test/integration/browser/account_test.rb
@@ -14,7 +14,7 @@ class AccountTest < BrowserIntegrationTest
     username, password = submit_signup
     assert page.has_content?("Welcome #{username}")
     click_on 'Logout'
-    assert page.has_content?("Sign Up")
+    assert page.has_content?("Log In")
     assert_equal '/', current_path
     assert user = User.find_by_login(username)
     user.account.destroy
@@ -25,6 +25,9 @@ class AccountTest < BrowserIntegrationTest
     click_on 'Logout'
     attempt_login(username, password)
     assert page.has_content?("Welcome #{username}")
+    within('.sidenav li.active') do
+      assert page.has_content?("Overview")
+    end
     User.find_by_login(username).account.destroy
   end
 
diff --git a/users/test/support/auth_test_helper.rb b/users/test/support/auth_test_helper.rb
index 50e9453..57f9f9b 100644
--- a/users/test/support/auth_test_helper.rb
+++ b/users/test/support/auth_test_helper.rb
@@ -27,7 +27,7 @@ module AuthTestHelper
       else
         if logged_in
           assert_equal({:alert => I18n.t(:not_authorized)}, flash.to_hash)
-          assert_redirected_to root_url
+          assert_redirected_to home_url
         else
           assert_equal({:alert => I18n.t(:not_authorized_login)}, flash.to_hash)
           assert_redirected_to login_url