Merge branch 'ticket/11568' into ticket/11568-develop

* ticket/11568: [ticket/11568] Split status code and html debug assertion into two methods [ticket/11568] Add comma at end of array key-value couple [ticket/11568] Invert logic for asserting the response [ticket/11568] Use static calls for static methods Conflicts: tests/test_framework/phpbb_functional_test_case.php
author: Joas Schilling <nickvergessen@gmx.de> 2013-05-31 16:45:06 +0200
committer: Joas Schilling <nickvergessen@gmx.de> 2013-05-31 16:45:06 +0200
commit: 8c4670eeb1264e2535021e400d2cf7e2c2028010 (patch)
tree: 9c1a92f4f2711f09c9816ffde93c05b25e0c7ce5 /tests/functional
parent: 5c046b9493d05981264c18b304d217fc75eda9e2 (diff)
parent: 6af5262fcccae3f3e651348a20dbbd8a78e191aa (diff)
download: forums-8c4670eeb1264e2535021e400d2cf7e2c2028010.tar
forums-8c4670eeb1264e2535021e400d2cf7e2c2028010.tar.gz
forums-8c4670eeb1264e2535021e400d2cf7e2c2028010.tar.bz2
forums-8c4670eeb1264e2535021e400d2cf7e2c2028010.tar.xz
forums-8c4670eeb1264e2535021e400d2cf7e2c2028010.zip
12 files changed, 58 insertions, 56 deletions
diff --git a/tests/functional/acp_permissions_test.php b/tests/functional/acp_permissions_test.php
index 3d91242df6..a3d272906f 100644
--- a/tests/functional/acp_permissions_test.php
+++ b/tests/functional/acp_permissions_test.php
@@ -25,7 +25,7 @@ class phpbb_functional_acp_permissions_test extends phpbb_functional_test_case
 	{
 		// Permissions tab
 		// XXX hardcoded id
-		$crawler = $this->request('GET', 'adm/index.php?i=16&sid=' . $this->sid);
+		$crawler = self::request('GET', 'adm/index.php?i=16&sid=' . $this->sid);
 		// these language strings are html
 		$this->assertContains($this->lang('ACP_PERMISSIONS_EXPLAIN'), $this->get_content());
 	}
@@ -33,14 +33,14 @@ class phpbb_functional_acp_permissions_test extends phpbb_functional_test_case
 	public function test_select_user()
 	{
 		// User permissions
-		$crawler = $this->request('GET', 'adm/index.php?i=acp_permissions&icat=16&mode=setting_user_global&sid=' . $this->sid);
+		$crawler = self::request('GET', 'adm/index.php?i=acp_permissions&icat=16&mode=setting_user_global&sid=' . $this->sid);
 		$this->assertContains($this->lang('ACP_USERS_PERMISSIONS_EXPLAIN'), $this->get_content());
 
 		// Select admin
 		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
 		$data = array('username[0]' => 'admin');
 		$form->setValues($data);
-		$crawler = $this->submit($form);
+		$crawler = self::submit($form);
 		$this->assertContains($this->lang('ACL_SET'), $crawler->filter('h1')->eq(1)->text());
 	}
 
