6 files changed, 24 insertions, 62 deletions
diff --git a/tests/functional/download_test.php b/tests/functional/download_test.php
index dbf197fcfa..6a6df14c81 100644
--- a/tests/functional/download_test.php
+++ b/tests/functional/download_test.php
@@ -205,12 +205,8 @@ class phpbb_functional_download_test extends phpbb_functional_test_case
 			),
 		));
 
-		$crawler = self::request('GET', "viewtopic.php?t={$this->data['topics']['Download Topic #1']}&sid={$this->sid}");
-
 		$this->add_lang('posting');
-		$form = $crawler->selectButton('Go')->eq(2)->form();
-		$form['action']->select('delete_topic');
-		$crawler = self::submit($form);
+		$crawler = $this->get_quickmod_page($this->data['topics']['Download Topic #1'], 'DELETE_TOPIC');
 		$this->assertContainsLang('DELETE_PERMANENTLY', $crawler->text());
 
 		$this->add_lang('mcp');
diff --git a/tests/functional/feed_test.php b/tests/functional/feed_test.php
index a474ecf27f..7aa2d0da7d 100644
--- a/tests/functional/feed_test.php
+++ b/tests/functional/feed_test.php
@@ -619,12 +619,8 @@ class phpbb_functional_feed_test extends phpbb_functional_test_case
 			),
 		));
 
-		$crawler = self::request('GET', "viewtopic.php?t={$this->data['topics']['Feeds #1 - Topic #2']}&sid={$this->sid}");
-
 		$this->add_lang('posting');
-		$form = $crawler->selectButton('Go')->eq(2)->form();
-		$form['action']->select('delete_topic');
-		$crawler = self::submit($form);
+		$crawler = $this->get_quickmod_page($this->data['topics']['Feeds #1 - Topic #2'], 'DELETE_TOPIC');
 		$this->assertContainsLang('DELETE_PERMANENTLY', $crawler->text());
 
 		$this->add_lang('mcp');
diff --git a/tests/functional/fixtures/ext/foo/bar/composer.json b/tests/functional/fixtures/ext/foo/bar/composer.json
index 2f91426d2a..f0c7f0e6c1 100644
--- a/tests/functional/fixtures/ext/foo/bar/composer.json
+++ b/tests/functional/fixtures/ext/foo/bar/composer.json
@@ -13,10 +13,12 @@
 		"role": "Developer"
 	}],
 	"require": {
-		"php": ">=5.3",
-		"phpbb/phpbb": "3.1.*@dev"
+		"php": ">=5.3"
 	},
 	"extra": {
-		"display-name": "phpBB 3.1 Extension Testing"
+		"display-name": "phpBB 3.1 Extension Testing",
+		"soft-require": {
+			"phpbb/phpbb": "3.1.*@dev"
+		}
 	}
 }
diff --git a/tests/functional/jumpbox_test.php b/tests/functional/jumpbox_test.php
index 9eddcb6bf6..f5a671b1b9 100644
--- a/tests/functional/jumpbox_test.php
+++ b/tests/functional/jumpbox_test.php
@@ -20,18 +20,16 @@ class phpbb_functional_jumpbox_test extends phpbb_functional_test_case
 	{
 		$this->login();
 
-		$crawler = self::request('GET', "viewtopic.php?t=1&sid={$this->sid}");
-		$form = $crawler->filter('#quickmodform')->selectButton($this->lang('GO'))->form(array(
-			'action'	=> 'merge_topic',
-		));
+		$this->crawler = $this->get_quickmod_page(1, 'MERGE_TOPIC');
+		$this->check_valid_jump('Your first forum');
 
-		$crawler = self::submit($form);
-		$this->assertContains($this->lang('FORUM') . ': Your first forum', $crawler->filter('#cp-main h2')->text());
-		$form = $crawler->filter('#jumpbox')->selectButton($this->lang('GO'))->form(array(
-			'f'	=> 1,
-		));
+		$link = $this->crawler->filter('#jumpbox')->selectLink('Your first category')->link()->getUri();
+		$this->crawler = self::request('GET', substr($link, strpos($link, 'mcp.')));
+		$this->check_valid_jump('Your first category');
+	}
 
