aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2013-06-27 01:09:52 +0200
committerAndreas Fischer <bantu@phpbb.com>2013-06-27 01:09:52 +0200
commit95730c1ff10a032b799f01151996fc36aa84db0e (patch)
tree4a59397562cf82d6778f80ec3becbf075f492f0c /tests
parent47241878d01adaa3a169982bc64167342fb7cfd8 (diff)
parent7ba81a293f014f3c6b161672b8fbc27e2075d239 (diff)
downloadforums-95730c1ff10a032b799f01151996fc36aa84db0e.tar
forums-95730c1ff10a032b799f01151996fc36aa84db0e.tar.gz
forums-95730c1ff10a032b799f01151996fc36aa84db0e.tar.bz2
forums-95730c1ff10a032b799f01151996fc36aa84db0e.tar.xz
forums-95730c1ff10a032b799f01151996fc36aa84db0e.zip
Merge remote-tracking branch 'asperous/ticket/11615/creation_test' into develop-olympus
* asperous/ticket/11615/creation_test: [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 2ce6c4a4ac..bef52c6554 100644
--- a/tests/session/init_test.php
+++ b/tests/session/creation_test.php
@@ -10,7 +10,7 @@
require_once dirname(__FILE__) . '/../mock/cache.php';
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()
{
@@ -35,10 +35,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),