mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-10 10:44:20 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.1.x' into 3.2.x

Browse Source
This commit is contained in:
Marc Alexander
2016-10-28 21:06:21 +02:00
parent b8ef36ddb1 85898d3d2c
commit f658e062b2
3 changed files with 23 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
tests/functional/search/base.php
View File

@@ -79,18 +79,16 @@ abstract class phpbb_functional_search_base extends phpbb_functional_test_case
{
$this->add_lang('acp/search');
$crawler = self::request('GET', 'adm/index.php?i=acp_search&mode=index&sid=' . $this->sid);
$form_values = $crawler->selectButton('Create index')->form()->getValues();
$crawler = self::request(
'POST',
'adm/index.php?i=acp_search&mode=index&sid=' . $this->sid,
$form = $crawler->selectButton('Create index')->form();
$form_values = $form->getValues();
$form_values = array_merge($form_values,
array(
'search_type' => ( ($backend === null) ? $this->search_backend : $backend ),
'action' => 'create',
'submit' => true,
'form_token' => $form_values['form_token'],
'creation_time' => $form_values['creation_time'],
)
);
$form->setValues($form_values);
$crawler = self::submit($form);
$this->assertContainsLang('SEARCH_INDEX_CREATED', $crawler->text());
}
@@ -98,18 +96,16 @@ abstract class phpbb_functional_search_base extends phpbb_functional_test_case
{
$this->add_lang('acp/search');
$crawler = self::request('GET', 'adm/index.php?i=acp_search&mode=index&sid=' . $this->sid);
$form_values = $crawler->selectButton('Delete index')->form()->getValues();
$crawler = self::request(
'POST',
'adm/index.php?i=acp_search&mode=index&sid=' . $this->sid,
$form = $crawler->selectButton('Delete index')->form();
$form_values = $form->getValues();
$form_values = array_merge($form_values,
array(
'search_type' => $this->search_backend,
'action' => 'delete',
'submit' => true,
'form_token' => $form_values['form_token'],
'creation_time' => $form_values['creation_time'],
)
);
$form->setValues($form_values);
$crawler = self::submit($form);
$this->assertContainsLang('SEARCH_INDEX_REMOVED', $crawler->text());
}
}