@@ -88,7 +88,7 @@ class phpbb_functional_acp_permissions_test extends phpbb_functional_test_case
 	public function test_change_permission($description, $permission_type, $permission, $mode, $object_name, $object_id)
 	{
 		// Get the form
-		$crawler = $this->request('GET', "adm/index.php?i=acp_permissions&icat=16&mode=$mode&${object_name}[0]=$object_id&type=$permission_type&sid=" . $this->sid);
+		$crawler = self::request('GET', "adm/index.php?i=acp_permissions&icat=16&mode=$mode&${object_name}[0]=$object_id&type=$permission_type&sid=" . $this->sid);
 		$this->assertContains($this->lang('ACL_SET'), $crawler->filter('h1')->eq(1)->text());
 
 		// XXX globals for phpbb_auth, refactor it later
@@ -110,7 +110,7 @@ class phpbb_functional_acp_permissions_test extends phpbb_functional_test_case
 		// set to never
 		$data = array("setting[$object_id][0][$permission]" => '0');
 		$form->setValues($data);
-		$crawler = $this->submit($form);
+		$crawler = self::submit($form);
 		$this->assertContains($this->lang('AUTH_UPDATED'), $crawler->text());
 
 		// check acl again
diff --git a/tests/functional/auth_test.php b/tests/functional/auth_test.php
index 06dc26dfeb..ff4d3ced5c 100644
--- a/tests/functional/auth_test.php
+++ b/tests/functional/auth_test.php
@@ -17,7 +17,7 @@ class phpbb_functional_auth_test extends phpbb_functional_test_case
 		$this->login();
 
 		// check for logout link
-		$crawler = $this->request('GET', 'index.php');
+		$crawler = self::request('GET', 'index.php');
 		$this->assertContains($this->lang('LOGOUT_USER', 'admin'), $crawler->filter('.navbar')->text());
 	}
 
@@ -25,7 +25,7 @@ class phpbb_functional_auth_test extends phpbb_functional_test_case
 	{
 		$this->create_user('anothertestuser');
 		$this->login('anothertestuser');
-		$crawler = $this->request('GET', 'index.php');
+		$crawler = self::request('GET', 'index.php');
 		$this->assertContains('anothertestuser', $crawler->filter('.icon-logout')->text());
 	}
 
@@ -38,11 +38,11 @@ class phpbb_functional_auth_test extends phpbb_functional_test_case
 		$this->add_lang('ucp');
 
 		// logout
-		$crawler = $this->request('GET', 'ucp.php?sid=' . $this->sid . '&mode=logout');
+		$crawler = self::request('GET', 'ucp.php?sid=' . $this->sid . '&mode=logout');
 		$this->assertContains($this->lang('LOGOUT_REDIRECT'), $crawler->filter('#message')->text());
 
 		// look for a register link, which should be visible only when logged out
-		$crawler = $this->request('GET', 'index.php');
+		$crawler = self::request('GET', 'index.php');
 		$this->assertContains($this->lang('REGISTER'), $crawler->filter('.navbar')->text());
 	}
 
@@ -52,7 +52,7 @@ class phpbb_functional_auth_test extends phpbb_functional_test_case
 		$this->admin_login();
 
 		// check that we are logged in
-		$crawler = $this->request('GET', 'adm/index.php?sid=' . $this->sid);
+		$crawler = self::request('GET', 'adm/index.php?sid=' . $this->sid);
 		$this->assertContains($this->lang('ADMIN_PANEL'), $crawler->filter('h1')->text());
 	}
 }
diff --git a/tests/functional/browse_test.php b/tests/functional/browse_test.php
index 26c18c4c1f..18a2ad9464 100644
--- a/tests/functional/browse_test.php
+++ b/tests/functional/browse_test.php
@@ -14,19 +14,19 @@ class phpbb_functional_browse_test extends phpbb_functional_test_case
 {
 	public function test_index()
 	{
-		$crawler = $this->request('GET', 'index.php');
+		$crawler = self::request('GET', 'index.php');
 		$this->assertGreaterThan(0, $crawler->filter('.topiclist')->count());
 	}
 
 	public function test_viewforum()
 	{
-		$crawler = $this->request('GET', 'viewforum.php?f=2');
+		$crawler = self::request('GET', 'viewforum.php?f=2');
 		$this->assertGreaterThan(0, $crawler->filter('.topiclist')->count());
 	}
 
 	public function test_viewtopic()
 	{
-		$crawler = $this->request('GET', 'viewtopic.php?t=1');
+		$crawler = self::request('GET', 'viewtopic.php?t=1');
 		$this->assertGreaterThan(0, $crawler->filter('.postbody')->count());
 	}
 }
