5 files changed, 98 insertions, 18 deletions
diff --git a/tests/functional/acp_profile_field_test.php b/tests/functional/acp_profile_field_test.php
new file mode 100644
index 0000000000..88df782faa
--- /dev/null
+++ b/tests/functional/acp_profile_field_test.php
@@ -0,0 +1,71 @@
+<?php
+/**
+*
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
+*
+*/
+
+/**
+* @group functional
+*/
+class phpbb_functional_acp_profile_field_test extends phpbb_functional_test_case
+{
+	public function setUp()
+	{
+		parent::setUp();
+
+		$this->login();
+		$this->admin_login();
+		$this->add_lang('acp/profile');
+	}
+
+	public function data_add_profile_field()
+	{
+		return array(
+			array('bool', 'profilefields.type.bool',
+				array(
+					'lang_options[0]'	=> 'foo',
+					'lang_options[1]'	=> 'bar',
+				),
+				array(),
+			),
+			array('dropdown', 'profilefields.type.dropdown',
+				array(
+					'lang_options'	=> "foo\nbar\nbar\nfoo",
+				),
+				array(),
+			),
+		);
+	}
+
+	/**
+	 * @dataProvider data_add_profile_field
+	 */
+	public function test_add_profile_field($name, $type, $page1_settings, $page2_settings)
+	{
+		// Custom profile fields page
+		$crawler = self::request('GET', 'adm/index.php?i=acp_profile&mode=profile&sid=' . $this->sid);
+		// these language strings are html
+		$form = $crawler->selectButton('Create new field')->form(array(
+			'field_ident'	=> $name,
+			'field_type'	=> $type,
+		));
+		$crawler = self::submit($form);
+
+		// Fill form for profile field options
+		$form = $crawler->selectButton('Profile type specific options')->form($page1_settings);
+		$crawler = self::submit($form);
+
+		// Fill form for profile field specific options
+		$form = $crawler->selectButton('Save')->form($page2_settings);
+		$crawler= self::submit($form);
+
+		$this->assertContainsLang('ADDED_PROFILE_FIELD', $crawler->text());
+	}
+}
diff --git a/tests/functional/fileupload_form_test.php b/tests/functional/fileupload_form_test.php
index b8c48389e0..d381fa1ae2 100644
--- a/tests/functional/fileupload_form_test.php
+++ b/tests/functional/fileupload_form_test.php
@@ -93,23 +93,32 @@ class phpbb_functional_fileupload_form_test extends phpbb_functional_test_case
 		$this->login();
 		$this->admin_login();
 		$this->add_lang('ucp');
-		$crawler = self::request('GET', 'adm/index.php?sid=' . $this->sid . '&i=acp_attachments&mode=attach');
 
-		$form = $crawler->selectButton('Submit')->form();
-		$values = $form->getValues();
+		// Make sure check_attachment_content is set to false
+		$crawler = self::request('GET', 'adm/index.php?sid=' . $this->sid . '&i=acp_attachments&mode=attach');
 
-		$values["config[check_attachment_content]"] = 0;
-		$form->setValues($values);
-		$crawler = self::submit($form);
+		$form = $crawler->selectButton('Submit')->form(array(
+			'config[check_attachment_content]'	=> 0,
+			'config[img_imagick]'				=> '',
+		));
+		self::submit($form);
 
 		// Request index for correct URL
-		$crawler = self::request('GET', 'index.php?sid=' . $this->sid);
+		self::request('GET', 'index.php?sid=' . $this->sid);
 
 		$crawler = $this->upload_file('disallowed.jpg', 'image/jpeg');
 
 		// Hitting the UNABLE_GET_IMAGE_SIZE error means we passed the
 		// DISALLOWED_CONTENT check
 		$this->assertContainsLang('UNABLE_GET_IMAGE_SIZE', $crawler->text());
+
+		// Reset check_attachment_content to default (enabled)
+		$crawler = self::request('GET', 'adm/index.php?sid=' . $this->sid . '&i=acp_attachments&mode=attach');
+
+		$form = $crawler->selectButton('Submit')->form(array(
+			'config[check_attachment_content]'	=> 1,
+		));
+		self::submit($form);
 	}
 
 	public function test_too_large()
diff --git a/tests/functional/fixtures/ext/foo/bar/config/routing.yml b/tests/functional/fixtures/ext/foo/bar/config/routing.yml
index 08bc73038f..374a58046d 100644
--- a/tests/functional/fixtures/ext/foo/bar/config/routing.yml
+++ b/tests/functional/fixtures/ext/foo/bar/config/routing.yml
@@ -1,35 +1,35 @@
 foo_bar_controller:
-    pattern: /foo/bar
+    path: /foo/bar
     defaults: { _controller: foo_bar.controller:handle }
 
 foo_baz_controller:
-    pattern: /foo/baz
+    path: /foo/baz
     defaults: { _controller: foo_bar.controller:baz }
 
 foo_template_controller:
-    pattern: /foo/template
+    path: /foo/template
     defaults: { _controller: foo_bar.controller:template }
 
 foo_exception_controller:
-    pattern: /foo/exception
+    path: /foo/exception
     defaults: { _controller: foo_bar.controller:exception }
 
 foo_login_redirect_controller:
-    pattern: /foo/login_redirect
+    path: /foo/login_redirect
     defaults: { _controller: foo_bar.controller:login_redirect }
 
 foo_redirect_controller:
-    pattern: /foo/redirect
+    path: /foo/redirect
     defaults: { _controller: foo_bar.controller:redirect }
 
 foo_index_controller:
-    pattern: /index
+    path: /index
     defaults: { _controller: foo_bar.controller:redirect }
 
 foo_tests_index_controller:
-    pattern: /tests/index
+    path: /tests/index
     defaults: { _controller: foo_bar.controller:redirect }
 
 foo_tests_dotdot_index_controller:
-    pattern: /tests/../index
+    path: /tests/../index
     defaults: { _controller: foo_bar.controller:redirect }
diff --git a/tests/functional/fixtures/ext/foo/foo/config/resource.yml b/tests/functional/fixtures/ext/foo/foo/config/resource.yml
index ed1d018016..4f2b9cce70 100644
--- a/tests/functional/fixtures/ext/foo/foo/config/resource.yml
+++ b/tests/functional/fixtures/ext/foo/foo/config/resource.yml
@@ -1,3 +1,3 @@
 foo_foo_controller:
-    pattern: /foo
+    path: /foo
     defaults: { _controller: foo_foo.controller:handle }
diff --git a/tests/functional/prune_shadow_topic_test.php b/tests/functional/prune_shadow_topic_test.php
index f00303060d..c014119b98 100644
--- a/tests/functional/prune_shadow_topic_test.php
+++ b/tests/functional/prune_shadow_topic_test.php
@@ -62,7 +62,7 @@ class phpbb_functional_prune_shadow_topic_test extends phpbb_functional_test_cas
 		$crawler = self::request('GET', "viewtopic.php?t={$this->post['topic_id']}&sid={$this->sid}");
 
 		$this->assertContains('Prune Shadow #1', $crawler->filter('html')->text());
-		$this->data['topics']['Prune Shadow #1'] = (int) $post['topic_id'];
+		$this->data['topics']['Prune Shadow #1'] = (int) $this->post['topic_id'];
 		$this->data['posts']['Prune Shadow #1'] = (int) $this->get_parameter_from_link($crawler->filter('.post')->selectLink($this->lang('POST', '', ''))->link()->getUri(), 'p');
 
 		$this->assert_forum_details($this->data['forums']['Prune Shadow'], array(