From 4ab178f3efd2ec497081bc1b3e57e4566d2eee6d Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Thu, 15 Nov 2012 08:19:40 -0500
Subject: [ticket/11202] Add a heuristic function to check for response
 success.

This tries to account for php sending fatal errors with 200 status code.

PHPBB3-11202
---
 tests/test_framework/phpbb_functional_test_case.php | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

(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 d35913e415..09f52effec 100644
--- a/tests/test_framework/phpbb_functional_test_case.php
+++ b/tests/test_framework/phpbb_functional_test_case.php
@@ -182,7 +182,7 @@ class phpbb_functional_test_case extends phpbb_test_case
 		$login = $this->client->submit($form, array('username' => 'admin', 'password' => 'admin'));
 
 		$cookies = $this->cookieJar->all();
-		
+
 		// The session id is stored in a cookie that ends with _sid - we assume there is only one such cookie
 		foreach ($cookies as $cookie);
 		{
@@ -229,4 +229,19 @@ class phpbb_functional_test_case extends phpbb_test_case
 
 		return call_user_func_array('sprintf', $args);
 	}
+
+	/**
+	* Heuristic function to check that the response is success.
+	*
+	* When php decides to die with a fatal error, it still sends 200 OK
+	* status code. This assertion tries to catch that.
+	*
+	* @param string $message Optional failure message
+	*/
+	public function assert_response_success($message = null)
+	{
+		$this->assertEquals(200, $this->client->getResponse()->getStatus());
+		$content = $this->client->getResponse()->getContent();
+		$this->assertNotContains('Fatal error:', $content);
+	}
 }
-- 
cgit v1.2.1


From af7ab2d3ac287db1a2c9ed623e21393cb429203f Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Thu, 15 Nov 2012 08:40:29 -0500
Subject: [ticket/11202] Custom message does not make sense here, delete it.

PHPBB3-11202
---
 tests/test_framework/phpbb_functional_test_case.php | 4 ++--
 1 file changed, 2 insertions(+), 2 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 09f52effec..de04783bce 100644
--- a/tests/test_framework/phpbb_functional_test_case.php
+++ b/tests/test_framework/phpbb_functional_test_case.php
@@ -236,9 +236,9 @@ class phpbb_functional_test_case extends phpbb_test_case
 	* When php decides to die with a fatal error, it still sends 200 OK
 	* status code. This assertion tries to catch that.
 	*
-	* @param string $message Optional failure message
+	* @return null
 	*/
-	public function assert_response_success($message = null)
+	public function assert_response_success()
 	{
 		$this->assertEquals(200, $this->client->getResponse()->getStatus());
 		$content = $this->client->getResponse()->getContent();
-- 
cgit v1.2.1


From ec06d5c5d9f23b6419f048b885b689aa0ab4b351 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Thu, 15 Nov 2012 08:18:55 -0500
Subject: [ticket/11204] Reindent.

PHPBB3-11204
---
 .../test_framework/phpbb_functional_test_case.php  | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 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 8a329d43b1..16e1ccaff9 100644
--- a/tests/test_framework/phpbb_functional_test_case.php
+++ b/tests/test_framework/phpbb_functional_test_case.php
@@ -332,17 +332,17 @@ class phpbb_functional_test_case extends phpbb_test_case
 		return call_user_func_array('sprintf', $args);
 	}
 
-    /**
-     * assertContains for language strings
-     *
-     * @param string $needle Search string
-     * @param string $haystack Search this
-     * @param string $message Optional failure message
-     */
-    public function assertContainsLang($needle, $haystack, $message = null)
-    {
-        $this->assertContains(html_entity_decode($this->lang($needle), ENT_QUOTES), $haystack, $message);
-    }
+	/**
+	 * assertContains for language strings
+	 *
+	 * @param string $needle Search string
+	 * @param string $haystack Search this
+	 * @param string $message Optional failure message
+	 */
+	public function assertContainsLang($needle, $haystack, $message = null)
+	{
+		$this->assertContains(html_entity_decode($this->lang($needle), ENT_QUOTES), $haystack, $message);
+	}
 
 	/**
 	* Heuristic function to check that the response is success.
-- 
cgit v1.2.1