Author: Jonathan.Wage
Date: 2010-02-17 17:42:53 +0100 (Wed, 17 Feb 2010)
New Revision: 28093
Modified:
plugins/sfSympalPlugin/trunk/lib/sfSympalPluginEnabler.class.php
plugins/sfSympalPlugin/trunk/test/fixtures/project/apps/sympal/config/app.yml
plugins/sfSympalPlugin/trunk/test/functional/ActionsTest.php
Log:
[1.4][sfSympalPlugin][1.0] Fixing issues with tests
Modified: plugins/sfSympalPlugin/trunk/lib/sfSympalPluginEnabler.class.php
===================================================================
--- plugins/sfSympalPlugin/trunk/lib/sfSympalPluginEnabler.class.php
2010-02-17 16:31:45 UTC (rev 28092)
+++ plugins/sfSympalPlugin/trunk/lib/sfSympalPluginEnabler.class.php
2010-02-17 16:42:53 UTC (rev 28093)
@@ -61,13 +61,14 @@
$this->enableSympalCorePlugins(sfSympalPluginConfiguration::$dependencies);
$plugins = $this->_configuration->getPlugins();
+ $foundPlugins = array();
$finder =
sfFinder::type('dir')->maxdepth(0)->ignore_version_control(false)->follow_link()->name('*Plugin');
foreach ($finder->in(sfConfig::get('sf_plugins_dir')) as $path)
{
- $plugins[] = basename($path);
+ $foundPlugins[] = basename($path);
}
+ $plugins = array_merge($plugins, $foundPlugins);
$plugins = array_unique($plugins);
- sort($plugins);
$this->_configuration->setPlugins($plugins);
}
Modified:
plugins/sfSympalPlugin/trunk/test/fixtures/project/apps/sympal/config/app.yml
===================================================================
---
plugins/sfSympalPlugin/trunk/test/fixtures/project/apps/sympal/config/app.yml
2010-02-17 16:31:45 UTC (rev 28092)
+++
plugins/sfSympalPlugin/trunk/test/fixtures/project/apps/sympal/config/app.yml
2010-02-17 16:42:53 UTC (rev 28093)
@@ -1,7 +1,6 @@
all:
sympal_config:
breadcrumbs_separator: ' / '
- language_codes: [en, fr, es]
plugin_api:
username: test
password: test
Modified: plugins/sfSympalPlugin/trunk/test/functional/ActionsTest.php
===================================================================
--- plugins/sfSympalPlugin/trunk/test/functional/ActionsTest.php
2010-02-17 16:31:45 UTC (rev 28092)
+++ plugins/sfSympalPlugin/trunk/test/functional/ActionsTest.php
2010-02-17 16:42:53 UTC (rev 28093)
@@ -72,28 +72,4 @@
with('response')->begin()->
matches('/Test Layout/')->
end()
-;
-
-$browser->
- get('/')->
- call('/change_language/fr')->
- with('response')->begin()->
- isRedirected()->
- followRedirect()->
- end()->
- with('user')->begin()->
- isCulture('fr')->
- end()
-;
-
-$browser->
- get('/')->
- post('/change_language', array('language' => 'es'))->
- with('response')->begin()->
- isRedirected()->
- followRedirect()->
- end()->
- with('user')->begin()->
- isCulture('es')->
- end()
;
\ No newline at end of file
--
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.
