From dc61fd1091d7cf7994eb1559691c4dfabec740f5 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Thu, 15 Nov 2012 08:20:07 -0500
Subject: [ticket/11202] Check response success before content assertions.

This does not change tests that perform requests which are either
clearly not supposed to succeed or are a gray area.

PHPBB3-11202
---
 tests/functional/browse_test.php | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'tests/functional')

diff --git a/tests/functional/browse_test.php b/tests/functional/browse_test.php
index 26c18c4c1f..b5748059c6 100644
--- a/tests/functional/browse_test.php
+++ b/tests/functional/browse_test.php
@@ -15,18 +15,21 @@ class phpbb_functional_browse_test extends phpbb_functional_test_case
 	public function test_index()
 	{
 		$crawler = $this->request('GET', 'index.php');
+		$this->assert_response_success();
 		$this->assertGreaterThan(0, $crawler->filter('.topiclist')->count());
 	}
 
 	public function test_viewforum()
 	{
 		$crawler = $this->request('GET', 'viewforum.php?f=2');
+		$this->assert_response_success();
 		$this->assertGreaterThan(0, $crawler->filter('.topiclist')->count());
 	}
 
 	public function test_viewtopic()
 	{
 		$crawler = $this->request('GET', 'viewtopic.php?t=1');
+		$this->assert_response_success();
 		$this->assertGreaterThan(0, $crawler->filter('.postbody')->count());
 	}
 }
-- 
cgit v1.2.1


From 8917b31e31e117e9ded9558a065986bfb4a672ac Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Thu, 15 Nov 2012 08:20:07 -0500
Subject: [ticket/11202] Check response success before content assertions.

This does not change tests that perform requests which are either
clearly not supposed to succeed or are a gray area.

PHPBB3-11202
---
 tests/functional/extension_controller_test.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'tests/functional')

diff --git a/tests/functional/extension_controller_test.php b/tests/functional/extension_controller_test.php
index e9409d9d3f..d92a830365 100644
--- a/tests/functional/extension_controller_test.php
+++ b/tests/functional/extension_controller_test.php
@@ -82,6 +82,7 @@ class phpbb_functional_extension_controller_test extends phpbb_functional_test_c
 	{
 		$this->phpbb_extension_manager->enable('foobar');
 		$crawler = $this->request('GET', 'index.php?ext=foobar');
+		$this->assert_response_success();
 		$this->assertContains("This is for testing purposes.", $crawler->filter('#page-body')->text());
 		$this->phpbb_extension_manager->purge('foobar');
 	}
@@ -94,6 +95,7 @@ class phpbb_functional_extension_controller_test extends phpbb_functional_test_c
 	{
 		$this->phpbb_extension_manager->enable('foo/bar');
 		$crawler = $this->request('GET', 'index.php?ext=foo/bar');
+		$this->assert_response_success();
 		$this->assertContains("This is for testing purposes.", $crawler->filter('#page-body')->text());
 		$this->phpbb_extension_manager->purge('foo/bar');
 	}
-- 
cgit v1.2.1


From 76917558832b0102716448770f365585aac224e9 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Fri, 16 Nov 2012 09:23:57 -0500
Subject: [feature/controller] Adapt functional tests given new controller
 framework

PHPBB3-10864
---
 tests/functional/extension_controller_test.php     | 129 ++++++++-------------
 .../fixtures/ext/error/class/controller.php        |  14 ---
 tests/functional/fixtures/ext/error/class/ext.php  |   6 -
 .../fixtures/ext/error/classtype/controller.php    |  15 ---
 .../fixtures/ext/error/classtype/ext.php           |   6 -
 .../fixtures/ext/error/disabled/controller.php     |  14 ---
 .../functional/fixtures/ext/error/disabled/ext.php |   6 -
 .../fixtures/ext/foo/bar/config/routing.yml        |   3 +
 .../fixtures/ext/foo/bar/config/services.yml       |   3 +
 .../functional/fixtures/ext/foo/bar/controller.php |  14 ---
 .../fixtures/ext/foo/bar/controller/controller.php |  10 ++
 tests/functional/fixtures/ext/foo/bar/ext.php      |  12 +-
 .../bar/styles/prosilver/template/foobar_body.html |   5 -
 .../functional/fixtures/ext/foobar/controller.php  |  14 ---
 tests/functional/fixtures/ext/foobar/ext.php       |   6 -
 .../styles/prosilver/template/foobar_body.html     |   5 -
 16 files changed, 69 insertions(+), 193 deletions(-)
 delete mode 100644 tests/functional/fixtures/ext/error/class/controller.php
 delete mode 100644 tests/functional/fixtures/ext/error/class/ext.php
 delete mode 100644 tests/functional/fixtures/ext/error/classtype/controller.php
 delete mode 100644 tests/functional/fixtures/ext/error/classtype/ext.php
 delete mode 100644 tests/functional/fixtures/ext/error/disabled/controller.php
 delete mode 100644 tests/functional/fixtures/ext/error/disabled/ext.php
 create mode 100755 tests/functional/fixtures/ext/foo/bar/config/routing.yml
 create mode 100755 tests/functional/fixtures/ext/foo/bar/config/services.yml
 delete mode 100644 tests/functional/fixtures/ext/foo/bar/controller.php
 create mode 100755 tests/functional/fixtures/ext/foo/bar/controller/controller.php
 mode change 100644 => 100755 tests/functional/fixtures/ext/foo/bar/ext.php
 delete mode 100644 tests/functional/fixtures/ext/foo/bar/styles/prosilver/template/foobar_body.html
 delete mode 100644 tests/functional/fixtures/ext/foobar/controller.php
 delete mode 100644 tests/functional/fixtures/ext/foobar/ext.php
 delete mode 100644 tests/functional/fixtures/ext/foobar/styles/prosilver/template/foobar_body.html

(limited to 'tests/functional')

