aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2013-06-27 01:12:34 +0200
committerAndreas Fischer <bantu@phpbb.com>2013-06-27 01:12:34 +0200
commitd0f07045156adaea1e8376ee74c533fd04704bba (patch)
treec79581ec3cd5f36a84ca97c51dc02b4024bf9c60 /tests
parenta5c971176be81f854772919713da6db506fa7cd1 (diff)
parent95730c1ff10a032b799f01151996fc36aa84db0e (diff)
downloadforums-d0f07045156adaea1e8376ee74c533fd04704bba.tar
forums-d0f07045156adaea1e8376ee74c533fd04704bba.tar.gz
forums-d0f07045156adaea1e8376ee74c533fd04704bba.tar.bz2
forums-d0f07045156adaea1e8376ee74c533fd04704bba.tar.xz
forums-d0f07045156adaea1e8376ee74c533fd04704bba.zip
Merge branch 'develop-olympus' into develop
* develop-olympus: [ticket/11615] Fix typo in creation_test [ticket/11615] Remove magic number in creation_test [ticket/11615] Rename class in file to match [ticket/11615] Rename init_test to creation_test for clarity
Diffstat (limited to 'tests')
-rw-r--r--tests/session/creation_test.php (renamed from tests/session/init_test.php)7
1 files changed, 4 insertions, 3 deletions
diff --git a/tests/session/init_test.php b/tests/session/creation_test.php
index 830de34ed0..6e61f085a6 100644
--- a/tests/session/init_test.php
+++ b/tests/session/creation_test.php
@@ -9,7 +9,7 @@
require_once dirname(__FILE__) . '/testable_factory.php';
-class phpbb_session_init_test extends phpbb_database_test_case
+class phpbb_session_creation_test extends phpbb_database_test_case
{
public function getDataSet()
{
@@ -34,10 +34,11 @@ class phpbb_session_init_test extends phpbb_database_test_case
$this->assertSqlResultEquals(
array(array('session_user_id' => 3)),
$sql,
- 'Check if exacly one session for user id 3 was created'
+ 'Check if exactly one session for user id 3 was created'
);
- $cookie_expire = $session->time_now + 31536000; // default is one year
+ $one_year_in_seconds = 365 * 24 * 60 * 60;
+ $cookie_expire = $session->time_now + $one_year_in_seconds;
$session->check_cookies($this, array(
'u' => array(null, $cookie_expire),