diff --git a/tests/functional/common_groups_test.php b/tests/functional/common_groups_test.php
index 0f376f2705..daf05f1440 100644
--- a/tests/functional/common_groups_test.php
+++ b/tests/functional/common_groups_test.php
@@ -41,10 +41,10 @@ abstract class phpbb_functional_common_groups_test extends phpbb_functional_test
 		$this->add_lang(array('ucp', 'acp/groups'));
 
 		// Manage Administrators group
-		$crawler = $this->request('GET', $this->get_url() . '&g=5&sid=' . $this->sid);
+		$crawler = self::request('GET', $this->get_url() . '&g=5&sid=' . $this->sid);
 		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
 		$form['group_colour']->setValue($input);
-		$crawler = $this->submit($form);
+		$crawler = self::submit($form);
 		$this->assertContains($this->lang($expected), $crawler->text());
 	}
 }
diff --git a/tests/functional/extension_acp_test.php b/tests/functional/extension_acp_test.php
index 1b406e5042..9badab8ced 100644
--- a/tests/functional/extension_acp_test.php
+++ b/tests/functional/extension_acp_test.php
@@ -109,7 +109,7 @@ class phpbb_functional_extension_acp_test extends phpbb_functional_test_case
 
 	public function test_list()
 	{
-        $crawler = $this->request('GET', 'adm/index.php?i=acp_extensions&mode=main&sid=' . $this->sid);
+        $crawler = self::request('GET', 'adm/index.php?i=acp_extensions&mode=main&sid=' . $this->sid);
 
         $this->assertCount(1, $crawler->filter('.ext_enabled'));
         $this->assertCount(5, $crawler->filter('.ext_disabled'));
@@ -131,7 +131,7 @@ class phpbb_functional_extension_acp_test extends phpbb_functional_test_case
 
 	public function test_details()
 	{
-        $crawler = $this->request('GET', 'adm/index.php?i=acp_extensions&mode=main&action=details&ext_name=foo&sid=' . $this->sid);
+        $crawler = self::request('GET', 'adm/index.php?i=acp_extensions&mode=main&action=details&ext_name=foo&sid=' . $this->sid);
 
         $validation = array(
         	'DISPLAY_NAME'		=> 'phpBB Foo Extension',
@@ -174,46 +174,46 @@ class phpbb_functional_extension_acp_test extends phpbb_functional_test_case
 	public function test_enable_pre()
 	{
 		// Foo is already enabled (redirect to list)
-        $crawler = $this->request('GET', 'adm/index.php?i=acp_extensions&mode=main&action=enable_pre&ext_name=foo&sid=' . $this->sid);
+        $crawler = self::request('GET', 'adm/index.php?i=acp_extensions&mode=main&action=enable_pre&ext_name=foo&sid=' . $this->sid);
         $this->assertContainsLang('EXTENSION_NAME', $crawler->filter('html')->text());
         $this->assertContainsLang('EXTENSION_OPTIONS', $crawler->filter('html')->text());
         $this->assertContainsLang('EXTENSION_ACTIONS', $crawler->filter('html')->text());
 
-        $crawler = $this->request('GET', 'adm/index.php?i=acp_extensions&mode=main&action=enable_pre&ext_name=vendor%2Fmoo&sid=' . $this->sid);
+        $crawler = self::request('GET', 'adm/index.php?i=acp_extensions&mode=main&action=enable_pre&ext_name=vendor%2Fmoo&sid=' . $this->sid);
         $this->assertContainsLang('ENABLE_CONFIRM', $crawler->filter('html')->text());
 	}
 
 	public function test_disable_pre()
 	{
         // Moo is not enabled (redirect to list)
-        $crawler = $this->request('GET', 'adm/index.php?i=acp_extensions&mode=main&action=disable_pre&ext_name=vendor%2Fmoo&sid=' . $this->sid);
+        $crawler = self::request('GET', 'adm/index.php?i=acp_extensions&mode=main&action=disable_pre&ext_name=vendor%2Fmoo&sid=' . $this->sid);
         $this->assertContainsLang('EXTENSION_NAME', $crawler->filter('html')->text());
         $this->assertContainsLang('EXTENSION_OPTIONS', $crawler->filter('html')->text());
         $this->assertContainsLang('EXTENSION_ACTIONS', $crawler->filter('html')->text());
 
-        $crawler = $this->request('GET', 'adm/index.php?i=acp_extensions&mode=main&action=disable_pre&ext_name=foo&sid=' . $this->sid);
+        $crawler = self::request('GET', 'adm/index.php?i=acp_extensions&mode=main&action=disable_pre&ext_name=foo&sid=' . $this->sid);
         $this->assertContainsLang('DISABLE_CONFIRM', $crawler->filter('html')->text());
 	}
 
 	public function test_purge_pre()
 	{
         // test2 is not available (error)
-        $crawler = $this->request('GET', 'adm/index.php?i=acp_extensions&mode=main&action=purge_pre&ext_name=test2&sid=' . $this->sid);
+        $crawler = self::request('GET', 'adm/index.php?i=acp_extensions&mode=main&action=purge_pre&ext_name=test2&sid=' . $this->sid);
         $this->assertContains('The required file does not exist', $crawler->filter('html')->text());
 
-        $crawler = $this->request('GET', 'adm/index.php?i=acp_extensions&mode=main&action=purge_pre&ext_name=foo&sid=' . $this->sid);
+        $crawler = self::request('GET', 'adm/index.php?i=acp_extensions&mode=main&action=purge_pre&ext_name=foo&sid=' . $this->sid);
         $this->assertContainsLang('PURGE_CONFIRM', $crawler->filter('html')->text());
 	}
 
 	public function test_actions()
 	{
-        $crawler = $this->request('GET', 'adm/index.php?i=acp_extensions&mode=main&action=enable&ext_name=vendor%2Fmoo&sid=' . $this->sid);
+        $crawler = self::request('GET', 'adm/index.php?i=acp_extensions&mode=main&action=enable&ext_name=vendor%2Fmoo&sid=' . $this->sid);
         $this->assertContainsLang('ENABLE_SUCCESS', $crawler->filter('html')->text());
 
-        $crawler = $this->request('GET', 'adm/index.php?i=acp_extensions&mode=main&action=disable&ext_name=vendor%2Fmoo&sid=' . $this->sid);
+        $crawler = self::request('GET', 'adm/index.php?i=acp_extensions&mode=main&action=disable&ext_name=vendor%2Fmoo&sid=' . $this->sid);
         $this->assertContainsLang('DISABLE_SUCCESS', $crawler->filter('html')->text());
 
-        $crawler = $this->request('GET', 'adm/index.php?i=acp_extensions&mode=main&action=purge&ext_name=vendor%2Fmoo&sid=' . $this->sid);
+        $crawler = self::request('GET', 'adm/index.php?i=acp_extensions&mode=main&action=purge&ext_name=vendor%2Fmoo&sid=' . $this->sid);
         $this->assertContainsLang('PURGE_SUCCESS', $crawler->filter('html')->text());
 	}
 }
 \ No newline at end of file
diff --git a/tests/functional/extension_controller_test.php b/tests/functional/extension_controller_test.php
index 28805e7b5d..a09035cb2b 100644
--- a/tests/functional/extension_controller_test.php
+++ b/tests/functional/extension_controller_test.php
@@ -6,6 +6,7 @@
 * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
 */
+require_once dirname(__FILE__) . '/../../phpBB/includes/db/db_tools.php';
 
 /**
 * @group functional
@@ -90,7 +91,8 @@ class phpbb_functional_extension_controller_test extends phpbb_functional_test_c
 	public function test_foo_bar()
 	{
 		$this->phpbb_extension_manager->enable('foo/bar');
-		$crawler = $this->request('GET', 'app.php?controller=foo/bar');
+		$crawler = self::request('GET', 'app.php?controller=foo/bar', array(), false);
+		self::assert_response_status_code();
 		$this->assertContains("foo/bar controller handle() method", $crawler->filter('body')->text());
 		$this->phpbb_extension_manager->purge('foo/bar');
 	}
@@ -101,7 +103,7 @@ class phpbb_functional_extension_controller_test extends phpbb_functional_test_c
 	public function test_controller_with_template()
 	{
 		$this->phpbb_extension_manager->enable('foo/bar');
-		$crawler = $this->request('GET', 'app.php?controller=foo/template');
+		$crawler = self::request('GET', 'app.php?controller=foo/template');
 		$this->assertContains("I am a variable", $crawler->filter('#content')->text());
 		$this->phpbb_extension_manager->purge('foo/bar');
 	}
@@ -113,8 +115,8 @@ class phpbb_functional_extension_controller_test extends phpbb_functional_test_c
 	public function test_missing_argument()
 	{
 		$this->phpbb_extension_manager->enable('foo/bar');
-		$crawler = $this->request('GET', 'app.php?controller=foo/baz', array(), true);
-		$this->assert_response_success(500);
+		$crawler = self::request('GET', 'app.php?controller=foo/baz', array(), false);
+		$this->assert_response_html(500);
 		$this->assertContains('Missing value for argument #1: test in class phpbb_ext_foo_bar_controller:baz', $crawler->filter('body')->text());
 		$this->phpbb_extension_manager->purge('foo/bar');
 	}
@@ -125,8 +127,8 @@ class phpbb_functional_extension_controller_test extends phpbb_functional_test_c
 	public function test_exception_should_result_in_500_status_code()
 	{
 		$this->phpbb_extension_manager->enable('foo/bar');
-		$crawler = $this->request('GET', 'app.php?controller=foo/exception', array(), true);
-		$this->assert_response_success(500);
+		$crawler = self::request('GET', 'app.php?controller=foo/exception', array(), false);
+		$this->assert_response_html(500);
 		$this->assertContains('Exception thrown from foo/exception route', $crawler->filter('body')->text());
 		$this->phpbb_extension_manager->purge('foo/bar');
 	}
@@ -142,8 +144,8 @@ class phpbb_functional_extension_controller_test extends phpbb_functional_test_c
 	*/
 	public function test_error_ext_disabled_or_404()
 	{
-		$crawler = $this->request('GET', 'app.php?controller=does/not/exist', array(), true);
-		$this->assert_response_success(404);
+		$crawler = self::request('GET', 'app.php?controller=does/not/exist', array(), false);
+		$this->assert_response_html(404);
 		$this->assertContains('No route found for "GET /does/not/exist"', $crawler->filter('body')->text());
 	}
 }
diff --git a/tests/functional/extension_permission_lang_test.php b/tests/functional/extension_permission_lang_test.php
index c1ceae382d..9a251e8645 100644
--- a/tests/functional/extension_permission_lang_test.php
+++ b/tests/functional/extension_permission_lang_test.php
@@ -99,13 +99,13 @@ class phpbb_functional_extension_permission_lang_test extends phpbb_functional_t
 		$this->phpbb_extension_manager->enable('foo/bar');
 
 		// User permissions
-		$crawler = $this->request('GET', 'adm/index.php?i=acp_permissions&icat=16&mode=setting_user_global&sid=' . $this->sid);
+		$crawler = self::request('GET', 'adm/index.php?i=acp_permissions&icat=16&mode=setting_user_global&sid=' . $this->sid);
 
 		// Select admin
 		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
 		$data = array('username[0]' => 'admin');
 		$form->setValues($data);
-		$crawler = $this->submit($form);
+		$crawler = self::submit($form);
 
 		// language from language/en/acp/permissions_phpbb.php
 		$this->assertContains('Can attach files', $crawler->filter('body')->text());
diff --git a/tests/functional/forgot_password_test.php b/tests/functional/forgot_password_test.php
index 65d07672cf..906224efbb 100644
--- a/tests/functional/forgot_password_test.php
+++ b/tests/functional/forgot_password_test.php
@@ -16,7 +16,7 @@ class phpbb_functional_forgot_password_test extends phpbb_functional_test_case
 	{
 		global $config;
 		$this->add_lang('ucp');
-		$crawler = $this->request('GET', 'ucp.php?mode=sendpassword');
+		$crawler = self::request('GET', 'ucp.php?mode=sendpassword');
 		$this->assertEquals($this->lang('SEND_PASSWORD'), $crawler->filter('h2')->text());
 	}
 
@@ -25,18 +25,18 @@ class phpbb_functional_forgot_password_test extends phpbb_functional_test_case
 		$this->login();
 		$this->admin_login();
 		$this->add_lang('ucp');
-		$crawler = $this->request('GET', 'adm/index.php?sid=' . $this->sid . '&i=acp_board&mode=security');
+		$crawler = self::request('GET', 'adm/index.php?sid=' . $this->sid . '&i=acp_board&mode=security');
 
 		$form = $crawler->selectButton('Submit')->form();
 		$values = $form->getValues();
 
 		$values["config[allow_password_reset]"] = 0;
 		$form->setValues($values);
-		$crawler = $this->submit($form);
+		$crawler = self::submit($form);
 
 		$this->logout();
 
-		$crawler = $this->request('GET', 'ucp.php?mode=sendpassword');
+		$crawler = self::request('GET', 'ucp.php?mode=sendpassword');
 		$this->assertContains($this->lang('UCP_PASSWORD_RESET_DISABLED', '', ''), $crawler->text());
 
 	}
