From 2503723e2fff11c2a14bf62f6e261cebd9ffcf06 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Tue, 16 Jun 2015 11:10:22 +0200
Subject: [ticket/12952] Check obvious errors before status in functional tests

This will change the output from just saying that the status did not match
the expected one to actually showing any errors before complaining about a
possible difference in the status code.

PHPBB3-12952
---
 tests/test_framework/phpbb_functional_test_case.php | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'tests/test_framework/phpbb_functional_test_case.php')

diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php
index 844caa8f54..d403831626 100644
--- a/tests/test_framework/phpbb_functional_test_case.php
+++ b/tests/test_framework/phpbb_functional_test_case.php
@@ -854,15 +854,15 @@ class phpbb_functional_test_case extends phpbb_test_case
 	*/
 	static public function assert_response_html($status_code = 200)
 	{
-		if ($status_code !== false)
-		{
-			self::assert_response_status_code($status_code);
-		}
-
 		// Any output before the doc type means there was an error
 		$content = self::$client->getResponse()->getContent();
 		self::assertNotContains('[phpBB Debug]', $content);
 		self::assertStringStartsWith('<!DOCTYPE', trim($content), 'Output found before DOCTYPE specification.');
+
+		if ($status_code !== false)
+		{
+			self::assert_response_status_code($status_code);
+		}
 	}
 
 	/*
@@ -875,15 +875,15 @@ class phpbb_functional_test_case extends phpbb_test_case
 	*/
 	static public function assert_response_xml($status_code = 200)
 	{
-		if ($status_code !== false)
-		{
-			self::assert_response_status_code($status_code);
-		}
-
 		// Any output before the xml opening means there was an error
 		$content = self::$client->getResponse()->getContent();
 		self::assertNotContains('[phpBB Debug]', $content);
 		self::assertStringStartsWith('<?xml', trim($content), 'Output found before XML specification.');
+
+		if ($status_code !== false)
+		{
+			self::assert_response_status_code($status_code);
+		}
 	}
 
 	/**
-- 
cgit v1.2.1