Merge remote-tracking branch 'remotes/nickv/ticket/11568-develop' into develop

# By Joas Schilling
# Via Joas Schilling
* remotes/nickv/ticket/11568-develop: (21 commits)
  [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
  [ticket/develop/11568] Remove unneccessary second call with wrong arguments
  [ticket/11568] Remove unused method
  [ticket/11568] Only assert string when doctype is there at all
  [ticket/develop/11568] Fix some more tests in 3.1
  [ticket/develop/11568] Remove php extension parameter
  [ticket/develop/11568] Remove unneccessary calls to assert_response_success()
  [ticket/develop/11568] Do not directly access $client from tests
  [ticket/11568] Add method to get page content
  [ticket/11568] Allow different status codes
  [ticket/11568] Trim the output to allow Tabs before INCLUDE overall_header
  [ticket/11568] Fix common_groups_test.php form handling
  [ticket/11568] Make CookieJar static aswell
  [ticket/11568] Remove manual calls to assert_response_success()
  [ticket/11568] Only use a static version of the client
  [ticket/11568] Any output before the doc type means there was an error
  [ticket/11568] Set client manually so we can increase the cURL timeout
  ...

1 files changed, 2 insertions, 4 deletions

diff --git a/tests/functional/common_groups_test.php b/tests/functional/common_groups_test.php
index 53f7ead29a..8c014aebed 100644
--- a/tests/functional/common_groups_test.php
+++ b/tests/functional/common_groups_test.php
@@ -21,9 +21,7 @@ abstract class phpbb_functional_common_groups_test extends phpbb_functional_test
 	protected function get_group_manage_form($group_id = 5)
 	{
 		// Manage Administrators group
-		$crawler = $this->request('GET', $this->get_url() . "&g=$group_id&sid=" . $this->sid);
-		$this->assert_response_success();
-		//var_export($this->client->getResponse()->getContent());
+		$crawler = self::request('GET', $this->get_url() . "&g=$group_id&sid=" . $this->sid);
 		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
 		return $form;
 	}
@@ -59,7 +57,7 @@ abstract class phpbb_functional_common_groups_test extends phpbb_functional_test
 		// Manage Administrators group
 		$form = $this->get_group_manage_form();
 		$form['group_colour']->setValue($input);
-		$crawler = $this->client->submit($form);
+		$crawler = self::submit($form);
 		$this->assertContains($this->lang($expected), $crawler->text());
 	}
 }