From 0cbbb792834ed7bde2271855d1628e9560068b79 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 17 Jul 2021 21:31:21 +0200 Subject: [PATCH] [ticket/16207] Fix tests with sid missing from URLs PHPBB3-16207 --- tests/functional/extension_controller_test.php | 1 - tests/functional/mcp_test.php | 4 ++++ tests/test_framework/phpbb_functional_test_case.php | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/tests/functional/extension_controller_test.php b/tests/functional/extension_controller_test.php index 70c6de8e27..10b4cb3451 100644 --- a/tests/functional/extension_controller_test.php +++ b/tests/functional/extension_controller_test.php @@ -181,7 +181,6 @@ class phpbb_functional_extension_controller_test extends phpbb_functional_test_c $row_num = str_replace('redirect_expected_', '', $redirect); $redirect = $crawler->filter('#redirect_' . $row_num)->text(); - $redirect = substr($redirect, 0, strpos($redirect, 'sid') - 1); $this->assertEquals($crawler->filter('#redirect_expected_' . $row_num)->text(), $redirect); } diff --git a/tests/functional/mcp_test.php b/tests/functional/mcp_test.php index 87a98dae74..a9ba2f3a83 100644 --- a/tests/functional/mcp_test.php +++ b/tests/functional/mcp_test.php @@ -34,6 +34,8 @@ class phpbb_functional_mcp_test extends phpbb_functional_test_case */ public function test_handle_quickmod($crawler) { + $this->login(); + // Test moving a post return $this->get_quickmod_page(0, 'MERGE_POSTS', $crawler); } @@ -43,6 +45,8 @@ class phpbb_functional_mcp_test extends phpbb_functional_test_case */ public function test_move_post_to_topic($crawler) { + $this->login(); + // Select the post in MCP $form = $crawler->selectButton($this->lang('SUBMIT'))->form(array( 'to_topic_id' => 1, diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php index 467eb72eba..600fbe60be 100644 --- a/tests/test_framework/phpbb_functional_test_case.php +++ b/tests/test_framework/phpbb_functional_test_case.php @@ -1396,7 +1396,7 @@ class phpbb_functional_test_case extends phpbb_test_case } $link = $crawler->filter('#quickmod')->selectLink($this->lang($action))->link()->getUri(); - return self::request('GET', substr($link, strpos($link, 'mcp.'))); + return self::request('GET', substr($link, strpos($link, 'mcp.')) . "&sid={$this->sid}"); } /**