Merge remote-tracking branch 'origin/develop'

Conflicts:
	app/assets/javascripts/srp
	test/nagios/soledad_sync.py
	test/nagios/webapp_login.py

1 files changed, 17 insertions, 0 deletions

diff --git a/test/integration/browser/session_test.rb b/test/integration/browser/session_test.rb
new file mode 100644
index 0000000..fb20847
--- /dev/null
+++ b/test/integration/browser/session_test.rb
@@ -0,0 +1,17 @@
+require 'test_helper'
+
+class SessionTest < BrowserIntegrationTest
+
+  test "valid session" do
+    login
+    assert page.has_content?("Logout")
+  end
+
+  test "expired session" do
+    login
+    pretend_now_is(Time.now + 80.minutes) do
+      visit '/'
+      assert page.has_content?("Log In")
+    end
+  end
+end