[ticket/14789] Add form tokens to tests and uncomment add_form_key

PHPBB3-14789
This commit is contained in:
Marc Alexander 2016-09-18 11:47:18 +02:00
parent 585a3ed863
commit 72f6241aa2
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
2 changed files with 9 additions and 1 deletions

View file

@ -254,7 +254,7 @@ class acp_search
$submit = $request->is_set_post('submit', false); $submit = $request->is_set_post('submit', false);
$form_key = 'acp_search'; $form_key = 'acp_search';
//add_form_key($form_key); add_form_key($form_key);
if (!check_form_key($form_key) && in_array($action, array('delete', 'create'))) if (!check_form_key($form_key) && in_array($action, array('delete', 'create')))
{ {

View file

@ -75,6 +75,8 @@ abstract class phpbb_functional_search_base extends phpbb_functional_test_case
protected function create_search_index() protected function create_search_index()
{ {
$this->add_lang('acp/search'); $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( $crawler = self::request(
'POST', 'POST',
'adm/index.php?i=acp_search&mode=index&sid=' . $this->sid, 'adm/index.php?i=acp_search&mode=index&sid=' . $this->sid,
@ -82,6 +84,8 @@ abstract class phpbb_functional_search_base extends phpbb_functional_test_case
'search_type' => $this->search_backend, 'search_type' => $this->search_backend,
'action' => 'create', 'action' => 'create',
'submit' => true, 'submit' => true,
'form_token' => $form_values['form_token'],
'creation_time' => $form_values['creation_time'],
) )
); );
$this->assertContainsLang('SEARCH_INDEX_CREATED', $crawler->text()); $this->assertContainsLang('SEARCH_INDEX_CREATED', $crawler->text());
@ -90,6 +94,8 @@ abstract class phpbb_functional_search_base extends phpbb_functional_test_case
protected function delete_search_index() protected function delete_search_index()
{ {
$this->add_lang('acp/search'); $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( $crawler = self::request(
'POST', 'POST',
'adm/index.php?i=acp_search&mode=index&sid=' . $this->sid, 'adm/index.php?i=acp_search&mode=index&sid=' . $this->sid,
@ -97,6 +103,8 @@ abstract class phpbb_functional_search_base extends phpbb_functional_test_case
'search_type' => $this->search_backend, 'search_type' => $this->search_backend,
'action' => 'delete', 'action' => 'delete',
'submit' => true, 'submit' => true,
'form_token' => $form_values['form_token'],
'creation_time' => $form_values['creation_time'],
) )
); );
$this->assertContainsLang('SEARCH_INDEX_REMOVED', $crawler->text()); $this->assertContainsLang('SEARCH_INDEX_REMOVED', $crawler->text());