diff --git a/tests/functional/extension_controller_test.php b/tests/functional/extension_controller_test.php
index d92a830365..2f07c8a70f 100644
--- a/tests/functional/extension_controller_test.php
+++ b/tests/functional/extension_controller_test.php
@@ -13,6 +13,14 @@
 class phpbb_functional_extension_controller_test extends phpbb_functional_test_case
 {
 	protected $phpbb_extension_manager;
+
+	static protected $fixtures = array(
+		'foo/bar/config/routing.yml',
+		'foo/bar/config/services.yml',
+		'foo/bar/controller/controller.php',
+		'foo/bar/ext.php',
+	);
+
 	/**
 	* This should only be called once before the tests are run.
 	* This is used to copy the fixtures to the phpBB install
@@ -22,15 +30,10 @@ class phpbb_functional_extension_controller_test extends phpbb_functional_test_c
 		global $phpbb_root_path;
 		parent::setUpBeforeClass();
 
-		// these directories need to be created before the files can be copied
 		$directories = array(
-			$phpbb_root_path . 'ext/error/class/',
-			$phpbb_root_path . 'ext/error/classtype/',
-			$phpbb_root_path . 'ext/error/disabled/',
 			$phpbb_root_path . 'ext/foo/bar/',
-			$phpbb_root_path . 'ext/foo/bar/styles/prosilver/template/',
-			$phpbb_root_path . 'ext/foobar/',
-			$phpbb_root_path . 'ext/foobar/styles/prosilver/template/',
+			$phpbb_root_path . 'ext/foo/bar/config/',
+			$phpbb_root_path . 'ext/foo/bar/controller/',
 		);
 
 		foreach ($directories as $dir)
@@ -40,23 +43,8 @@ class phpbb_functional_extension_controller_test extends phpbb_functional_test_c
 				mkdir($dir, 0777, true);
 			}
 		}
-
-		$fixtures = array(
-			'error/class/controller.php',
-			'error/class/ext.php',
-			'error/classtype/controller.php',
-			'error/classtype/ext.php',
-			'error/disabled/controller.php',
-			'error/disabled/ext.php',
-			'foo/bar/controller.php',
-			'foo/bar/ext.php',
-			'foo/bar/styles/prosilver/template/foobar_body.html',
-			'foobar/controller.php',
-			'foobar/ext.php',
-			'foobar/styles/prosilver/template/foobar_body.html',
-		);
-
-		foreach ($fixtures as $fixture)
+	
+		foreach (self::$fixtures as $fixture)
 		{
 			if (!copy("tests/functional/fixtures/ext/$fixture", "{$phpbb_root_path}ext/$fixture"))
 			{
@@ -65,6 +53,27 @@ class phpbb_functional_extension_controller_test extends phpbb_functional_test_c
 		}
 	}
 
+	/**
+	* This should only be called once after the tests are run.
+	* This is used to remove the fixtures from the phpBB install
+	*/
+	static public function tearDownAfterClass()
+	{
+		global $phpbb_root_path;
+		foreach (self::$fixtures as $fixture)
+		{
+			if (!unlink("{$phpbb_root_path}ext/$fixture"))
+			{
+				echo 'Could not delete file ' . $fixture;
+			}
+		}
+
+		rmdir("{$phpbb_root_path}ext/foo/bar/config");
+		rmdir("{$phpbb_root_path}ext/foo/bar/controller");
+		rmdir("{$phpbb_root_path}ext/foo/bar");
+		rmdir("{$phpbb_root_path}ext/foo");
+	}
+
 	public function setUp()
 	{
 		parent::setUp();
@@ -75,72 +84,28 @@ class phpbb_functional_extension_controller_test extends phpbb_functional_test_c
 	}
 
 	/**
-	* Check an extension at ./ext/foobar/ which should have the class
-	* phpbb_ext_foobar_controller
-	*/
-	public function test_foobar()
-	{
-		$this->phpbb_extension_manager->enable('foobar');
-		$crawler = $this->request('GET', 'index.php?ext=foobar');
-		$this->assert_response_success();
-		$this->assertContains("This is for testing purposes.", $crawler->filter('#page-body')->text());
-		$this->phpbb_extension_manager->purge('foobar');
-	}
-
-	/**
-	* Check an extension at ./ext/foo/bar/ which should have the class
-	* phpbb_ext_foo_bar_controller
+	* Check a controller for extension foo/bar
 	*/
 	public function test_foo_bar()
 	{
 		$this->phpbb_extension_manager->enable('foo/bar');
-		$crawler = $this->request('GET', 'index.php?ext=foo/bar');
-		$this->assert_response_success();
-		$this->assertContains("This is for testing purposes.", $crawler->filter('#page-body')->text());
-		$this->phpbb_extension_manager->purge('foo/bar');
-	}
-
-	/**
-	* Check the error produced by extension at ./ext/error/class which has class
-	* phpbb_ext_foobar_controller
-	*/
-	public function test_error_class_name()
-	{
-		$this->phpbb_extension_manager->enable('error/class');
-		$crawler = $this->request('GET', 'index.php?ext=error/class');
-		$this->assertContains("The extension error/class is missing a controller class and cannot be accessed through the front-end.", $crawler->filter('#message')->text());
-		$this->phpbb_extension_manager->purge('error/class');
-	}
-
-	/**
-	* Check the error produced by extension at ./ext/error/classtype which has class
-	* phpbb_ext_error_classtype_controller but does not implement phpbb_extension_controller_interface
-	*/
-	public function test_error_class_type()
-	{
-		$this->phpbb_extension_manager->enable('error/classtype');
-		$crawler = $this->request('GET', 'index.php?ext=error/classtype');
-		$this->assertContains("The extension controller class phpbb_ext_error_classtype_controller is not an instance of the phpbb_extension_controller_interface.", $crawler->filter('#message')->text());
-		$this->phpbb_extension_manager->purge('error/classtype');
-	}
-
-	/**
-	* Check the error produced by extension at ./ext/error/disabled that is (obviously)
-	* a disabled extension
-	*/
-	public function test_error_ext_disabled()
-	{
-		$crawler = $this->request('GET', 'index.php?ext=error/disabled');
-		$this->assertContains("The extension error/disabled is not enabled", $crawler->filter('#message')->text());
+		$crawler = $this->request('GET', 'app.php/foo/bar');
+		$this->assertContains("foo/bar controller handle() method", $crawler->filter('body')->text());
+		$this->phpbb_extension_manager->purge('foobar');
 	}
 
 	/**
-	* Check the error produced by extension at ./ext/error/404 that is (obviously)
-	* not existant
+	* Check the error produced by extension at ./ext/does/not/exist
+	*
+	* If an extension is disabled, its routes are not loaded. Because we
+	* are not looking for a controller based on a specified extension,
+	* we don't know the difference between a route in a disabled
+	* extension and a route that is not defined anyway; it is the same
+	* error message.
 	*/
-	public function test_error_ext_missing()
+	public function test_error_ext_disabled_or_404()
 	{
-		$crawler = $this->request('GET', 'index.php?ext=error/404');
-		$this->assertContains("The extension error/404 does not exist.", $crawler->filter('#message')->text());
+		$crawler = $this->request('GET', 'app.php/does/not/exist');
+		$this->assertContains('No route found for "GET /does/not/exist"', $crawler->filter('body')->text());
 	}
 }
diff --git a/tests/functional/fixtures/ext/error/class/controller.php b/tests/functional/fixtures/ext/error/class/controller.php
deleted file mode 100644
index 74bbbee540..0000000000
--- a/tests/functional/fixtures/ext/error/class/controller.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-class phpbb_ext_foobar_controller extends phpbb_extension_controller
-{
-	public function handle()
-	{
-		$this->template->set_filenames(array(
-			'body' => 'index_body.html'
-		));
-
-		page_header('Test extension');
-		page_footer();
-	}
-}
diff --git a/tests/functional/fixtures/ext/error/class/ext.php b/tests/functional/fixtures/ext/error/class/ext.php
deleted file mode 100644
index f97ad2b838..0000000000
--- a/tests/functional/fixtures/ext/error/class/ext.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-class phpbb_ext_error_class_ext extends phpbb_extension_base
-{
-	
-}
diff --git a/tests/functional/fixtures/ext/error/classtype/controller.php b/tests/functional/fixtures/ext/error/classtype/controller.php
deleted file mode 100644
index 55ac651bdf..0000000000
--- a/tests/functional/fixtures/ext/error/classtype/controller.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-class phpbb_ext_error_classtype_controller
-{
-	public function handle()
-	{
-		global $template;
-		$template->set_filenames(array(
-			'body' => 'index_body.html'
-		));
-
-		page_header('Test extension');
-		page_footer();
-	}
-}
diff --git a/tests/functional/fixtures/ext/error/classtype/ext.php b/tests/functional/fixtures/ext/error/classtype/ext.php
deleted file mode 100644
index 35b1cd15a2..0000000000
--- a/tests/functional/fixtures/ext/error/classtype/ext.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-class phpbb_ext_error_classtype_ext extends phpbb_extension_base
-{
-	
-}
diff --git a/tests/functional/fixtures/ext/error/disabled/controller.php b/tests/functional/fixtures/ext/error/disabled/controller.php
deleted file mode 100644
index 57b913f377..0000000000
--- a/tests/functional/fixtures/ext/error/disabled/controller.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-class phpbb_ext_error_disabled_controller extends phpbb_extension_controller
-{
-	public function handle()
-	{		
-		$this->template->set_filenames(array(
-			'body' => 'index_body.html'
-		));
-
-		page_header('Test extension');
-		page_footer();
-	}
-}
diff --git a/tests/functional/fixtures/ext/error/disabled/ext.php b/tests/functional/fixtures/ext/error/disabled/ext.php
deleted file mode 100644
index aec8051848..0000000000
--- a/tests/functional/fixtures/ext/error/disabled/ext.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-class phpbb_ext_error_disabled_ext extends phpbb_extension_base
-{
-	
-}
diff --git a/tests/functional/fixtures/ext/foo/bar/config/routing.yml b/tests/functional/fixtures/ext/foo/bar/config/routing.yml
new file mode 100755
index 0000000000..7ecaba9e71
--- /dev/null
+++ b/tests/functional/fixtures/ext/foo/bar/config/routing.yml
@@ -0,0 +1,3 @@
+foo_bar_controller:
+    pattern: /foo/bar
+    defaults: { _controller: foo_bar.controller:handle }
diff --git a/tests/functional/fixtures/ext/foo/bar/config/services.yml b/tests/functional/fixtures/ext/foo/bar/config/services.yml
new file mode 100755
index 0000000000..d1db6fcb1d
--- /dev/null
+++ b/tests/functional/fixtures/ext/foo/bar/config/services.yml
@@ -0,0 +1,3 @@
+services:
+    foo_bar.controller:
+        class: phpbb_ext_foo_bar_controller
diff --git a/tests/functional/fixtures/ext/foo/bar/controller.php b/tests/functional/fixtures/ext/foo/bar/controller.php
deleted file mode 100644
index 3375e317b3..0000000000
--- a/tests/functional/fixtures/ext/foo/bar/controller.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-class phpbb_ext_foo_bar_controller extends phpbb_extension_controller
-{
-	public function handle()
-	{
-		$this->template->set_filenames(array(
-			'body' => 'foobar_body.html'
-		));
-
-		page_header('Test extension');
-		page_footer();
-	}
-}
diff --git a/tests/functional/fixtures/ext/foo/bar/controller/controller.php b/tests/functional/fixtures/ext/foo/bar/controller/controller.php
new file mode 100755
index 0000000000..4c5274951f
--- /dev/null
+++ b/tests/functional/fixtures/ext/foo/bar/controller/controller.php
@@ -0,0 +1,10 @@
+<?php
+use Symfony\Component\HttpFoundation\Response;
+
+class phpbb_ext_foo_bar_controller
+{
+	public function handle()
+	{
+		return new Response('foo/bar controller handle() method', 200);
+	}
+}
diff --git a/tests/functional/fixtures/ext/foo/bar/ext.php b/tests/functional/fixtures/ext/foo/bar/ext.php
old mode 100644
new mode 100755
index 3a2068631e..b50f95990e
--- a/tests/functional/fixtures/ext/foo/bar/ext.php
+++ b/tests/functional/fixtures/ext/foo/bar/ext.php
@@ -1,6 +1,6 @@
-<?php
-
-class phpbb_ext_foo_bar_ext extends phpbb_extension_base
-{
-	
-}
+<?php
+
+class phpbb_ext_foobar_ext extends phpbb_extension_base
+{
+
+}
diff --git a/tests/functional/fixtures/ext/foo/bar/styles/prosilver/template/foobar_body.html b/tests/functional/fixtures/ext/foo/bar/styles/prosilver/template/foobar_body.html
deleted file mode 100644
index 4addf2666f..0000000000
--- a/tests/functional/fixtures/ext/foo/bar/styles/prosilver/template/foobar_body.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<div id="welcome">This is for testing purposes.</div>
-
-<!-- INCLUDE overall_footer.html -->
diff --git a/tests/functional/fixtures/ext/foobar/controller.php b/tests/functional/fixtures/ext/foobar/controller.php
deleted file mode 100644
index ff35f12ee0..0000000000
--- a/tests/functional/fixtures/ext/foobar/controller.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-class phpbb_ext_foobar_controller extends phpbb_extension_controller
-{
-	public function handle()
-	{
-		$this->template->set_filenames(array(
-			'body' => 'foobar_body.html'
-		));
-
-		page_header('Test extension');
-		page_footer();
-	}
-}
diff --git a/tests/functional/fixtures/ext/foobar/ext.php b/tests/functional/fixtures/ext/foobar/ext.php
deleted file mode 100644
index 7cf443d369..0000000000
--- a/tests/functional/fixtures/ext/foobar/ext.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-class phpbb_ext_foobar_ext extends phpbb_extension_base
-{
-
-}
diff --git a/tests/functional/fixtures/ext/foobar/styles/prosilver/template/foobar_body.html b/tests/functional/fixtures/ext/foobar/styles/prosilver/template/foobar_body.html
deleted file mode 100644
index 4addf2666f..0000000000
--- a/tests/functional/fixtures/ext/foobar/styles/prosilver/template/foobar_body.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<!-- INCLUDE overall_header.html -->
-
-<div id="welcome">This is for testing purposes.</div>
-
-<!-- INCLUDE overall_footer.html -->
-- 
cgit v1.2.1