-		$crawler = self::submit($form);
-		$this->assertContains($this->lang('FORUM') . ': Your first category', $crawler->filter('#cp-main h2')->text());
+	protected function check_valid_jump($forum)
+	{
+		$this->assertContains($this->lang('FORUM') . ": $forum", $this->crawler->filter('#cp-main h2')->text(), $this->crawler->text());
 	}
 }
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);
 	}
 
 	/**
diff --git a/tests/functional/visibility_softdelete_test.php b/tests/functional/visibility_softdelete_test.php
index 5b5f09905c..794f0cde68 100644
--- a/tests/functional/visibility_softdelete_test.php
+++ b/tests/functional/visibility_softdelete_test.php
@@ -186,11 +186,7 @@ class phpbb_functional_visibility_softdelete_test extends phpbb_functional_test_
 			'forum_last_post_id'		=> 0,
 		), 'before moving #2');
 
-		$crawler = self::request('GET', "viewtopic.php?t={$this->data['topics']['Soft Delete Topic #1']}&sid={$this->sid}");
-
-		$form = $crawler->selectButton('Go')->eq(2)->form();
-		$form['action']->select('move');
-		$crawler = self::submit($form);
+		$crawler = $this->get_quickmod_page($this->data['topics']['Soft Delete Topic #1'], 'MOVE_TOPIC');
 		$this->assertContainsLang('SELECT_DESTINATION_FORUM', $crawler->text());
 
 		$this->add_lang('mcp');
@@ -261,12 +257,8 @@ class phpbb_functional_visibility_softdelete_test extends phpbb_functional_test_
 			'forum_last_post_id'		=> $this->data['posts']['Soft Delete Topic #1'],
 		), 'before softdeleting #2');
 
-		$crawler = self::request('GET', "viewtopic.php?t={$this->data['topics']['Soft Delete Topic #1']}&sid={$this->sid}");
-
 		$this->add_lang('posting');
-		$form = $crawler->selectButton('Go')->eq(2)->form();
-		$form['action']->select('delete_topic');
-		$crawler = self::submit($form);
+		$crawler = $this->get_quickmod_page($this->data['topics']['Soft Delete Topic #1'], 'DELETE_TOPIC');
 		$this->assertContainsLang('DELETE_PERMANENTLY', $crawler->text());
 
 		$this->add_lang('mcp');
@@ -336,11 +328,7 @@ class phpbb_functional_visibility_softdelete_test extends phpbb_functional_test_
 			'forum_last_post_id'		=> 0,
 		), 'before moving #2');
 
-		$crawler = self::request('GET', "viewtopic.php?t={$this->data['topics']['Soft Delete Topic #1']}&sid={$this->sid}");
-
-		$form = $crawler->selectButton('Go')->eq(2)->form();
-		$form['action']->select('move');
-		$crawler = self::submit($form);
+		$crawler = $this->get_quickmod_page($this->data['topics']['Soft Delete Topic #1'], 'MOVE_TOPIC');
 		$this->assertContainsLang('SELECT_DESTINATION_FORUM', $crawler->text());
 
 		$this->add_lang('mcp');
@@ -484,12 +472,9 @@ class phpbb_functional_visibility_softdelete_test extends phpbb_functional_test_
 			'forum_last_post_id'		=> 0,
 		), 'before splitting #2');
 
-		$crawler = self::request('GET', "viewtopic.php?t={$this->data['topics']['Soft Delete Topic #1']}&sid={$this->sid}");
+		$crawler = $this->get_quickmod_page($this->data['topics']['Soft Delete Topic #1'], 'SPLIT_TOPIC');
 
 		$this->add_lang('mcp');
-		$form = $crawler->selectButton('Go')->eq(2)->form();
-		$form['action']->select('split');
-		$crawler = self::submit($form);
 		$this->assertContainsLang('SPLIT_TOPIC_EXPLAIN', $crawler->text());
 
 		$form = $crawler->selectButton('Submit')->form(array(
@@ -546,12 +531,7 @@ class phpbb_functional_visibility_softdelete_test extends phpbb_functional_test_
 			),
 		));
 
-		$crawler = self::request('GET', "viewtopic.php?t={$this->data['topics']['Soft Delete Topic #2']}&sid={$this->sid}");
-
-		$form = $crawler->selectButton('Go')->eq(1)->form();
-		$form['action']->select('move');
-		$crawler = self::submit($form);
-
+		$crawler = $this->get_quickmod_page($this->data['topics']['Soft Delete Topic #2'], 'MOVE_TOPIC');
 		$form = $crawler->selectButton('Yes')->form();
 		$form['to_forum_id']->select($this->data['forums']['Soft Delete #1']);
 		$crawler = self::submit($form);
@@ -605,9 +585,7 @@ class phpbb_functional_visibility_softdelete_test extends phpbb_functional_test_
 		$this->assertContainsLang('BOOKMARK_ADDED', $crawler_bookmark->text());
 
 		$this->add_lang('mcp');
-		$form = $crawler->selectButton('Go')->eq(1)->form();
-		$form['action']->select('merge_topic');
-		$crawler = self::submit($form);
+		$crawler = $this->get_quickmod_page($this->data['topics']['Soft Delete Topic #2'], 'MERGE_TOPIC', $crawler); 
 		$this->assertContainsLang('SELECT_MERGE', $crawler->text());
 
 		$crawler = self::request('GET', "mcp.php?f={$this->data['forums']['Soft Delete #1']}&t={$this->data['topics']['Soft Delete Topic #2']}&i=main&mode=forum_view&action=merge_topic&to_topic_id={$this->data['topics']['Soft Delete Topic #1']}");
@@ -670,12 +648,8 @@ class phpbb_functional_visibility_softdelete_test extends phpbb_functional_test_
 			'forum_last_post_id'		=> 0,
 		), 'before forking #2');
 
-		$crawler = self::request('GET', "viewtopic.php?t={$this->data['topics']['Soft Delete Topic #1']}&sid={$this->sid}");
-
 		$this->add_lang('mcp');
-		$form = $crawler->selectButton('Go')->eq(2)->form();
-		$form['action']->select('fork');
-		$crawler = self::submit($form);
+		$crawler = $this->get_quickmod_page($this->data['topics']['Soft Delete Topic #1'], 'FORK_TOPIC');
 		$this->assertContainsLang('FORK_TOPIC', $crawler->text());
 
 		$form = $crawler->selectButton('Yes')->form();