Refactoring timeoutable module and confirmable tests.

test/integration/confirmable_test.rb

@@ -59,19 +59,21 @@ class ConfirmationTest < ActionController::IntegrationTest
   end
 
   test 'not confirmed user with setup to block without confirmation should not be able to sign in' do
-    Devise.confirm_within = 0
-    sign_in_as_user(:confirm => false)
+    swap Devise, :confirm_within => 0.days do
+      sign_in_as_user(:confirm => false)
 
-    assert_contain 'You have to confirm your account before continuing'
-    assert_not warden.authenticated?(:user)
+      assert_contain 'You have to confirm your account before continuing'
+      assert_not warden.authenticated?(:user)
+    end
   end
 
   test 'not confirmed user but configured with some days to confirm should be able to sign in' do
-    Devise.confirm_within = 1
-    sign_in_as_user(:confirm => false)
+    swap Devise, :confirm_within => 1.day do
+      sign_in_as_user(:confirm => false)
 
-    assert_response :success
-    assert warden.authenticated?(:user)
+      assert_response :success
+      assert warden.authenticated?(:user)
+    end
   end
 
   test 'error message is configurable by resource name' do

test/integration/timeoutable_test.rb

@@ -41,4 +41,20 @@ class SessionTimeoutTest < ActionController::IntegrationTest
     assert warden.authenticated?(:user)
   end
 
+  test 'user configured timeout limit' do
+    swap Devise, :timeout => 8.minutes do
+      user = sign_in_as_user
+
+      # Setup last_request_at to timeout
+      get edit_user_path(user)
+      assert_not_nil last_request_at
+      assert_response :success
+      assert warden.authenticated?(:user)
+
+      get users_path
+      assert_redirected_to new_user_session_path(:timeout => true)
+      assert_not warden.authenticated?(:user)
+    end
+  end
+
 end

test/models/timeoutable_test.rb

@@ -2,4 +2,26 @@ require 'test/test_helper'
 
 class TimeoutableTest < ActiveSupport::TestCase
 
+  test 'should be expired' do
+    assert new_user.timeout?(11.minutes.ago)
+  end
+
+  test 'should not be expired' do
+    assert_not new_user.timeout?(9.minutes.ago)
+  end
+
+  test 'should not be expired when params is nil' do
+    assert_not new_user.timeout?(nil)
+  end
+
+  test 'fallback to Devise config option' do
+    swap Devise, :timeout => 1.minute do
+      user = new_user
+      assert user.timeout?(2.minutes.ago)
+      assert_not user.timeout?(30.seconds.ago)
+      Devise.timeout = 5.minutes
+      assert_not user.timeout?(2.minutes.ago)
+      assert user.timeout?(6.minutes.ago)
+    end
+  end
 end