mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 14:00:31 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.3.x'

Browse Source
This commit is contained in:
Marc Alexander
2021-08-23 20:30:14 +02:00
parent 791632a5c8 acbcb18226
commit 72cf2ba2ea
39 changed files with 288 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
tests/test_framework/phpbb_functional_test_case.php
View File

@@ -1148,12 +1148,13 @@ class phpbb_functional_test_case extends phpbb_test_case
*/
public function create_post($forum_id, $topic_id, $subject, $message, $additional_form_data = array(), $expected = '')
{
$posting_url = "posting.php?mode=reply&f={$forum_id}&t={$topic_id}&sid={$this->sid}";
$posting_url = "posting.php?mode=reply&t={$topic_id}&sid={$this->sid}";
$form_data = array_merge(array(
'subject' => $subject,
'message' => $message,
'post' => true,
'topic_id' => $topic_id,
), $additional_form_data);
return self::submit_post($posting_url, 'POST_REPLY', $form_data, $expected);
@@ -1189,8 +1190,14 @@ class phpbb_functional_test_case extends phpbb_test_case
$url = $crawler->selectLink($form_data['subject'])->link()->getUri();
$topic_id = $this->get_parameter_from_link($url, 't');
if (!$topic_id)
{
$topic_id = $form_data['topic_id'];
}
return array(
'topic_id' => $this->get_parameter_from_link($url, 't'),
'topic_id' => $topic_id,
'post_id' => $this->get_parameter_from_link($url, 'p'),
);
}
@@ -1311,7 +1318,7 @@ class phpbb_functional_test_case extends phpbb_test_case
public function delete_post($forum_id, $post_id)
{
$this->add_lang('posting');
$crawler = self::request('GET', "posting.php?mode=delete&f={$forum_id}&p={$post_id}&sid={$this->sid}");
$crawler = self::request('GET', "posting.php?mode=delete&p={$post_id}&sid={$this->sid}");
$this->assertContainsLang('DELETE_PERMANENTLY', $crawler->text());
$form = $crawler->selectButton('Yes')->form();