From 54fd71ea2edccad3399a9d4c04a9fbb2c72316e1 Mon Sep 17 00:00:00 2001 From: rxu Date: Sat, 15 Jan 2022 10:37:45 +0700 Subject: [PATCH] [ticket/16902] Make flood interval control in tests consistent Also remove crawler dumping tool PHPBB3-16902 --- tests/functional/feed_test.php | 18 ---------- tests/functional/mcp/mcp_main_test.php | 10 ++---- tests/functional/search/base.php | 3 +- .../functional/visibility_disapprove_test.php | 13 -------- .../functional/visibility_reapprove_test.php | 13 -------- .../visibility_unapproved_posts_test.php | 13 -------- .../phpbb_functional_test_case.php | 33 +++---------------- 7 files changed, 9 insertions(+), 94 deletions(-) diff --git a/tests/functional/feed_test.php b/tests/functional/feed_test.php index a6cc47aa67..dcbc9166d7 100644 --- a/tests/functional/feed_test.php +++ b/tests/functional/feed_test.php @@ -868,24 +868,6 @@ class phpbb_functional_feed_test extends phpbb_functional_test_case $this->set_flood_interval(15); } - protected function set_flood_interval($flood_interval) - { - $this->login(); - $this->admin_login(); - - $crawler = self::request('GET', 'adm/index.php?sid=' . $this->sid . '&i=acp_board&mode=post'); - - $form = $crawler->selectButton('Submit')->form(); - $values = $form->getValues(); - - $values['config[flood_interval]'] = $flood_interval; - $form->setValues($values); - $crawler = self::submit($form); - self::assertGreaterThan(0, $crawler->filter('.successbox')->count()); - - $this->logout(); - } - public function test_feeds_unapproved_topic_admin() { $this->load_ids(array( diff --git a/tests/functional/mcp/mcp_main_test.php b/tests/functional/mcp/mcp_main_test.php index a440972058..a056217f73 100644 --- a/tests/functional/mcp/mcp_main_test.php +++ b/tests/functional/mcp/mcp_main_test.php @@ -22,13 +22,7 @@ class phpbb_functional_mcp_main_test extends phpbb_functional_test_case $this->login(); $this->admin_login(); - // Disable flood interval to post >1 of topics - $crawler = self::request('GET', "adm/index.php?i=acp_board&mode=post&sid={$this->sid}"); - $form = $crawler->selectButton($this->lang('SUBMIT'))->form([ - 'config[flood_interval]' => 0, - ]); - $crawler = self::submit($form); - $this->assertContainsLang('CONFIG_UPDATED', $crawler->text()); + $this->set_flood_interval(0); // Create a forum to move topics around $forum_name = 'MCP Test #1'; @@ -54,6 +48,8 @@ class phpbb_functional_mcp_main_test extends phpbb_functional_test_case $crawler = self::request('GET', "viewtopic.php?t={$post[1]['topic_id']}&sid={$this->sid}"); $this->assertStringContainsString('Testing merge topics moderation actions from MCP/View forum page.', $crawler->filter('html')->text()); + $this->set_flood_interval(15); + return $post; } diff --git a/tests/functional/search/base.php b/tests/functional/search/base.php index 99a231e7cf..d26af94b72 100644 --- a/tests/functional/search/base.php +++ b/tests/functional/search/base.php @@ -76,7 +76,7 @@ abstract class phpbb_functional_search_base extends phpbb_functional_test_case $searchforauthoruser_id = $this->create_user('searchforauthoruser'); } $this->remove_user_group('NEWLY_REGISTERED', ['searchforauthoruser']); - $this->disable_flood_interval(); + $this->set_flood_interval(0); $this->login('searchforauthoruser'); $topic_by_author = $this->create_topic(2, 'Test Topic from searchforauthoruser', 'This is a test topic posted by searchforauthoruser to test searching by author.'); $this->create_post(2, $topic_by_author['topic_id'], 'Re: Test Topic from searchforauthoruser', 'This is a test post posted by searchforauthoruser'); @@ -88,6 +88,7 @@ abstract class phpbb_functional_search_base extends phpbb_functional_test_case $this->create_search_index('phpbb\\search\\backend\\fulltext_native'); $post = $this->create_topic(2, 'Test Topic 1 foosubject', 'This is a test topic posted by the barsearch testing framework.'); + $this->set_flood_interval(15); $crawler = self::request('GET', 'adm/index.php?i=acp_search&mode=settings&sid=' . $this->sid); $form = $crawler->selectButton($this->lang('SUBMIT'))->form(); diff --git a/tests/functional/visibility_disapprove_test.php b/tests/functional/visibility_disapprove_test.php index f26e5436ae..f853491414 100644 --- a/tests/functional/visibility_disapprove_test.php +++ b/tests/functional/visibility_disapprove_test.php @@ -255,19 +255,6 @@ class phpbb_functional_visibility_disapprove_test extends phpbb_functional_test_ $this->assertEquals($details, $data, "Forum {$forum_id} does not match expected {$additional_error_message}"); } - protected function set_flood_interval($flood_interval) - { - $crawler = self::request('GET', 'adm/index.php?sid=' . $this->sid . '&i=acp_board&mode=post'); - - $form = $crawler->selectButton('Submit')->form(); - $values = $form->getValues(); - - $values["config[flood_interval]"] = $flood_interval; - $form->setValues($values); - $crawler = self::submit($form); - $this->assertGreaterThan(0, $crawler->filter('.successbox')->count()); - } - protected function load_ids($data) { $this->db = $this->get_db(); diff --git a/tests/functional/visibility_reapprove_test.php b/tests/functional/visibility_reapprove_test.php index 1affa87cd9..c9da0942b4 100644 --- a/tests/functional/visibility_reapprove_test.php +++ b/tests/functional/visibility_reapprove_test.php @@ -351,19 +351,6 @@ class phpbb_functional_visibility_reapprove_test extends phpbb_functional_test_c $this->assertEquals($details, $data, "Forum {$forum_id} does not match expected {$additional_error_message}"); } - protected function set_flood_interval($flood_interval) - { - $crawler = self::request('GET', 'adm/index.php?sid=' . $this->sid . '&i=acp_board&mode=post'); - - $form = $crawler->selectButton('Submit')->form(); - $values = $form->getValues(); - - $values["config[flood_interval]"] = $flood_interval; - $form->setValues($values); - $crawler = self::submit($form); - $this->assertGreaterThan(0, $crawler->filter('.successbox')->count()); - } - protected function load_ids($data) { $this->db = $this->get_db(); diff --git a/tests/functional/visibility_unapproved_posts_test.php b/tests/functional/visibility_unapproved_posts_test.php index 52161ff58a..51e5641788 100644 --- a/tests/functional/visibility_unapproved_posts_test.php +++ b/tests/functional/visibility_unapproved_posts_test.php @@ -268,19 +268,6 @@ class phpbb_functional_visibility_unapproved_test extends phpbb_functional_test_ $this->assertEquals($details, $data, "Forum {$forum_id} does not match expected {$additional_error_message}"); } - protected function set_flood_interval($flood_interval) - { - $crawler = self::request('GET', "adm/index.php?sid={$this->sid}&i=acp_board&mode=post"); - - $form = $crawler->selectButton('Submit')->form(); - $values = $form->getValues(); - - $values['config[flood_interval]'] = $flood_interval; - $form->setValues($values); - $crawler = self::submit($form); - $this->assertGreaterThan(0, $crawler->filter('.successbox')->count()); - } - protected function load_ids($data) { $this->db = $this->get_db(); diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php index 74310cf460..38980f57f2 100644 --- a/tests/test_framework/phpbb_functional_test_case.php +++ b/tests/test_framework/phpbb_functional_test_case.php @@ -983,7 +983,7 @@ class phpbb_functional_test_case extends phpbb_test_case // Any output before the doc type means there was an error $content = self::get_content(); self::assertStringNotContainsString('[phpBB Debug]', $content); - self::assertStringStartsWith('ownerDocument->saveHTML($domElement); - } - - return $html; - } - /** * Get username of currently logged in user * @@ -1490,9 +1465,9 @@ class phpbb_functional_test_case extends phpbb_test_case } /** - * Disable posting flood control + * Posting flood control */ - protected function disable_flood_interval() + protected function set_flood_interval($flood_interval) { $relogin_back = false; $logged_in_username = $this->get_logged_in_user(); @@ -1511,7 +1486,7 @@ class phpbb_functional_test_case extends phpbb_test_case $this->add_lang('acp/common'); $crawler = self::request('GET', 'adm/index.php?i=acp_board&mode=post&sid=' . $this->sid); $form = $crawler->selectButton('submit')->form([ - 'config[flood_interval]' => 0, + 'config[flood_interval]' => $flood_interval, ]); $crawler = self::submit($form); $this->assertContainsLang('CONFIG_UPDATED', $crawler->text());