diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2016-10-28 21:06:21 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-10-28 21:06:21 +0200 |
| commit | f658e062b2c38127df34dfe1903f1f28946a9ae7 (patch) | |
| tree | 4c6f6a9b7f926aea4005e4873278ec0e4863b10f /tests/functional | |
| parent | b8ef36ddb1b141ad71bd88a2edb8ac088f9b9b74 (diff) | |
| parent | 85898d3d2c7b5ce61a0f92299e06ceade000c4a8 (diff) | |
| download | forums-f658e062b2c38127df34dfe1903f1f28946a9ae7.tar forums-f658e062b2c38127df34dfe1903f1f28946a9ae7.tar.gz forums-f658e062b2c38127df34dfe1903f1f28946a9ae7.tar.bz2 forums-f658e062b2c38127df34dfe1903f1f28946a9ae7.tar.xz forums-f658e062b2c38127df34dfe1903f1f28946a9ae7.zip | |
Merge branch '3.1.x' into 3.2.x
Diffstat (limited to 'tests/functional')
| -rw-r--r-- | tests/functional/search/base.php | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/tests/functional/search/base.php b/tests/functional/search/base.php index fc6f4c0a0b..48c444fb76 100644 --- a/tests/functional/search/base.php +++ b/tests/functional/search/base.php @@ -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()); } } |