From 0c75d3d7da9c5fd7ee1560597db684c9d1704c22 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Fri, 16 Nov 2012 10:30:50 -0500
Subject: [feature/controller] Add test for missing argument in controller
 class

PHPBB3-10864
---
 tests/functional/extension_controller_test.php                 | 10 +++++++++-
 tests/functional/fixtures/ext/foo/bar/config/routing.yml       |  4 ++++
 .../functional/fixtures/ext/foo/bar/controller/controller.php  |  5 +++++
 tests/functional/fixtures/ext/foo/bar/ext.php                  |  2 +-
 4 files changed, 19 insertions(+), 2 deletions(-)

(limited to 'tests/functional')

diff --git a/tests/functional/extension_controller_test.php b/tests/functional/extension_controller_test.php
index 2f07c8a70f..b1e910aeac 100644
--- a/tests/functional/extension_controller_test.php
+++ b/tests/functional/extension_controller_test.php
@@ -91,7 +91,15 @@ class phpbb_functional_extension_controller_test extends phpbb_functional_test_c
 		$this->phpbb_extension_manager->enable('foo/bar');
 		$crawler = $this->request('GET', 'app.php/foo/bar');
 		$this->assertContains("foo/bar controller handle() method", $crawler->filter('body')->text());
-		$this->phpbb_extension_manager->purge('foobar');
+		$this->phpbb_extension_manager->purge('foo/bar');
+	}
+
+	public function test_missing_argument()
+	{
+		$this->phpbb_extension_manager->enable('foo/bar');
+		$crawler = $this->request('GET', 'app.php/foo/baz');
+		$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');
 	}
 
 	/**
diff --git a/tests/functional/fixtures/ext/foo/bar/config/routing.yml b/tests/functional/fixtures/ext/foo/bar/config/routing.yml
index 7ecaba9e71..945ef51366 100755
--- a/tests/functional/fixtures/ext/foo/bar/config/routing.yml
+++ b/tests/functional/fixtures/ext/foo/bar/config/routing.yml
@@ -1,3 +1,7 @@
 foo_bar_controller:
     pattern: /foo/bar
     defaults: { _controller: foo_bar.controller:handle }
+
+foo_baz_controller:
+    pattern: /foo/baz
+    defaults: { _controller: foo_bar.controller:baz }
diff --git a/tests/functional/fixtures/ext/foo/bar/controller/controller.php b/tests/functional/fixtures/ext/foo/bar/controller/controller.php
index 4c5274951f..def5184e8c 100755
--- a/tests/functional/fixtures/ext/foo/bar/controller/controller.php
+++ b/tests/functional/fixtures/ext/foo/bar/controller/controller.php
@@ -7,4 +7,9 @@ class phpbb_ext_foo_bar_controller
 	{
 		return new Response('foo/bar controller handle() method', 200);
 	}
+
+	public function baz($test)
+	{
+		return new Response('Value of "test" URL argument is: ' . $test);
+	}
 }
diff --git a/tests/functional/fixtures/ext/foo/bar/ext.php b/tests/functional/fixtures/ext/foo/bar/ext.php
index b50f95990e..7170209d53 100755
--- a/tests/functional/fixtures/ext/foo/bar/ext.php
+++ b/tests/functional/fixtures/ext/foo/bar/ext.php
@@ -1,6 +1,6 @@
 <?php
 
-class phpbb_ext_foobar_ext extends phpbb_extension_base
+class phpbb_ext_foo_bar_ext extends phpbb_extension_base
 {
 
 }
-- 
cgit v1.2.1


From ba1acdca0364a9cd54c705d946fbae2144c59554 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Fri, 16 Nov 2012 10:42:10 -0500
Subject: [feature/controller] Use warning instead of echo for copy() and
 unlink()

PHPBB3-10864
---
 tests/functional/extension_controller_test.php | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

(limited to 'tests/functional')

diff --git a/tests/functional/extension_controller_test.php b/tests/functional/extension_controller_test.php
index b1e910aeac..65a9c80df6 100644
--- a/tests/functional/extension_controller_test.php
+++ b/tests/functional/extension_controller_test.php
@@ -46,10 +46,7 @@ class phpbb_functional_extension_controller_test extends phpbb_functional_test_c
 	
 		foreach (self::$fixtures as $fixture)
 		{
-			if (!copy("tests/functional/fixtures/ext/$fixture", "{$phpbb_root_path}ext/$fixture"))
-			{
-				echo 'Could not copy file ' . $fixture;
-			}
+			copy("tests/functional/fixtures/ext/$fixture", "{$phpbb_root_path}ext/$fixture");
 		}
 	}
 
@@ -62,10 +59,7 @@ class phpbb_functional_extension_controller_test extends phpbb_functional_test_c
 		global $phpbb_root_path;
 		foreach (self::$fixtures as $fixture)
 		{
-			if (!unlink("{$phpbb_root_path}ext/$fixture"))
-			{
-				echo 'Could not delete file ' . $fixture;
-			}
+			unlink("{$phpbb_root_path}ext/$fixture");
 		}
 
 		rmdir("{$phpbb_root_path}ext/foo/bar/config");
-- 
cgit v1.2.1


From 5b013ddf5c48e71166dcefd6d384aea1d801698a Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Fri, 16 Nov 2012 11:41:05 -0500
Subject: [feature/controller] Add controller functional test with template

PHPBB3-10864
---
 tests/functional/extension_controller_test.php     | 32 ++++++++++++++++++----
 .../fixtures/ext/foo/bar/config/routing.yml        |  4 +++
 .../fixtures/ext/foo/bar/config/services.yml       |  3 ++
 .../fixtures/ext/foo/bar/controller/controller.php | 15 ++++++++++
 .../styles/prosilver/template/foo_bar_body.html    |  3 ++
 5 files changed, 52 insertions(+), 5 deletions(-)
 create mode 100644 tests/functional/fixtures/ext/foo/bar/styles/prosilver/template/foo_bar_body.html

(limited to 'tests/functional')

diff --git a/tests/functional/extension_controller_test.php b/tests/functional/extension_controller_test.php
index 65a9c80df6..9cc2e0e32f 100644
--- a/tests/functional/extension_controller_test.php
+++ b/tests/functional/extension_controller_test.php
@@ -18,7 +18,7 @@ class phpbb_functional_extension_controller_test extends phpbb_functional_test_c
 		'foo/bar/config/routing.yml',
 		'foo/bar/config/services.yml',
 		'foo/bar/controller/controller.php',
-		'foo/bar/ext.php',
+		'foo/bar/styles/prosilver/template/foo_bar_body.html',
 	);
 
 	/**
@@ -34,6 +34,7 @@ class phpbb_functional_extension_controller_test extends phpbb_functional_test_c
 			$phpbb_root_path . 'ext/foo/bar/',
 			$phpbb_root_path . 'ext/foo/bar/config/',
 			$phpbb_root_path . 'ext/foo/bar/controller/',
+			$phpbb_root_path . 'ext/foo/bar/styles/prosilver/template',
 		);
 
 		foreach ($directories as $dir)
@@ -43,10 +44,12 @@ class phpbb_functional_extension_controller_test extends phpbb_functional_test_c
 				mkdir($dir, 0777, true);
 			}
 		}
-	
+
 		foreach (self::$fixtures as $fixture)
 		{
-			copy("tests/functional/fixtures/ext/$fixture", "{$phpbb_root_path}ext/$fixture");
+			copy(
+				"tests/functional/fixtures/ext/$fixture",
+				"{$phpbb_root_path}ext/$fixture");
 		}
 	}
 
@@ -57,6 +60,7 @@ class phpbb_functional_extension_controller_test extends phpbb_functional_test_c
 	static public function tearDownAfterClass()
 	{
 		global $phpbb_root_path;
+
 		foreach (self::$fixtures as $fixture)
 		{
 			unlink("{$phpbb_root_path}ext/$fixture");
@@ -64,6 +68,9 @@ class phpbb_functional_extension_controller_test extends phpbb_functional_test_c
 
 		rmdir("{$phpbb_root_path}ext/foo/bar/config");
 		rmdir("{$phpbb_root_path}ext/foo/bar/controller");
+		rmdir("{$phpbb_root_path}ext/foo/bar/styles/prosilver/template");
+		rmdir("{$phpbb_root_path}ext/foo/bar/styles/prosilver");
+		rmdir("{$phpbb_root_path}ext/foo/bar/styles");
 		rmdir("{$phpbb_root_path}ext/foo/bar");
 		rmdir("{$phpbb_root_path}ext/foo");
 	}
@@ -78,7 +85,7 @@ class phpbb_functional_extension_controller_test extends phpbb_functional_test_c
 	}
 
 	/**
-	* Check a controller for extension foo/bar
+	* Check a controller for extension foo/bar.
 	*/
 	public function test_foo_bar()
 	{
@@ -88,6 +95,21 @@ class phpbb_functional_extension_controller_test extends phpbb_functional_test_c
 		$this->phpbb_extension_manager->purge('foo/bar');
 	}
 
