From a6f3a107f1f9dd1a116422e63802f1a322beb364 Mon Sep 17 00:00:00 2001
From: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Date: Fri, 12 Aug 2016 08:09:50 +0200
Subject: [PATCH] Bug 17110: Add unit test for MaxAge parameter in Token.t
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Test plan:
Run t/Token.t

Signed-off-by: Marc Véron <veron@veron.ch>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Mason James <mtj@kohaaloha.com>
---
 t/Token.t | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/t/Token.t b/t/Token.t
index 2314d2ebba..6ba5b7eb98 100644
--- a/t/Token.t
+++ b/t/Token.t
@@ -51,11 +51,16 @@ isnt( $result, 1, "This token is no CSRF token" );
 # Test MaxAge parameter
 my $age = 1; # 1 second
 $result = $tokenizer->check_csrf({
+<<<<<<< HEAD
     session_id => $id, token => $csrftoken, MaxAge => $age,
+=======
+    id => $id, secret => $secr, token => $csrftoken, MaxAge => $age,
+>>>>>>> Bug 17110: Add unit test for MaxAge parameter in Token.t
 });
 is( $result, 1, "CSRF token still valid within one second" );
 usleep $age * 1000000 * 2; # micro (millionth) seconds + 100%
 $result = $tokenizer->check_csrf({
+<<<<<<< HEAD
     session_id => $id, token => $csrftoken, MaxAge => $age,
 });
 isnt( $result, 1, "CSRF token expired after one second" );
@@ -89,3 +94,8 @@ subtest 'Same logged in user with another session (cookie CGISESSID)' => sub {
     });
     is( $result, '', "CSRF token is not verified if another session is used" );
 };
+=======
+    id => $id, secret => $secr, token => $csrftoken, MaxAge => $age,
+});
+isnt( $result, 1, "CSRF token expired after one second" );
+>>>>>>> Bug 17110: Add unit test for MaxAge parameter in Token.t
-- 
2.39.5