diff --git a/tests/functional/memberlist_test.php b/tests/functional/memberlist_test.php
index ef3c9b3298..5d43294da9 100644
--- a/tests/functional/memberlist_test.php
+++ b/tests/functional/memberlist_test.php
@@ -17,15 +17,15 @@ class phpbb_functional_memberlist_test extends phpbb_functional_test_case
 		$this->create_user('memberlist-test-user');
 		// logs in as admin
 		$this->login();
-		$crawler = $this->request('GET', 'memberlist.php?sid=' . $this->sid);
+		$crawler = self::request('GET', 'memberlist.php?sid=' . $this->sid);
 		$this->assertContains('memberlist-test-user', $crawler->text());
 
 		// restrict by first character
-		$crawler = $this->request('GET', 'memberlist.php?first_char=m&sid=' . $this->sid);
+		$crawler = self::request('GET', 'memberlist.php?first_char=m&sid=' . $this->sid);
 		$this->assertContains('memberlist-test-user', $crawler->text());
 
 		// make sure results for wrong character are not returned
-		$crawler = $this->request('GET', 'memberlist.php?first_char=a&sid=' . $this->sid);
+		$crawler = self::request('GET', 'memberlist.php?first_char=a&sid=' . $this->sid);
 		$this->assertNotContains('memberlist-test-user', $crawler->text());
 	}
 