+	/**
+	* Check the output of a controller using the template system
+	*/
+	public function test_controller_with_template()
+	{
+		$this->phpbb_extension_manager->enable('foo/bar');
+		$crawler = $this->request('GET', 'app.php/foo/template');
+		$this->assertContains("I am a variable", $crawler->filter('#content')->text());
+		$this->phpbb_extension_manager->purge('foo/bar');
+	}
+
+	/**
+	* Check the error produced by calling a controller without a required
+	* argument.
+	*/
 	public function test_missing_argument()
 	{
 		$this->phpbb_extension_manager->enable('foo/bar');
@@ -97,7 +119,7 @@ class phpbb_functional_extension_controller_test extends phpbb_functional_test_c
 	}
 
 	/**
-	* Check the error produced by extension at ./ext/does/not/exist
+	* Check the error produced by extension at ./ext/does/not/exist.
 	*
 	* If an extension is disabled, its routes are not loaded. Because we
 	* are not looking for a controller based on a specified extension,
diff --git a/tests/functional/fixtures/ext/foo/bar/config/routing.yml b/tests/functional/fixtures/ext/foo/bar/config/routing.yml
index 945ef51366..123f5f1b73 100755
--- a/tests/functional/fixtures/ext/foo/bar/config/routing.yml
+++ b/tests/functional/fixtures/ext/foo/bar/config/routing.yml
@@ -5,3 +5,7 @@ foo_bar_controller:
 foo_baz_controller:
     pattern: /foo/baz
     defaults: { _controller: foo_bar.controller:baz }
+
+foo_template_controller:
+    pattern: /foo/template
+    defaults: { _controller: foo_bar.controller:template }
diff --git a/tests/functional/fixtures/ext/foo/bar/config/services.yml b/tests/functional/fixtures/ext/foo/bar/config/services.yml
index d1db6fcb1d..33ced55af9 100755
--- a/tests/functional/fixtures/ext/foo/bar/config/services.yml
+++ b/tests/functional/fixtures/ext/foo/bar/config/services.yml
@@ -1,3 +1,6 @@
 services:
     foo_bar.controller:
         class: phpbb_ext_foo_bar_controller
+        arguments:
+            - @controller.helper
+            - @template
diff --git a/tests/functional/fixtures/ext/foo/bar/controller/controller.php b/tests/functional/fixtures/ext/foo/bar/controller/controller.php
index def5184e8c..50ea5d034b 100755
--- a/tests/functional/fixtures/ext/foo/bar/controller/controller.php
+++ b/tests/functional/fixtures/ext/foo/bar/controller/controller.php
@@ -3,6 +3,14 @@ use Symfony\Component\HttpFoundation\Response;
 
 class phpbb_ext_foo_bar_controller
 {
+	protected $template;
+
+	public function __construct(phpbb_controller_helper $helper, phpbb_template $template)
+	{
+		$this->template = $template;
+		$this->helper = $helper;
+	}
+
 	public function handle()
 	{
 		return new Response('foo/bar controller handle() method', 200);
@@ -12,4 +20,11 @@ class phpbb_ext_foo_bar_controller
 	{
 		return new Response('Value of "test" URL argument is: ' . $test);
 	}
+
+	public function template()
+	{
+		$this->template->assign_var('A_VARIABLE', 'I am a variable');
+
+		return $this->helper->render('foo_bar_body.html');
+	}
 }
diff --git a/tests/functional/fixtures/ext/foo/bar/styles/prosilver/template/foo_bar_body.html b/tests/functional/fixtures/ext/foo/bar/styles/prosilver/template/foo_bar_body.html
new file mode 100644
index 0000000000..8fb6994d3d
--- /dev/null
+++ b/tests/functional/fixtures/ext/foo/bar/styles/prosilver/template/foo_bar_body.html
@@ -0,0 +1,3 @@
+<!-- INCLUDE overall_header.html -->
+<div id="content">{A_VARIABLE}</div>
+<!-- INCLUDE overall_footer.html -->
-- 
cgit v1.2.1


From 4efbb893b7b8ada8766847dc59724faef9c18142 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Fri, 16 Nov 2012 17:36:39 -0500
Subject: [feature/controller] Fix line endings and permissions, and check
 responses

PHPBB3-10864
---
 tests/functional/extension_controller_test.php               |  4 ++++
 tests/functional/fixtures/ext/foo/bar/config/routing.yml     |  0
 tests/functional/fixtures/ext/foo/bar/config/services.yml    |  0
 .../fixtures/ext/foo/bar/controller/controller.php           |  0
 tests/functional/fixtures/ext/foo/bar/ext.php                | 12 ++++++------
 5 files changed, 10 insertions(+), 6 deletions(-)
 mode change 100755 => 100644 tests/functional/fixtures/ext/foo/bar/config/routing.yml
 mode change 100755 => 100644 tests/functional/fixtures/ext/foo/bar/config/services.yml
 mode change 100755 => 100644 tests/functional/fixtures/ext/foo/bar/controller/controller.php
 mode change 100755 => 100644 tests/functional/fixtures/ext/foo/bar/ext.php

(limited to 'tests/functional')

diff --git a/tests/functional/extension_controller_test.php b/tests/functional/extension_controller_test.php
index 9cc2e0e32f..ba4a4e8ef0 100644
--- a/tests/functional/extension_controller_test.php
+++ b/tests/functional/extension_controller_test.php
@@ -91,6 +91,7 @@ class phpbb_functional_extension_controller_test extends phpbb_functional_test_c
 	{
 		$this->phpbb_extension_manager->enable('foo/bar');
 		$crawler = $this->request('GET', 'app.php/foo/bar');
+		$this->assert_response_success();
 		$this->assertContains("foo/bar controller handle() method", $crawler->filter('body')->text());
 		$this->phpbb_extension_manager->purge('foo/bar');
 	}
@@ -102,6 +103,7 @@ class phpbb_functional_extension_controller_test extends phpbb_functional_test_c
 	{
 		$this->phpbb_extension_manager->enable('foo/bar');
 		$crawler = $this->request('GET', 'app.php/foo/template');
+		$this->assert_response_success();
 		$this->assertContains("I am a variable", $crawler->filter('#content')->text());
 		$this->phpbb_extension_manager->purge('foo/bar');
 	}
@@ -114,6 +116,7 @@ class phpbb_functional_extension_controller_test extends phpbb_functional_test_c
 	{
 		$this->phpbb_extension_manager->enable('foo/bar');
 		$crawler = $this->request('GET', 'app.php/foo/baz');
+		$this->assertEquals(404, $this->client->getResponse()->getStatus());
 		$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');
 	}
@@ -130,6 +133,7 @@ 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/does/not/exist');
+		$this->assertEquals(404, $this->client->getResponse()->getStatus());
 		$this->assertContains('No route found for "GET /does/not/exist"', $crawler->filter('body')->text());
 	}
 }
diff --git a/tests/functional/fixtures/ext/foo/bar/config/routing.yml b/tests/functional/fixtures/ext/foo/bar/config/routing.yml
old mode 100755
new mode 100644
diff --git a/tests/functional/fixtures/ext/foo/bar/config/services.yml b/tests/functional/fixtures/ext/foo/bar/config/services.yml
old mode 100755
new mode 100644
diff --git a/tests/functional/fixtures/ext/foo/bar/controller/controller.php b/tests/functional/fixtures/ext/foo/bar/controller/controller.php
old mode 100755
new mode 100644
diff --git a/tests/functional/fixtures/ext/foo/bar/ext.php b/tests/functional/fixtures/ext/foo/bar/ext.php
old mode 100755
new mode 100644
index 7170209d53..74359d51ab
--- a/tests/functional/fixtures/ext/foo/bar/ext.php
+++ b/tests/functional/fixtures/ext/foo/bar/ext.php
@@ -1,6 +1,6 @@
-<?php
-
-class phpbb_ext_foo_bar_ext extends phpbb_extension_base
-{
-
-}
+<?php
+
+class phpbb_ext_foo_bar_ext extends phpbb_extension_base
+{
+
+}
-- 
cgit v1.2.1


From 7a3d9ed85dfd7f32a938070fff854e56bf39738e Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Sun, 18 Nov 2012 13:11:24 -0500
Subject: [feature/controller] Fix functional tests to use query string for
 controllers

PHPBB3-10864
---
 tests/functional/extension_controller_test.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'tests/functional')

diff --git a/tests/functional/extension_controller_test.php b/tests/functional/extension_controller_test.php
index ba4a4e8ef0..482fe9dfd3 100644
--- a/tests/functional/extension_controller_test.php
+++ b/tests/functional/extension_controller_test.php
@@ -90,7 +90,7 @@ 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/foo/bar');
+		$crawler = $this->request('GET', 'app.php?controller=foo/bar');
 		$this->assert_response_success();
 		$this->assertContains("foo/bar controller handle() method", $crawler->filter('body')->text());
 		$this->phpbb_extension_manager->purge('foo/bar');
@@ -102,7 +102,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/foo/template');
+		$crawler = $this->request('GET', 'app.php?controller=foo/template');
 		$this->assert_response_success();
 		$this->assertContains("I am a variable", $crawler->filter('#content')->text());
 		$this->phpbb_extension_manager->purge('foo/bar');
@@ -115,7 +115,7 @@ 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/foo/baz');
+		$crawler = $this->request('GET', 'app.php?controller=foo/baz');
 		$this->assertEquals(404, $this->client->getResponse()->getStatus());
 		$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');
@@ -132,7 +132,7 @@ 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/does/not/exist');
+		$crawler = $this->request('GET', 'app.php?controller=does/not/exist');
 		$this->assertEquals(404, $this->client->getResponse()->getStatus());
 		$this->assertContains('No route found for "GET /does/not/exist"', $crawler->filter('body')->text());
 	}
-- 
cgit v1.2.1


From 440c66267ef768888617c211c7f05a5fd25e2378 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Sun, 18 Nov 2012 14:15:23 -0500
Subject: [ticket/11202] Add response assertions to file upload functional
 test.

PHPBB3-11202
---
 tests/functional/fileupload_form_test.php | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'tests/functional')

diff --git a/tests/functional/fileupload_form_test.php b/tests/functional/fileupload_form_test.php
index f7267fa659..3db389b4f9 100644
--- a/tests/functional/fileupload_form_test.php
+++ b/tests/functional/fileupload_form_test.php
@@ -64,6 +64,9 @@ class phpbb_functional_fileupload_form_test extends phpbb_functional_test_case
 	public function test_valid_file()
 	{
 		$crawler = $this->upload_file('valid.jpg', 'image/jpeg');
+		$this->assert_response_success();
+		# error message
+		$this->assertNotContains('<h2>' . $this->lang('INFORMATION') . '</h2>', $this->client->getResponse()->getContent());
 		$this->assertContains($this->lang('POSTED_ATTACHMENTS'), $crawler->filter('#postform h3')->eq(1)->text());
 	}
 }
-- 
cgit v1.2.1


From 7ec94208c4096b752e77503ef53382e126b7dab5 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Sun, 18 Nov 2012 14:32:48 -0500
Subject: [ticket/11202] Fix comment char, use more descriptive comment.

PHPBB3-11202
---
 tests/functional/fileupload_form_test.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tests/functional')

diff --git a/tests/functional/fileupload_form_test.php b/tests/functional/fileupload_form_test.php
index 3db389b4f9..99afcfdc3d 100644
--- a/tests/functional/fileupload_form_test.php
+++ b/tests/functional/fileupload_form_test.php
@@ -65,7 +65,7 @@ class phpbb_functional_fileupload_form_test extends phpbb_functional_test_case
 	{
 		$crawler = $this->upload_file('valid.jpg', 'image/jpeg');
 		$this->assert_response_success();
-		# error message
+		// ensure there was no error message rendered
 		$this->assertNotContains('<h2>' . $this->lang('INFORMATION') . '</h2>', $this->client->getResponse()->getContent());
 		$this->assertContains($this->lang('POSTED_ATTACHMENTS'), $crawler->filter('#postform h3')->eq(1)->text());
 	}
-- 
cgit v1.2.1


From f8614bfc84ba9b9cc814b8f78e343005620f18f8 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Mon, 19 Nov 2012 12:37:20 -0500
Subject: [feature/controller] Check for proper status codes from controllers

PHPBB3-10864
---
 tests/functional/extension_controller_test.php              | 13 ++++++++++++-
 tests/functional/fixtures/ext/foo/bar/config/routing.yml    |  4 ++++
 .../fixtures/ext/foo/bar/controller/controller.php          |  5 +++++
 3 files changed, 21 insertions(+), 1 deletion(-)

(limited to 'tests/functional')

diff --git a/tests/functional/extension_controller_test.php b/tests/functional/extension_controller_test.php
index 482fe9dfd3..c7b585354e 100644
--- a/tests/functional/extension_controller_test.php
+++ b/tests/functional/extension_controller_test.php
@@ -116,11 +116,20 @@ class phpbb_functional_extension_controller_test extends phpbb_functional_test_c
 	{
 		$this->phpbb_extension_manager->enable('foo/bar');
 		$crawler = $this->request('GET', 'app.php?controller=foo/baz');
-		$this->assertEquals(404, $this->client->getResponse()->getStatus());
+		$this->assertEquals(500, $this->client->getResponse()->getStatus());
 		$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');
 	}
 
+	public function test_exception_thrown_status_code()
+	{
+		$this->phpbb_extension_manager->enable('foo/bar');
+		$crawler = $this->request('GET', 'app.php?controller=foo/exception');
+		$this->assertEquals(500, $this->client->getResponse()->getStatus());
+		$this->assertContains('Exception thrown from foo/exception route', $crawler->filter('body')->text());
+		$this->phpbb_extension_manager->purge('foo/bar');
+	}
+
 	/**
 	* Check the error produced by extension at ./ext/does/not/exist.
 	*
@@ -133,6 +142,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');
+		// This is 500 response because the exception is thrown from within Symfony
+		// and does not provide a exception code, so we assign it 500 by default
 		$this->assertEquals(404, $this->client->getResponse()->getStatus());
 		$this->assertContains('No route found for "GET /does/not/exist"', $crawler->filter('body')->text());
 	}
diff --git a/tests/functional/fixtures/ext/foo/bar/config/routing.yml b/tests/functional/fixtures/ext/foo/bar/config/routing.yml
index 123f5f1b73..7eb604f746 100644
--- a/tests/functional/fixtures/ext/foo/bar/config/routing.yml
+++ b/tests/functional/fixtures/ext/foo/bar/config/routing.yml
@@ -9,3 +9,7 @@ foo_baz_controller:
 foo_template_controller:
     pattern: /foo/template
     defaults: { _controller: foo_bar.controller:template }
+
+foo_exception_controller:
+    pattern: /foo/foo_exception
+    defaults: { _controller: foo_bar.controller:exception }
diff --git a/tests/functional/fixtures/ext/foo/bar/controller/controller.php b/tests/functional/fixtures/ext/foo/bar/controller/controller.php
index 50ea5d034b..5a91b5f681 100644
--- a/tests/functional/fixtures/ext/foo/bar/controller/controller.php
+++ b/tests/functional/fixtures/ext/foo/bar/controller/controller.php
@@ -27,4 +27,9 @@ class phpbb_ext_foo_bar_controller
 
 		return $this->helper->render('foo_bar_body.html');
 	}
+
+	public function exception()
+	{
+		throw new phpbb_controller_exception('Exception thrown from foo/exception route');
+	}
 }
-- 
cgit v1.2.1


From 01ec6085939d74e6a37c3ef041434db1c4b8f3e4 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Mon, 19 Nov 2012 12:55:15 -0500
Subject: [feature/controller] Fix comments, check against more general
 HttpException

PHPBB3-10864
---
 tests/functional/extension_controller_test.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'tests/functional')

diff --git a/tests/functional/extension_controller_test.php b/tests/functional/extension_controller_test.php
index c7b585354e..f28b321942 100644
--- a/tests/functional/extension_controller_test.php
+++ b/tests/functional/extension_controller_test.php
@@ -121,7 +121,10 @@ class phpbb_functional_extension_controller_test extends phpbb_functional_test_c
 		$this->phpbb_extension_manager->purge('foo/bar');
 	}
 
-	public function test_exception_thrown_status_code()
+	/**
+	* Check the status code resulting from an exception thrown by a controller
+	*/
+	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');
@@ -142,8 +145,6 @@ 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');
-		// This is 500 response because the exception is thrown from within Symfony
-		// and does not provide a exception code, so we assign it 500 by default
 		$this->assertEquals(404, $this->client->getResponse()->getStatus());
 		$this->assertContains('No route found for "GET /does/not/exist"', $crawler->filter('body')->text());
 	}
