fix #1167

app/controllers/login_controller.rb

@@ -84,6 +84,12 @@ class LoginController < ApplicationController
   def expire_session
     # this is a hack to enable cucumber to expire a session by calling this
     # method. The method will be unavailable for production environment
+    
+    @user.forget_me if logged_in?
+    cookies.delete :auth_token
+    session['user_id'] = nil
+    reset_session
+    
     unless Rails.env.production?
       session['expiry_time'] = Time.now
       respond_to do |format|

app/views/login/check_expiry.js.erb

@@ -5,4 +5,5 @@
   -%>
   $('div#navcontainer').hide();
   $('div#content').html('<%=theHtml%>');
+  refresh_page(); // refresh the page. if it fails, the message above remains
 <%  end -%>

app/views/todos/check_deferred.js.erb

@@ -1,3 +1,3 @@
 <% unless @due_tickles.empty? -%>
-  TracksPages.page_notify('notice', "<%=t('todos.tickler_items_due', :count => @due_tickles.length)%>", 5);
+  TracksPages.page_notify('notice', "<%=t('todos.tickler_items_due', :count => @due_tickles.length)%>", 8);
 <% end -%>

app/views/users/destroy.js.erb

@@ -1,7 +1,7 @@
 <% if @saved -%>
   remove_user_from_page();
   TracksPages.set_page_badge(<%= @total_users %>);
-  TracksPages.page_notify('notice', '<%=  t('users.destroy_successful', :login => @deleted_user.login) %>', 5);
+  TracksPages.page_notify('notice', '<%=  t('users.destroy_successful', :login => @deleted_user.login) %>', 8);
 <% else -%>
   TracksPages.page_notify('error', '<%=  t('users.destroy_error', :login => @deleted_user.login) %>', 8);
 <% end -%>

features/logging_in.feature

@@ -56,4 +56,4 @@ Feature: Existing user logging in
     And I submit the login form as user "testuser" with password "secret" 
     Then I should be on the login page
     When my session expires
-    Then I should see "Session has timed out"
+    Then I should be on the login page

public/javascripts/application.js

@@ -999,6 +999,10 @@ function redirect_to(path) {
     window.location.href = path;
 }
 
+function refresh_page() {
+    location.reload(true);
+}
+
 function setup_auto_refresh(interval){
     field_touched = false;
     function refresh_page() {