Author: ornicar2
Date: 2010-02-08 11:06:32 +0100 (Mon, 08 Feb 2010)
New Revision: 27701
Modified:
plugins/diemPlugin/trunk/dmCorePlugin/test/unit/dmI18nTest.php
plugins/diemPlugin/trunk/dmCorePlugin/test/unit/dmMenuTest.php
plugins/diemPlugin/trunk/dmCorePlugin/test/unit/dmServiceContainerTest.php
plugins/diemPlugin/trunk/dmCorePlugin/test/unit/helper/dmPageUnitTestHelper.php
Log:
[Diem]
- updated unit tests to use main/signin page instead of main/login
Modified: plugins/diemPlugin/trunk/dmCorePlugin/test/unit/dmI18nTest.php
===================================================================
--- plugins/diemPlugin/trunk/dmCorePlugin/test/unit/dmI18nTest.php
2010-02-08 10:01:57 UTC (rev 27700)
+++ plugins/diemPlugin/trunk/dmCorePlugin/test/unit/dmI18nTest.php
2010-02-08 10:06:32 UTC (rev 27701)
@@ -18,8 +18,9 @@
$t->diag('Clearing settings translations for cultures c1 and c2');
-$form = new DmFormSignin;
+$form = new DmSigninAdminForm;
+
$t->is($i18n->__('Username'), $expected = 'Username', 'en: '.$expected);
$t->is((string)$form['username']->label(), $expected = '<label class="label"
for="signin_username">Username</label>', 'en: '.$expected);
Modified: plugins/diemPlugin/trunk/dmCorePlugin/test/unit/dmMenuTest.php
===================================================================
--- plugins/diemPlugin/trunk/dmCorePlugin/test/unit/dmMenuTest.php
2010-02-08 10:01:57 UTC (rev 27700)
+++ plugins/diemPlugin/trunk/dmCorePlugin/test/unit/dmMenuTest.php
2010-02-08 10:06:32 UTC (rev 27701)
@@ -172,7 +172,7 @@
$t->is($menu->render(), $html, 'Current li has the dm_current class');
-$helper->getContext()->setPage(dmDb::table('DmPage')->findOneByModuleAndAction('main',
'login'));
+$helper->getContext()->setPage(dmDb::table('DmPage')->findOneByModuleAndAction('main',
'signin'));
$menu = $helper->get('menu')->addChild('Home', '@homepage')->end();
$html = _tag('ul', _tag('li.first.last.dm_parent',
_link()->text($helper->get('i18n')->__('Home'))));
Modified:
plugins/diemPlugin/trunk/dmCorePlugin/test/unit/dmServiceContainerTest.php
===================================================================
--- plugins/diemPlugin/trunk/dmCorePlugin/test/unit/dmServiceContainerTest.php
2010-02-08 10:01:57 UTC (rev 27700)
+++ plugins/diemPlugin/trunk/dmCorePlugin/test/unit/dmServiceContainerTest.php
2010-02-08 10:06:32 UTC (rev 27701)
@@ -7,7 +7,7 @@
$isFront = sfConfig::get('dm_context_type') == 'front';
$sc = $helper->get('service_container');
-$t = new lime_test(5 + count(sfConfig::get('dm_i18n_cultures')) + ($isFront ?
count(sfConfig::get('dm_theme_list')) : 0));
+$t = new lime_test();
$user = $helper->get('user');
$theme = $user->getTheme();
Modified:
plugins/diemPlugin/trunk/dmCorePlugin/test/unit/helper/dmPageUnitTestHelper.php
===================================================================
---
plugins/diemPlugin/trunk/dmCorePlugin/test/unit/helper/dmPageUnitTestHelper.php
2010-02-08 10:01:57 UTC (rev 27700)
+++
plugins/diemPlugin/trunk/dmCorePlugin/test/unit/helper/dmPageUnitTestHelper.php
2010-02-08 10:06:32 UTC (rev 27701)
@@ -38,13 +38,13 @@
$t->is($error404->getNodeParentId(), $root->id,
'error404->getNodeParentId() returns root.id');
- $login = $this->pageTable->findOneByModuleAndAction('main', 'login');
+ $signin = $this->pageTable->findOneByModuleAndAction('main', 'signin');
- $t->ok($login instanceof DmPage, 'login exists');
+ $t->ok($signin instanceof DmPage, 'signin exists');
- $t->is($login->getNode()->getParent(), $root, 'login is child of root');
+ $t->is($signin->getNode()->getParent(), $root, 'signin is child of
root');
- $t->is($login->getNodeParentId(), $root->id, 'login->getNodeParentId()
returns root.id');
+ $t->is($signin->getNodeParentId(), $root->id, 'signin->getNodeParentId()
returns root.id');
}
public function testI18nFetching(lime_test $t)
--
You received this message because you are subscribed to the Google Groups
"symfony SVN" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/symfony-svn?hl=en.