-- 
cgit v1.2.1


From 305f41cf1a540984fd7a71b61a601b1794e3bd04 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Mon, 19 Nov 2012 13:16:55 -0500
Subject: [feature/controller] Fix misnamed route for functional test

PHPBB3-10864
---
 tests/functional/fixtures/ext/foo/bar/config/routing.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tests/functional')

diff --git a/tests/functional/fixtures/ext/foo/bar/config/routing.yml b/tests/functional/fixtures/ext/foo/bar/config/routing.yml
index 7eb604f746..09a30a8c67 100644
--- a/tests/functional/fixtures/ext/foo/bar/config/routing.yml
+++ b/tests/functional/fixtures/ext/foo/bar/config/routing.yml
@@ -11,5 +11,5 @@ foo_template_controller:
     defaults: { _controller: foo_bar.controller:template }
 
 foo_exception_controller:
-    pattern: /foo/foo_exception
+    pattern: /foo/exception
     defaults: { _controller: foo_bar.controller:exception }
-- 
cgit v1.2.1


From 70050020699d9eab9b97bda342e0e928d1591de8 Mon Sep 17 00:00:00 2001
From: Fyorl <gaelreth@gmail.com>
Date: Sun, 8 Jul 2012 20:22:19 +0100
Subject: [ticket/10972] Added methods for creating and deleting basic users

