Merge branch 'pull-117'

This commit is contained in:
Ingo Schommer 2013-06-28 10:18:34 +02:00
commit 5109f80ed9

View File

@ -69,7 +69,7 @@ class TranslatableSearchFormTest extends FunctionalTest {
// through a pseudo GET variable in getResults() // through a pseudo GET variable in getResults()
$lang = 'en_US'; $lang = 'en_US';
$results = $sf->getResults(null, array('Search'=>'content', 'locale'=>$lang)); $results = $sf->getResults(null, array('Search'=>'content', 'searchlocale'=>$lang));
$this->assertContains( $this->assertContains(
$publishedPage->ID, $publishedPage->ID,
$results->column('ID'), $results->column('ID'),
@ -82,7 +82,7 @@ class TranslatableSearchFormTest extends FunctionalTest {
); );
$lang = 'de_DE'; $lang = 'de_DE';
$results = $sf->getResults(null, array('Search'=>'content', 'locale'=>$lang)); $results = $sf->getResults(null, array('Search'=>'content', 'searchlocale'=>$lang));
$this->assertNotContains( $this->assertNotContains(
$publishedPage->ID, $publishedPage->ID,
$results->column('ID'), $results->column('ID'),