@@ -33,13 +33,13 @@ class phpbb_functional_memberlist_test extends phpbb_functional_test_case
 	{
 		$this->login();
 		// XXX hardcoded user id
-		$crawler = $this->request('GET', 'memberlist.php?mode=viewprofile&u=2&sid=' . $this->sid);
+		$crawler = self::request('GET', 'memberlist.php?mode=viewprofile&u=2&sid=' . $this->sid);
 		$this->assertContains('admin', $crawler->filter('h2')->text());
 	}
 
 	protected function get_memberlist_leaders_table_crawler()
 	{
-		$crawler = $this->request('GET', 'memberlist.php?mode=leaders&sid=' . $this->sid);
+		$crawler = self::request('GET', 'memberlist.php?mode=leaders&sid=' . $this->sid);
 		return $crawler->filter('.forumbg-table');
 	}
 
diff --git a/tests/functional/metadata_manager_test.php b/tests/functional/metadata_manager_test.php
index cbc1c76ef8..7e98b0d025 100644
--- a/tests/functional/metadata_manager_test.php
+++ b/tests/functional/metadata_manager_test.php
@@ -75,7 +75,7 @@ class phpbb_functional_metadata_manager_test extends phpbb_functional_test_case
 
 	public function test_extensions_list()
 	{
-		$crawler = $this->request('GET', 'adm/index.php?i=acp_extensions&mode=main&sid=' . $this->sid);
+		$crawler = self::request('GET', 'adm/index.php?i=acp_extensions&mode=main&sid=' . $this->sid);
 		$this->assertContains($this->lang('EXTENSIONS_EXPLAIN'), $crawler->filter('#main')->text());
 		$this->assertContains('phpBB 3.1 Extension Testing', $crawler->filter('#main')->text());
 		$this->assertContains('Details', $crawler->filter('#main')->text());
@@ -83,7 +83,7 @@ class phpbb_functional_metadata_manager_test extends phpbb_functional_test_case
 
 	public function test_extensions_details()
 	{
-		$crawler = $this->request('GET', 'adm/index.php?i=acp_extensions&mode=main&action=details&ext_name=foo%2Fbar&sid=' . $this->sid);
+		$crawler = self::request('GET', 'adm/index.php?i=acp_extensions&mode=main&action=details&ext_name=foo%2Fbar&sid=' . $this->sid);
 
 		// Test whether the details are displayed
 		$this->assertContains($this->lang('CLEAN_NAME'), $crawler->filter('#main')->text());
@@ -99,7 +99,7 @@ class phpbb_functional_metadata_manager_test extends phpbb_functional_test_case
 
 	public function test_extensions_details_notexists()
 	{
-		$crawler = $this->request('GET', 'adm/index.php?i=acp_extensions&mode=main&action=details&ext_name=not%2Fexists&sid=' . $this->sid);
+		$crawler = self::request('GET', 'adm/index.php?i=acp_extensions&mode=main&action=details&ext_name=not%2Fexists&sid=' . $this->sid);
 
 		// Error message because the files do not exist
 		$this->assertContains('The required file does not exist:', $crawler->filter('#main')->text());
diff --git a/tests/functional/notification_test.php b/tests/functional/notification_test.php
index ad4f3acdc2..7f33ad1859 100644
--- a/tests/functional/notification_test.php
+++ b/tests/functional/notification_test.php
@@ -40,7 +40,7 @@ class phpbb_functional_notification_test extends phpbb_functional_test_case
 	public function test_user_subscriptions($checkbox_name, $expected_status)
 	{
 		$this->login();
-		$crawler = $this->request('GET', 'ucp.php?i=ucp_notifications&mode=notification_options');
+		$crawler = self::request('GET', 'ucp.php?i=ucp_notifications&mode=notification_options');
 
 		$cplist = $crawler->filter('.table1');
 		if ($expected_status)
diff --git a/tests/functional/posting_test.php b/tests/functional/posting_test.php
index 5cf7559245..9bcfcc2fda 100644
--- a/tests/functional/posting_test.php
+++ b/tests/functional/posting_test.php
@@ -19,17 +19,17 @@ class phpbb_functional_posting_test extends phpbb_functional_test_case
 		// Test creating topic
 		$post = $this->create_topic(2, 'Test Topic 1', 'This is a test topic posted by the testing framework.');
 
-		$crawler = $this->request('GET', "viewtopic.php?t={$post['topic_id']}&sid={$this->sid}");
+		$crawler = self::request('GET', "viewtopic.php?t={$post['topic_id']}&sid={$this->sid}");
 		$this->assertContains('This is a test topic posted by the testing framework.', $crawler->filter('html')->text());
 
 		// Test creating a reply
 		$post2 = $this->create_post(2, $post['topic_id'], 'Re: Test Topic 1', 'This is a test post posted by the testing framework.');
 
-		$crawler = $this->request('GET', "viewtopic.php?t={$post2['topic_id']}&sid={$this->sid}");
+		$crawler = self::request('GET', "viewtopic.php?t={$post2['topic_id']}&sid={$this->sid}");
 		$this->assertContains('This is a test post posted by the testing framework.', $crawler->filter('html')->text());
 
 		// Test quoting a message
-		$crawler = $this->request('GET', "posting.php?mode=quote&f=2&t={$post2['topic_id']}&p={$post2['post_id']}&sid={$this->sid}");
+		$crawler = self::request('GET', "posting.php?mode=quote&f=2&t={$post2['topic_id']}&p={$post2['post_id']}&sid={$this->sid}");
 		$this->assertContains('This is a test post posted by the testing framework.', $crawler->filter('html')->text());
 	}
 
@@ -54,7 +54,7 @@ class phpbb_functional_posting_test extends phpbb_functional_test_case
 			'post'			=> true,
 		), $additional_form_data);
 
-		return $this->submit_post($posting_url, 'POST_TOPIC', $form_data);
+		return self::submit_post($posting_url, 'POST_TOPIC', $form_data);
 	}
 
 	/**
@@ -78,7 +78,7 @@ class phpbb_functional_posting_test extends phpbb_functional_test_case
 			'post'			=> true,
 		), $additional_form_data);
 
-		return $this->submit_post($posting_url, 'POST_REPLY', $form_data);
+		return self::submit_post($posting_url, 'POST_REPLY', $form_data);
 	}
 	
 	/**
@@ -93,7 +93,7 @@ class phpbb_functional_posting_test extends phpbb_functional_test_case
 	{
 		$this->add_lang('posting');
 
-		$crawler = $this->request('GET', $posting_url);
+		$crawler = self::request('GET', $posting_url);
 		$this->assertContains($this->lang($posting_contains), $crawler->filter('html')->text());
 
 		$hidden_fields = array(
@@ -117,7 +117,7 @@ class phpbb_functional_posting_test extends phpbb_functional_test_case
 		// I use a request because the form submission method does not allow you to send data that is not
 		// contained in one of the actual form fields that the browser sees (i.e. it ignores "hidden" inputs)
 		// Instead, I send it as a request with the submit button "post" set to true.
-		$crawler = $this->request('POST', $posting_url, $form_data);
+		$crawler = self::request('POST', $posting_url, $form_data);
 		$this->assertContains($this->lang('POST_STORED'), $crawler->filter('html')->text());
 
 		$url = $crawler->selectLink($this->lang('VIEW_MESSAGE', '', ''))->link()->getUri();
author	Joas Schilling <nickvergessen@gmx.de>	2013-05-31 16:45:06 +0200
committer	Joas Schilling <nickvergessen@gmx.de>	2013-05-31 16:45:06 +0200
commit	8c4670eeb1264e2535021e400d2cf7e2c2028010 (patch)
tree	9c1a92f4f2711f09c9816ffde93c05b25e0c7ce5 /tests/functional
parent	5c046b9493d05981264c18b304d217fc75eda9e2 (diff)
parent	6af5262fcccae3f3e651348a20dbbd8a78e191aa (diff)
download	forums-8c4670eeb1264e2535021e400d2cf7e2c2028010.tar forums-8c4670eeb1264e2535021e400d2cf7e2c2028010.tar.gz forums-8c4670eeb1264e2535021e400d2cf7e2c2028010.tar.bz2 forums-8c4670eeb1264e2535021e400d2cf7e2c2028010.tar.xz forums-8c4670eeb1264e2535021e400d2cf7e2c2028010.zip