Modified the login method to allow logging in of an arbitrary user.
Also added tests for the new functionality.

PHPBB3-10972
---
 tests/functional/new_user_test.php | 45 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 tests/functional/new_user_test.php

(limited to 'tests/functional')

diff --git a/tests/functional/new_user_test.php b/tests/functional/new_user_test.php
new file mode 100644
index 0000000000..db2f31f450
--- /dev/null
+++ b/tests/functional/new_user_test.php
@@ -0,0 +1,45 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @group functional
+*/
+class phpbb_functional_new_user_test extends phpbb_functional_test_case
+{
+	public function test_create_user()
+	{
+		$this->create_user('user');
+		$this->login();
+		$crawler = $this->request('GET', 'memberlist.php?sid=' . $this->sid);
+		$this->assertContains('user', $crawler->filter('#memberlist tr')->eq(1)->text());
+	}
+
+	/**
+	* @depends test_create_user
+	*/
+	public function test_delete_user()
+	{
+		$this->delete_user('user');
+		$this->login();
+		$crawler = $this->request('GET', 'memberlist.php?sid=' . $this->sid);
+		$this->assertEquals(2, $crawler->filter('#memberlist tr')->count());
+	}
+
+	/**
+	* @depends test_delete_user
+	*/
+	public function test_login_other()
+	{
+		$this->create_user('user');
+		$this->login('user');
+		$crawler = $this->request('GET', 'index.php');
+		$this->assertContains('user', $crawler->filter('.icon-logout')->text());
+		$this->delete_user('user');
+	}
+}
-- 
cgit v1.2.1


From cafc7feca12730fce59091bd7a18fb5c3f7ecdc0 Mon Sep 17 00:00:00 2001
From: Fyorl <gaelreth@gmail.com>
Date: Mon, 9 Jul 2012 00:24:28 +0100
Subject: [ticket/10972] Moved tests into appropriate places and added comments

PHPBB3-10972
---
 tests/functional/auth_test.php     |  9 ++++++++
 tests/functional/new_user_test.php | 45 --------------------------------------
 2 files changed, 9 insertions(+), 45 deletions(-)
 delete mode 100644 tests/functional/new_user_test.php

(limited to 'tests/functional')

diff --git a/tests/functional/auth_test.php b/tests/functional/auth_test.php
index e955dcb4df..e67118d8f9 100644
--- a/tests/functional/auth_test.php
+++ b/tests/functional/auth_test.php
@@ -21,6 +21,15 @@ class phpbb_functional_auth_test extends phpbb_functional_test_case
 		$this->assertContains($this->lang('LOGOUT_USER', 'admin'), $crawler->filter('.navbar')->text());
 	}
 
+	public function test_login_other()
+	{
+		$this->create_user('user');
+		$this->login('user');
+		$crawler = $this->request('GET', 'index.php');
+		$this->assertContains('user', $crawler->filter('.icon-logout')->text());
+		$this->delete_user('user');
+	}
+
 	/**
 	* @depends test_login
 	*/
diff --git a/tests/functional/new_user_test.php b/tests/functional/new_user_test.php
deleted file mode 100644
index db2f31f450..0000000000
--- a/tests/functional/new_user_test.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-/**
-*
-* @package testing
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @group functional
-*/
-class phpbb_functional_new_user_test extends phpbb_functional_test_case
-{
-	public function test_create_user()
-	{
-		$this->create_user('user');
-		$this->login();
-		$crawler = $this->request('GET', 'memberlist.php?sid=' . $this->sid);
-		$this->assertContains('user', $crawler->filter('#memberlist tr')->eq(1)->text());
-	}
-
-	/**
-	* @depends test_create_user
-	*/
-	public function test_delete_user()
-	{
-		$this->delete_user('user');
-		$this->login();
-		$crawler = $this->request('GET', 'memberlist.php?sid=' . $this->sid);
-		$this->assertEquals(2, $crawler->filter('#memberlist tr')->count());
-	}
-
-	/**
-	* @depends test_delete_user
-	*/
-	public function test_login_other()
-	{
-		$this->create_user('user');
-		$this->login('user');
-		$crawler = $this->request('GET', 'index.php');
-		$this->assertContains('user', $crawler->filter('.icon-logout')->text());
-		$this->delete_user('user');
-	}
-}
-- 
cgit v1.2.1


From fb5c4440e598f2a775a52299a06e903d3cee5398 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Thu, 6 Dec 2012 23:43:22 -0500
Subject: [ticket/10972] Tweak user addition.

Always add users, do not keep track of which users have been added.
The tests should know whether users they want exist or not.

Use more unique user names in tests for robustness.

Added some more assertions here and there.

PHPBB3-10972
---
 tests/functional/auth_test.php | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'tests/functional')

diff --git a/tests/functional/auth_test.php b/tests/functional/auth_test.php
index e67118d8f9..3e218ebd77 100644
--- a/tests/functional/auth_test.php
+++ b/tests/functional/auth_test.php
@@ -18,16 +18,18 @@ class phpbb_functional_auth_test extends phpbb_functional_test_case
 
 		// check for logout link
 		$crawler = $this->request('GET', 'index.php');
