Author: ornicar2
Date: 2010-02-05 18:13:00 +0100 (Fri, 05 Feb 2010)
New Revision: 27600
Removed:
plugins/diemPlugin/trunk/dmCorePlugin/test/project/apps/admin/modules/auteur/
plugins/diemPlugin/trunk/dmCorePlugin/test/project/apps/admin/modules/author/
plugins/diemPlugin/trunk/dmCorePlugin/test/project/apps/front/modules/auteur/
plugins/diemPlugin/trunk/dmCorePlugin/test/project/apps/front/modules/dmUser/
plugins/diemPlugin/trunk/dmCorePlugin/test/project/public_html/dm/
Modified:
plugins/diemPlugin/trunk/dmCorePlugin/test/project/apps/admin/config/settings.yml
plugins/diemPlugin/trunk/dmCorePlugin/test/project/config/ProjectConfiguration.class.php
plugins/diemPlugin/trunk/dmCorePlugin/test/project/data/db.sqlite
plugins/diemPlugin/trunk/dmCorePlugin/test/project/data/fresh_db.sqlite
plugins/diemPlugin/trunk/dmCorePlugin/test/project/lib/form/doctrine/dmCorePlugin/base/BaseDmMediaForm.class.php
plugins/diemPlugin/trunk/dmCorePlugin/test/project/plugins/dmContactPlugin/lib/filter/doctrine/PluginDmContactFormFilter.class.php
plugins/diemPlugin/trunk/dmCorePlugin/test/project/plugins/dmContactPlugin/lib/form/doctrine/PluginDmContactForm.class.php
plugins/diemPlugin/trunk/dmCorePlugin/test/project/plugins/dmContactPlugin/test/unit/dmContactPluginTest.php
plugins/diemPlugin/trunk/dmCorePlugin/test/project/test/functional/admin/dmSigninTest.php
plugins/diemPlugin/trunk/dmCorePlugin/test/project/test/functional/dmRefreshFunctionalTestInclude.php
plugins/diemPlugin/trunk/dmCorePlugin/test/project/test/unit/dmProjectConfigTest.php
plugins/diemPlugin/trunk/dmCorePlugin/test/project/test/unit/dmProjectLoremizerTest.php
plugins/diemPlugin/trunk/dmCorePlugin/test/project/test/unit/dmProjectTableTest.php
Log:
[Diem]
- updated test project
Modified:
plugins/diemPlugin/trunk/dmCorePlugin/test/project/apps/admin/config/settings.yml
===================================================================
---
plugins/diemPlugin/trunk/dmCorePlugin/test/project/apps/admin/config/settings.yml
2010-02-05 16:54:42 UTC (rev 27599)
+++
plugins/diemPlugin/trunk/dmCorePlugin/test/project/apps/admin/config/settings.yml
2010-02-05 17:13:00 UTC (rev 27600)
@@ -33,8 +33,8 @@
use_database: true
.actions:
- secure_module: dmAuth
+ secure_module: dmAuthAdmin
secure_action: secure
- login_module: dmAuth
+ login_module: dmAuthAdmin
login_action: signin
\ No newline at end of file
Modified:
plugins/diemPlugin/trunk/dmCorePlugin/test/project/config/ProjectConfiguration.class.php
===================================================================
---
plugins/diemPlugin/trunk/dmCorePlugin/test/project/config/ProjectConfiguration.class.php
2010-02-05 16:54:42 UTC (rev 27599)
+++
plugins/diemPlugin/trunk/dmCorePlugin/test/project/config/ProjectConfiguration.class.php
2010-02-05 17:13:00 UTC (rev 27600)
@@ -55,13 +55,11 @@
protected function removeWebSymlinks()
{
- @unlink(dmOs::join(sfConfig::get('sf_web_dir'), 'sf'));
- @unlink(dmOs::join(sfConfig::get('sf_web_dir'), 'dmFlowPlayerPlugin'));
- @unlink(dmOs::join(sfConfig::get('sf_web_dir'), 'sfFormExtraPlugin'));
-
- foreach(array('core', 'front', 'admin') as $dmAssetDir)
+ foreach(array(
+ 'dmFlowPlayerPlugin', 'sfFormExtraPlugin', 'dmCorePlugin',
'dmAdminPlugin', 'dmFrontPlugin', 'dmUserPlugin', 'sf'
+ ) as $symlink)
{
- @unlink(sfConfig::get('sf_web_dir').'/dm/'.$dmAssetDir);
+ @unlink(dmOs::join(sfConfig::get('sf_web_dir'), $symlink));
}
}
Modified: plugins/diemPlugin/trunk/dmCorePlugin/test/project/data/db.sqlite
===================================================================
(Binary files differ)
Modified:
plugins/diemPlugin/trunk/dmCorePlugin/test/project/data/fresh_db.sqlite
===================================================================
(Binary files differ)
Modified:
plugins/diemPlugin/trunk/dmCorePlugin/test/project/lib/form/doctrine/dmCorePlugin/base/BaseDmMediaForm.class.php
===================================================================
---
plugins/diemPlugin/trunk/dmCorePlugin/test/project/lib/form/doctrine/dmCorePlugin/base/BaseDmMediaForm.class.php
2010-02-05 16:54:42 UTC (rev 27599)
+++
plugins/diemPlugin/trunk/dmCorePlugin/test/project/lib/form/doctrine/dmCorePlugin/base/BaseDmMediaForm.class.php
2010-02-05 17:13:00 UTC (rev 27600)
@@ -26,6 +26,7 @@
'dimensions' => new sfWidgetFormInputText(),
'created_at' => new sfWidgetFormDateTime(),
'updated_at' => new sfWidgetFormDateTime(),
+ 'dm_test_post_list' => new sfWidgetFormDoctrineChoice(array('multiple'
=> true, 'model' => 'DmTestPost')),
));
$this->setValidators(array(
@@ -40,6 +41,7 @@
'dimensions' => new sfValidatorString(array('max_length' => 15,
'required' => false)),
'created_at' => new sfValidatorDateTime(),
'updated_at' => new sfValidatorDateTime(),
+ 'dm_test_post_list' => new sfValidatorDoctrineChoice(array('multiple'
=> true, 'model' => 'DmTestPost', 'required' => false)),
));
$this->validatorSchema->setPostValidator(
@@ -60,4 +62,60 @@
return 'DmMedia';
}
+ public function updateDefaultsFromObject()
+ {
+ parent::updateDefaultsFromObject();
+
+ if (isset($this->widgetSchema['dm_test_post_list']))
+ {
+ $this->setDefault('dm_test_post_list',
$this->object->DmTestPost->getPrimaryKeys());
+ }
+
+ }
+
+ protected function doSave($con = null)
+ {
+ $this->saveDmTestPostList($con);
+
+ parent::doSave($con);
+ }
+
+ public function saveDmTestPostList($con = null)
+ {
+ if (!$this->isValid())
+ {
+ throw $this->getErrorSchema();
+ }
+
+ if (!isset($this->widgetSchema['dm_test_post_list']))
+ {
+ // somebody has unset this widget
+ return;
+ }
+
+ if (null === $con)
+ {
+ $con = $this->getConnection();
+ }
+
+ $existing = $this->object->DmTestPost->getPrimaryKeys();
+ $values = $this->getValue('dm_test_post_list');
+ if (!is_array($values))
+ {
+ $values = array();
+ }
+
+ $unlink = array_diff($existing, $values);
+ if (count($unlink))
+ {
+ $this->object->unlink('DmTestPost', array_values($unlink));
+ }
+
+ $link = array_diff($values, $existing);
+ if (count($link))
+ {
+ $this->object->link('DmTestPost', array_values($link));
+ }
+ }
+
}
Modified:
plugins/diemPlugin/trunk/dmCorePlugin/test/project/plugins/dmContactPlugin/lib/filter/doctrine/PluginDmContactFormFilter.class.php
===================================================================
---
plugins/diemPlugin/trunk/dmCorePlugin/test/project/plugins/dmContactPlugin/lib/filter/doctrine/PluginDmContactFormFilter.class.php
2010-02-05 16:54:42 UTC (rev 27599)
+++
plugins/diemPlugin/trunk/dmCorePlugin/test/project/plugins/dmContactPlugin/lib/filter/doctrine/PluginDmContactFormFilter.class.php
2010-02-05 17:13:00 UTC (rev 27600)
@@ -3,9 +3,9 @@
/**
* PluginDmContact form.
*
- * @package ##PROJECT_NAME##
+ * @package retest
* @subpackage filter
- * @author ##AUTHOR_NAME##
+ * @author Your name here
* @version SVN: $Id: sfDoctrineFormFilterPluginTemplate.php 23810
2009-11-12 11:07:44Z Kris.Wallsmith $
*/
abstract class PluginDmContactFormFilter extends BaseDmContactFormFilter
Modified:
plugins/diemPlugin/trunk/dmCorePlugin/test/project/plugins/dmContactPlugin/lib/form/doctrine/PluginDmContactForm.class.php
===================================================================
---
plugins/diemPlugin/trunk/dmCorePlugin/test/project/plugins/dmContactPlugin/lib/form/doctrine/PluginDmContactForm.class.php
2010-02-05 16:54:42 UTC (rev 27599)
+++
plugins/diemPlugin/trunk/dmCorePlugin/test/project/plugins/dmContactPlugin/lib/form/doctrine/PluginDmContactForm.class.php
2010-02-05 17:13:00 UTC (rev 27600)
@@ -3,9 +3,9 @@
/**
* PluginDmContact form.
*
- * @package ##PROJECT_NAME##
+ * @package retest
* @subpackage form
- * @author ##AUTHOR_NAME##
+ * @author Your name here
* @version SVN: $Id$
*/
abstract class PluginDmContactForm extends BaseDmContactForm
Modified:
plugins/diemPlugin/trunk/dmCorePlugin/test/project/plugins/dmContactPlugin/test/unit/dmContactPluginTest.php
===================================================================
---
plugins/diemPlugin/trunk/dmCorePlugin/test/project/plugins/dmContactPlugin/test/unit/dmContactPluginTest.php
2010-02-05 16:54:42 UTC (rev 27599)
+++
plugins/diemPlugin/trunk/dmCorePlugin/test/project/plugins/dmContactPlugin/test/unit/dmContactPluginTest.php
2010-02-05 17:13:00 UTC (rev 27600)
@@ -6,7 +6,7 @@
$helper->boot();
-$t = new lime_test();
+$t = new lime_test(4);
$module = $helper->get('module_manager')->getModule('dmContact');
@@ -14,4 +14,6 @@
$t->ok($module->isPlugin(), 'plugin module');
-$t->ok($module->getPluginName(), 'dmContactPlugin');
\ No newline at end of file
+$t->is($module->getPluginName(), 'dmContactPlugin', 'dmContact plugin is
dmContactPlugin');
+
+$t->ok(!$module->isOverridden(), 'dmContactPlugin is not overridden');
\ No newline at end of file
Modified:
plugins/diemPlugin/trunk/dmCorePlugin/test/project/test/functional/admin/dmSigninTest.php
===================================================================
---
plugins/diemPlugin/trunk/dmCorePlugin/test/project/test/functional/admin/dmSigninTest.php
2010-02-05 16:54:42 UTC (rev 27599)
+++
plugins/diemPlugin/trunk/dmCorePlugin/test/project/test/functional/admin/dmSigninTest.php
2010-02-05 17:13:00 UTC (rev 27600)
@@ -25,7 +25,7 @@
->checkElement('form.dm_form')
->end()
->with('request')->begin()
-->isParameter('module', 'dmAuth')
+->isParameter('module', 'dmAuthAdmin')
->isParameter('action', 'signin')
->end()
;
Modified:
plugins/diemPlugin/trunk/dmCorePlugin/test/project/test/functional/dmRefreshFunctionalTestInclude.php
===================================================================
---
plugins/diemPlugin/trunk/dmCorePlugin/test/project/test/functional/dmRefreshFunctionalTestInclude.php
2010-02-05 16:54:42 UTC (rev 27599)
+++
plugins/diemPlugin/trunk/dmCorePlugin/test/project/test/functional/dmRefreshFunctionalTestInclude.php
2010-02-05 17:13:00 UTC (rev 27600)
@@ -23,10 +23,11 @@
));
/*
- * On some old version of sqlite
+ * With some old version of sqlite, like on continuous integration server
* This test will not work as expected
*/
-if('Sqlite' ==
Doctrine_Manager::getInstance()->getCurrentConnection()->getDriverName())
+
+if(strpos(getcwd(), 'hudson'))
{
return;
}
Modified:
plugins/diemPlugin/trunk/dmCorePlugin/test/project/test/unit/dmProjectConfigTest.php
===================================================================
---
plugins/diemPlugin/trunk/dmCorePlugin/test/project/test/unit/dmProjectConfigTest.php
2010-02-05 16:54:42 UTC (rev 27599)
+++
plugins/diemPlugin/trunk/dmCorePlugin/test/project/test/unit/dmProjectConfigTest.php
2010-02-05 17:13:00 UTC (rev 27600)
@@ -12,6 +12,7 @@
$t->is($helper->getConfiguration()->getConfigPaths($configPath), array(
dmOs::join(sfConfig::get('dm_core_dir'), $configPath),
dmOs::join(sfConfig::get('dm_admin_dir'), $configPath),
+ dmOs::join(sfConfig::get('dm_core_dir'), 'plugins/dmUserPlugin',
$configPath),
dmOs::join(sfConfig::get('sf_plugins_dir'), 'dmContactPlugin', $configPath),
dmOs::join(sfConfig::get('sf_root_dir'), $configPath),
dmOs::join(sfConfig::get('sf_apps_dir'), 'admin', $configPath)
Modified:
plugins/diemPlugin/trunk/dmCorePlugin/test/project/test/unit/dmProjectLoremizerTest.php
===================================================================
---
plugins/diemPlugin/trunk/dmCorePlugin/test/project/test/unit/dmProjectLoremizerTest.php
2010-02-05 16:54:42 UTC (rev 27599)
+++
plugins/diemPlugin/trunk/dmCorePlugin/test/project/test/unit/dmProjectLoremizerTest.php
2010-02-05 17:13:00 UTC (rev 27600)
@@ -4,7 +4,7 @@
$helper = new dmUnitTestHelper();
$helper->boot();
-$t = new lime_test(60);
+$t = new lime_test(66);
$helper->clearDatabase($t);
Modified:
plugins/diemPlugin/trunk/dmCorePlugin/test/project/test/unit/dmProjectTableTest.php
===================================================================
---
plugins/diemPlugin/trunk/dmCorePlugin/test/project/test/unit/dmProjectTableTest.php
2010-02-05 16:54:42 UTC (rev 27599)
+++
plugins/diemPlugin/trunk/dmCorePlugin/test/project/test/unit/dmProjectTableTest.php
2010-02-05 17:13:00 UTC (rev 27600)
@@ -4,7 +4,7 @@
$helper = new dmUnitTestHelper();
$helper->boot();
-$t = new lime_test(22);
+$t = new lime_test(23);
$table = dmDb::table('DmTestPost');
@@ -25,7 +25,8 @@
foreach(array(
'dmPage' => false,
- 'dmUser' => false,
+ 'dmUser' => true,
+ 'dmPermission' => false,
'dmWidget' => false,
'dmTransUnit' => false,
'dmTestComment' => true,
--
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.
