diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-07-04 13:32:10 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-07-04 13:32:10 +0200 |
| commit | 4558262e2aaf31b4583a87622e97a46ead11537c (patch) | |
| tree | 88a589e5f9b3b45139c32718c1caf12a5e3b1374 /tests/functional/mcp_test.php | |
| parent | 4b49b3dcf3bc369eaced5790b95914254ab7d932 (diff) | |
| parent | 86e21a9b261d6239487c626b7e9c9f462ceab611 (diff) | |
| download | forums-4558262e2aaf31b4583a87622e97a46ead11537c.tar forums-4558262e2aaf31b4583a87622e97a46ead11537c.tar.gz forums-4558262e2aaf31b4583a87622e97a46ead11537c.tar.bz2 forums-4558262e2aaf31b4583a87622e97a46ead11537c.tar.xz forums-4558262e2aaf31b4583a87622e97a46ead11537c.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/12013] Fix functional tests and sniffer issue.
[ticket/12013] Clear the jumpbox.
[ticket/12013] Add moderator tools icon.
[ticket/12013] Remove obsolete jumpbox and quickmod CSS.
[ticket/12013] Prevent the dropdown scrollbar from overlapping the content.
[ticket/12013] Update to use the new .button class.
[ticket/12013] Add missing class to place the buttons on the rightside.
[ticket/12013] Use the correct variable for the forum id.
[ticket/12013] Use DEFINE instead of Twig's set.
[ticket/12013] Use path helper.
[ticket/12013] Use new dropdown for quickmod tools and jumpbox.
Diffstat (limited to 'tests/functional/mcp_test.php')
| -rw-r--r-- | tests/functional/mcp_test.php | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/tests/functional/mcp_test.php b/tests/functional/mcp_test.php index e4d950ef34..31d835f4fa 100644 --- a/tests/functional/mcp_test.php +++ b/tests/functional/mcp_test.php @@ -35,11 +35,7 @@ class phpbb_functional_mcp_test extends phpbb_functional_test_case public function test_handle_quickmod($crawler) { // Test moving a post - $form = $crawler->selectButton('Go')->eq(1)->form(); - $form['action']->select('merge'); - $crawler = self::submit($form); - - return $crawler; + return $this->get_quickmod_page(0, 'MERGE_POSTS', $crawler); } /** |