+		$this->assert_response_success();
 		$this->assertContains($this->lang('LOGOUT_USER', 'admin'), $crawler->filter('.navbar')->text());
 	}
 
 	public function test_login_other()
 	{
-		$this->create_user('user');
-		$this->login('user');
+		$this->create_user('anothertestuser');
+		$this->login('anothertestuser');
 		$crawler = $this->request('GET', 'index.php');
-		$this->assertContains('user', $crawler->filter('.icon-logout')->text());
-		$this->delete_user('user');
+		$this->assert_response_success();
+		$this->assertContains('anothertestuser', $crawler->filter('.icon-logout')->text());
+		$this->delete_user('anothertestuser');
 	}
 
 	/**
@@ -40,10 +42,12 @@ class phpbb_functional_auth_test extends phpbb_functional_test_case
 
 		// logout
 		$crawler = $this->request('GET', 'ucp.php?sid=' . $this->sid . '&mode=logout');
+		$this->assert_response_success();
 		$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');
+		$this->assert_response_success();
 		$this->assertContains($this->lang('REGISTER'), $crawler->filter('.navbar')->text());
 	}
 }
-- 
cgit v1.2.1


From ff993ba9d30f5de49e5231647c5bb76d95c357f8 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Thu, 6 Dec 2012 23:47:19 -0500
Subject: [ticket/10972] Drop user deletion.

Users should not be deleted in tests that test user creation.
Tests should use unique user names to avoid collisions.

User deletion should use user_remove anyway.

PHPBB3-10972
---
 tests/functional/auth_test.php | 1 -
 1 file changed, 1 deletion(-)

(limited to 'tests/functional')

diff --git a/tests/functional/auth_test.php b/tests/functional/auth_test.php
index 3e218ebd77..662b1bd38b 100644
--- a/tests/functional/auth_test.php
+++ b/tests/functional/auth_test.php
@@ -29,7 +29,6 @@ class phpbb_functional_auth_test extends phpbb_functional_test_case
 		$crawler = $this->request('GET', 'index.php');
 		$this->assert_response_success();
 		$this->assertContains('anothertestuser', $crawler->filter('.icon-logout')->text());
-		$this->delete_user('anothertestuser');
 	}
 
 	/**
-- 
cgit v1.2.1


From 2d5bd24fded901fd7efdcd043916ec374f0f76c1 Mon Sep 17 00:00:00 2001
From: Fyorl <gaelreth@gmail.com>
Date: Mon, 9 Jul 2012 00:30:01 +0100
Subject: [ticket/10975] Some quick tests to check the memberlist behaviour

Checks behaviour when adding and deleting a user.

PHPBB3-10975
---
 tests/functional/memberlist_test.php | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 tests/functional/memberlist_test.php

(limited to 'tests/functional')

diff --git a/tests/functional/memberlist_test.php b/tests/functional/memberlist_test.php
new file mode 100644
index 0000000000..f7cc510caf
--- /dev/null
+++ b/tests/functional/memberlist_test.php
@@ -0,0 +1,33 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @group functional
+*/
+class phpbb_functional_memberlist_test extends phpbb_functional_test_case
+{
+	public function test_create_user()
+	{
+		$this->create_user('user');
+		$this->login();
+		$crawler = $this->request('GET', 'memberlist.php?sid=' . $this->sid);
+		$this->assertContains('user', $crawler->filter('#memberlist tr')->eq(1)->text());
+	}
+
+	/**
+	* @depends test_create_user
+	*/
+	public function test_delete_user()
+	{
+		$this->delete_user('user');
+		$this->login();
+		$crawler = $this->request('GET', 'memberlist.php?sid=' . $this->sid);
+		$this->assertEquals(2, $crawler->filter('#memberlist tr')->count());
+	}
+}
-- 
cgit v1.2.1


From c5f350906d0470e54ca7ade935b4bee841acdbed Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Thu, 13 Dec 2012 07:27:40 -0500
Subject: [ticket/10975] Test memberlist, not user creation.

PHPBB3-10975
---
 tests/functional/memberlist_test.php | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

(limited to 'tests/functional')

diff --git a/tests/functional/memberlist_test.php b/tests/functional/memberlist_test.php
index f7cc510caf..fd80f9b031 100644
--- a/tests/functional/memberlist_test.php
+++ b/tests/functional/memberlist_test.php
@@ -12,22 +12,13 @@
 */
 class phpbb_functional_memberlist_test extends phpbb_functional_test_case
 {
-	public function test_create_user()
+	public function test_view()
 	{
-		$this->create_user('user');
+		$this->create_user('memberlist-test-user');
+		// logs in as admin
 		$this->login();
 		$crawler = $this->request('GET', 'memberlist.php?sid=' . $this->sid);
-		$this->assertContains('user', $crawler->filter('#memberlist tr')->eq(1)->text());
-	}
-
-	/**
-	* @depends test_create_user
-	*/
-	public function test_delete_user()
-	{
-		$this->delete_user('user');
-		$this->login();
-		$crawler = $this->request('GET', 'memberlist.php?sid=' . $this->sid);
-		$this->assertEquals(2, $crawler->filter('#memberlist tr')->count());
+		$this->assert_response_success();
+		$this->assertContains('memberlist-test-user', $crawler->text());
 	}
 }
-- 
cgit v1.2.1


From b42a2283129a936ce0095394f68e43faa1e8052a Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Thu, 13 Dec 2012 07:33:02 -0500
Subject: [ticket/10975] Test restricting by first character.

PHPBB3-10975
---
 tests/functional/memberlist_test.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'tests/functional')

diff --git a/tests/functional/memberlist_test.php b/tests/functional/memberlist_test.php
index fd80f9b031..b3cb7db759 100644
--- a/tests/functional/memberlist_test.php
+++ b/tests/functional/memberlist_test.php
@@ -20,5 +20,15 @@ class phpbb_functional_memberlist_test extends phpbb_functional_test_case
 		$crawler = $this->request('GET', 'memberlist.php?sid=' . $this->sid);
 		$this->assert_response_success();
 		$this->assertContains('memberlist-test-user', $crawler->text());
+
+		// restrict by first character
+		$crawler = $this->request('GET', 'memberlist.php?first_char=m&sid=' . $this->sid);
+		$this->assert_response_success();
+		$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);
+		$this->assert_response_success();
+		$this->assertNotContains('memberlist-test-user', $crawler->text());
 	}
 }
-- 
cgit v1.2.1


From 326b6eb8572101d53eece1dd8df288460be27650 Mon Sep 17 00:00:00 2001
From: Oleg Pudeyev <oleg@bsdpower.com>
Date: Thu, 13 Dec 2012 07:41:24 -0500
Subject: [ticket/10975] Add a test for viewing a profile.

PHPBB3-10975
---
 tests/functional/memberlist_test.php | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'tests/functional')

diff --git a/tests/functional/memberlist_test.php b/tests/functional/memberlist_test.php
index b3cb7db759..879bee2f0e 100644
--- a/tests/functional/memberlist_test.php
+++ b/tests/functional/memberlist_test.php
@@ -12,7 +12,7 @@
 */
 class phpbb_functional_memberlist_test extends phpbb_functional_test_case
 {
-	public function test_view()
+	public function test_memberlist()
 	{
 		$this->create_user('memberlist-test-user');
 		// logs in as admin
@@ -31,4 +31,13 @@ class phpbb_functional_memberlist_test extends phpbb_functional_test_case
 		$this->assert_response_success();
 		$this->assertNotContains('memberlist-test-user', $crawler->text());
 	}
+
+	public function test_viewprofile()
+	{
+		$this->login();
+		// XXX hardcoded user id
+		$crawler = $this->request('GET', 'memberlist.php?mode=viewprofile&u=2&sid=' . $this->sid);
+		$this->assert_response_success();
+		$this->assertContains('admin', $crawler->filter('h2')->text());
+	}
 }
-- 
cgit v1.2.1


From 9eb9fa2b9d117b919dfcc1e37d6c1186841b4fe7 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Thu, 13 Dec 2012 22:38:17 -0600
Subject: [ticket/8610] Create helper functions to create topic/post in
 functional tests

This will be used to test splitting/copying/merging/etc in functional tests

Also convert functional posting_test.php to use these functions

PHPBB3-8610
---
 tests/functional/posting_test.php | 89 +++++----------------------------------
 1 file changed, 11 insertions(+), 78 deletions(-)

(limited to 'tests/functional')

diff --git a/tests/functional/posting_test.php b/tests/functional/posting_test.php
index f54a3591b2..6aa7a46974 100644
--- a/tests/functional/posting_test.php
+++ b/tests/functional/posting_test.php
@@ -15,88 +15,21 @@ class phpbb_functional_posting_test extends phpbb_functional_test_case
 	public function test_post_new_topic()
 	{
 		$this->login();
-		$this->add_lang('posting');
 
-		$crawler = $this->request('GET', 'posting.php?mode=post&f=2&sid=' . $this->sid);
-		$this->assertContains($this->lang('POST_TOPIC'), $crawler->filter('html')->text());
+		// Test creating topic
+		$post = $this->create_topic(2, 'Test Topic 1', 'This is a test topic posted by the testing framework.');
 
-		$hidden_fields = array();
-		$hidden_fields[] = $crawler->filter('[type="hidden"]')->each(function ($node, $i) {
-			return array('name' => $node->getAttribute('name'), 'value' => $node->getAttribute('value'));
-		});
+		$crawler = $this->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_message = 'This is a test topic posted by the testing framework.';
-		$form_data = array(
-			'subject'		=> 'Test Topic 1',
-			'message'		=> $test_message,
-			'post'			=> true,
-			'f'				=> 2,
-			'mode'			=> 'post',
-			'sid'			=> $this->sid,
-		);
+		// 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.');
 
-		foreach ($hidden_fields as $fields)
-		{
-			foreach($fields as $field)
-			{
-				$form_data[$field['name']] = $field['value'];
-			}
-		}
+		$crawler = $this->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());
 
