From 165e417bc6ba66d51d74764db7b59279fb6a923f Mon Sep 17 00:00:00 2001
From: Azul <azul@leap.se>
Date: Tue, 17 Sep 2013 13:04:11 +0200
Subject: integration tests for session expiry

---
 users/test/integration/browser/account_test.rb | 11 ----------
 users/test/integration/browser/session_test.rb | 28 ++++++++++++++++++++++++++
 2 files changed, 28 insertions(+), 11 deletions(-)
 create mode 100644 users/test/integration/browser/session_test.rb

(limited to 'users/test/integration')

diff --git a/users/test/integration/browser/account_test.rb b/users/test/integration/browser/account_test.rb
index a5ec2c5..ae4676c 100644
--- a/users/test/integration/browser/account_test.rb
+++ b/users/test/integration/browser/account_test.rb
@@ -47,17 +47,6 @@ class AccountTest < BrowserIntegrationTest
     assert page.has_content?("server failed")
   end
 
-  def submit_signup
-    username = "test_#{SecureRandom.urlsafe_base64}".downcase
-    password = SecureRandom.base64
-    visit '/users/new'
-    fill_in 'Username', with: username
-    fill_in 'Password', with: password
-    fill_in 'Password confirmation', with: password
-    click_on 'Sign Up'
-    return username, password
-  end
-
   def inject_malicious_js
     page.execute_script <<-EOJS
       var calc = new srp.Calculate();
diff --git a/users/test/integration/browser/session_test.rb b/users/test/integration/browser/session_test.rb
new file mode 100644
index 0000000..bb4e8c9
--- /dev/null
+++ b/users/test/integration/browser/session_test.rb
@@ -0,0 +1,28 @@
+require 'test_helper'
+
+class SessionTest < BrowserIntegrationTest
+
+  setup do
+    Capybara.current_driver = Capybara.javascript_driver
+    @username, password = submit_signup
+  end
+
+  teardown do
+    user = User.find_by_login(@username)
+    id = user.identity
+    id.destroy
+    user.destroy
+  end
+
+  test "valid session" do
+    assert page.has_content?("Welcome #{@username}")
+  end
+
+  test "expired session" do
+    assert page.has_content?("Welcome #{@username}")
+    pretend_now_is(Time.now + 40.minutes) do
+      visit '/'
+      assert page.has_no_content?("Welcome #{@username}")
+    end
+  end
+end
-- 
cgit v1.2.3


From 3ca376a4070428c862c9db48cba25c3d307955ea Mon Sep 17 00:00:00 2001
From: Azul <azul@leap.se>
Date: Wed, 18 Sep 2013 10:26:23 +0200
Subject: user.account shortcut to Account.new(user)

---
 users/test/integration/browser/account_test.rb | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'users/test/integration')

diff --git a/users/test/integration/browser/account_test.rb b/users/test/integration/browser/account_test.rb
index a5ec2c5..06f2401 100644
--- a/users/test/integration/browser/account_test.rb
+++ b/users/test/integration/browser/account_test.rb
@@ -13,9 +13,7 @@ class AccountTest < BrowserIntegrationTest
     assert page.has_content?("Sign Up")
     assert_equal '/', current_path
     assert user = User.find_by_login(username)
-    assert id = user.identity
-    id.destroy
-    user.destroy
+    user.account.destroy
   end
 
   test "successful login" do
-- 
cgit v1.2.3