-		// Bypass time restriction that said that if the lastclick time (i.e. time when the form was opened)
-		// is not at least 2 seconds before submission, cancel the form
-		$form_data['lastclick'] = 0;
-
-		// 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->client->request('POST', 'posting.php', $form_data);
-		$this->assertContains($this->lang('POST_STORED'), $crawler->filter('html')->text());
-
-		$crawler = $this->request('GET', 'viewtopic.php?t=2&sid=' . $this->sid);
-		$this->assertContains($test_message, $crawler->filter('html')->text());
-	}
-
-	public function test_post_reply()
-	{
-		$this->login();
-		$this->add_lang('posting');
-
-		$crawler = $this->request('GET', 'posting.php?mode=reply&t=2&f=2&sid=' . $this->sid);
-		$this->assertContains($this->lang('POST_REPLY'), $crawler->filter('html')->text());
-
-		$hidden_fields = array();
-		$hidden_fields[] = $crawler->filter('[type="hidden"]')->each(function ($node, $i) {
-			return array('name' => $node->getAttribute('name'), 'value' => $node->getAttribute('value'));
-		});
-
-		$test_message = 'This is a test post posted by the testing framework.';
-		$form_data = array(
-			'subject'		=> 'Re: Test Topic 1',
-			'message'		=> $test_message,
-			'post'			=> true,
-			't'				=> 2,
-			'f'				=> 2,
-			'mode'			=> 'reply',
-			'sid'			=> $this->sid,
-		);
-
-		foreach ($hidden_fields as $fields)
-		{
-			foreach($fields as $field)
-			{
-				$form_data[$field['name']] = $field['value'];
-			}
-		}
-
-		// For reasoning behind the following command, see the test_post_new_topic() test
-		$form_data['lastclick'] = 0;
-
-		// Submit the post
-		$crawler = $this->client->request('POST', 'posting.php', $form_data);
-		$this->assertContains($this->lang('POST_STORED'), $crawler->filter('html')->text());
-
-		$crawler = $this->request('GET', 'viewtopic.php?t=2&sid=' . $this->sid);
-		$this->assertContains($test_message, $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}");
+		$this->assertContains('This is a test post posted by the testing framework.', $crawler->filter('html')->text());
 	}
 }
-- 
cgit v1.2.1


From d739745ea4ccc224b6b7fb686339138733c2203d Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Thu, 13 Dec 2012 23:09:45 -0600
Subject: [ticket/8610] Move posting helpers to separate file

This is to prevent cluttering up the functional test case class more

PHPBB3-8610
---
 tests/functional/posting_test.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'tests/functional')

diff --git a/tests/functional/posting_test.php b/tests/functional/posting_test.php
index 6aa7a46974..dd078286d6 100644
--- a/tests/functional/posting_test.php
+++ b/tests/functional/posting_test.php
@@ -15,15 +15,19 @@ class phpbb_functional_posting_test extends phpbb_functional_test_case
 	public function test_post_new_topic()
 	{
 		$this->login();
+		
+		include(__DIR__ . './../test_framework/posting_helpers.php');
+
+		$posting_helper = new phpbb_test_framework_posting_helpers($this);
 
 		// Test creating topic
-		$post = $this->create_topic(2, 'Test Topic 1', 'This is a test topic posted by the testing framework.');
+		$post = $posting_helper->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}");
 		$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.');
+		$post2 = $posting_helper->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}");
 		$this->assertContains('This is a test post posted by the testing framework.', $crawler->filter('html')->text());
-- 
cgit v1.2.1


From 175b6deb6d263a3184d4b51cb1f00137cadc542e Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Sat, 15 Dec 2012 16:22:54 -0600
Subject: [ticket/8610] Do not use requests to submit posts except in
 posting_test.php

Moving my functional test functions from posting_helpers.php to
posting_test.php since it is a bit nicer and more reusable if
posting_test.php is to be expanded in the future.

PHPBB3-8610
---
 tests/functional/posting_test.php | 112 ++++++++++++++++++++++++++++++++++++--
 1 file changed, 106 insertions(+), 6 deletions(-)

(limited to 'tests/functional')

diff --git a/tests/functional/posting_test.php b/tests/functional/posting_test.php
index dd078286d6..d05207edf0 100644
--- a/tests/functional/posting_test.php
+++ b/tests/functional/posting_test.php
@@ -15,25 +15,125 @@ class phpbb_functional_posting_test extends phpbb_functional_test_case
 	public function test_post_new_topic()
 	{
 		$this->login();
-		
-		include(__DIR__ . './../test_framework/posting_helpers.php');
-
-		$posting_helper = new phpbb_test_framework_posting_helpers($this);
 
 		// Test creating topic
-		$post = $posting_helper->create_topic(2, 'Test Topic 1', 'This is a test topic posted by the testing framework.');
+		$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}");
 		$this->assertContains('This is a test topic posted by the testing framework.', $crawler->filter('html')->text());
 
 		// Test creating a reply
-		$post2 = $posting_helper->create_post(2, $post['topic_id'], 'Re: Test Topic 1', 'This is a test post posted by the testing framework.');
+		$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}");
 		$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}");
+		$this->assert_response_success();
 		$this->assertContains('This is a test post posted by the testing framework.', $crawler->filter('html')->text());
 	}
+
+	/**
+	* Creates a topic
+	* 
+	* Be sure to login before creating
+	* 
+	* @param int $forum_id
+	* @param string $subject
+	* @param string $message
+	* @param array $additional_form_data Any additional form data to be sent in the request
+	* @return array post_id, topic_id
+	*/
+	public function create_topic($forum_id, $subject, $message, $additional_form_data = array())
+	{
+		$posting_url = "posting.php?mode=post&f={$forum_id}&sid={$this->sid}";
+
+		$form_data = array_merge(array(
+			'subject'		=> $subject,
+			'message'		=> $message,
+			'post'			=> true,
+		), $additional_form_data);
+
+		return $this->submit_post($posting_url, 'POST_TOPIC', $form_data);
+	}
+
+	/**
+	* Creates a post
+	* 
+	* Be sure to login before creating
+	* 
+	* @param int $forum_id
+	* @param string $subject
+	* @param string $message
+	* @param array $additional_form_data Any additional form data to be sent in the request
+	* @return array post_id, topic_id
+	*/
+	public function create_post($forum_id, $topic_id, $subject, $message, $additional_form_data = array())
+	{
+		$posting_url = "posting.php?mode=reply&f={$forum_id}&t={$topic_id}&sid={$this->sid}";
+
+		$form_data = array_merge(array(
+			'subject'		=> $subject,
+			'message'		=> $message,
+			'post'			=> true,
+		), $additional_form_data);
+
+		return $this->submit_post($posting_url, 'POST_REPLY', $form_data);
+	}
+	
+	/**
+	* Helper for submitting posts
+	* 
+	* @param string $posting_url
+	* @param string $posting_contains
+	* @param array $form_data
+	* @return array post_id, topic_id
+	*/
+	protected function submit_post($posting_url, $posting_contains, $form_data)
+	{
+		$this->add_lang('posting');
+
+		$crawler = $this->request('GET', $posting_url);
+		$this->assert_response_success();
+		$this->assertContains($this->lang($posting_contains), $crawler->filter('html')->text());
+
+		$hidden_fields = array(
+			$crawler->filter('[type="hidden"]')->each(function ($node, $i) {
+				return array('name' => $node->getAttribute('name'), 'value' => $node->getAttribute('value'));
+			}),
+		);
+
+		foreach ($hidden_fields as $fields)
+		{
+			foreach($fields as $field)
+			{
+				$form_data[$field['name']] = $field['value'];
+			}
+		}
+
+		// Bypass time restriction that said that if the lastclick time (i.e. time when the form was opened)
+		// is not at least 2 seconds before submission, cancel the form
+		$form_data['lastclick'] = 0;
+
+		// 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->client->request('POST', $posting_url, $form_data);
+		$this->assert_response_success();
+		$this->assertContains($this->lang('POST_STORED'), $crawler->filter('html')->text());
+
+		$url = $crawler->selectLink($this->lang('VIEW_MESSAGE', '', ''))->link()->getUri();
+		
+		$matches = $topic_id = $post_id = false;
+		preg_match_all('#&t=([0-9]+)(&p=([0-9]+))?#', $url, $matches);
+		
+		$topic_id = (int) (isset($matches[1][0])) ? $matches[1][0] : 0;
+		$post_id = (int) (isset($matches[3][0])) ? $matches[3][0] : 0;
+
+		return array(
+			'topic_id'	=> $topic_id,
+			'post_id'	=> $post_id,
+		);
+	}
 }
-- 
cgit v1.2.1