3 files changed, 88 insertions, 3 deletions
diff --git a/tests/functional/extension_acp_test.php b/tests/functional/extension_acp_test.php
index 6490c1ead3..7be8957ec7 100644
--- a/tests/functional/extension_acp_test.php
+++ b/tests/functional/extension_acp_test.php
@@ -84,7 +84,7 @@ class phpbb_functional_extension_acp_test extends phpbb_functional_test_case
 		$crawler = self::request('GET', 'adm/index.php?i=acp_extensions&mode=main&sid=' . $this->sid);
 
 		$this->assertCount(1, $crawler->filter('.ext_enabled'));
-		$this->assertCount(5, $crawler->filter('.ext_disabled'));
+		$this->assertCount(6, $crawler->filter('.ext_disabled'));
 
 		$this->assertContains('phpBB Foo Extension', $crawler->filter('.ext_enabled')->eq(0)->text());
 		$this->assertContainsLang('EXTENSION_DISABLE', $crawler->filter('.ext_enabled')->eq(0)->text());
diff --git a/tests/functional/fileupload_form_test.php b/tests/functional/fileupload_form_test.php
index e87953367f..b8c48389e0 100644
--- a/tests/functional/fileupload_form_test.php
+++ b/tests/functional/fileupload_form_test.php
@@ -107,9 +107,9 @@ class phpbb_functional_fileupload_form_test extends phpbb_functional_test_case
 
 		$crawler = $this->upload_file('disallowed.jpg', 'image/jpeg');
 
-		// Hitting the ATTACHED_IMAGE_NOT_IMAGE error means we passed the
+		// Hitting the UNABLE_GET_IMAGE_SIZE error means we passed the
 		// DISALLOWED_CONTENT check
-		$this->assertContains($this->lang('ATTACHED_IMAGE_NOT_IMAGE'), $crawler->text());
+		$this->assertContainsLang('UNABLE_GET_IMAGE_SIZE', $crawler->text());
 	}
 
 	public function test_too_large()
diff --git a/tests/functional/ucp_preferences_test.php b/tests/functional/ucp_preferences_test.php
new file mode 100644
index 0000000000..7ef325dc4b
--- /dev/null
+++ b/tests/functional/ucp_preferences_test.php
@@ -0,0 +1,85 @@
+<?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_ucp_preferences_test extends phpbb_functional_test_case
+{
+	public function test_submitting_preferences_view()
+	{
+		$this->add_lang('ucp');
+		$this->login();
+
+		$crawler = self::request('GET', 'ucp.php?i=ucp_prefs&mode=view');
+		$this->assertContainsLang('UCP_PREFS_VIEW', $crawler->filter('#cp-main h2')->text());
+
+		$form = $crawler->selectButton('Submit')->form(array(
+			'topic_sk'	=> 'a',
+			'topic_sd'	=> 'a',
+			'topic_st'	=> '1',
+			'post_sk'	=> 'a',
+			'post_sd'	=> 'a',
+			'post_st'	=> '1',
+		));
+
+		$crawler = self::submit($form);
+		$this->assertContainsLang('PREFERENCES_UPDATED', $crawler->filter('#message')->text());
+	}
+
+	public function test_submitting_invalid_preferences_view()
+	{
+		$this->add_lang('ucp');
+		$this->login();
+
+		$crawler = self::request('GET', 'ucp.php?i=ucp_prefs&mode=view');
+		$this->assertContainsLang('UCP_PREFS_VIEW', $crawler->filter('#cp-main h2')->text());
+		$form = $crawler->selectButton('Submit')->form();
+
+		if (!method_exists($form, 'disableValidation'))
+		{
+			$this->markTestIncomplete('The crawler cannot select invalid values, until Symfony 2.4!');
+		}
+
+		$form = $form->disableValidation();
+		$form['topic_sk']->select('z');
+		$form['topic_sd']->select('z');
+		$form['topic_st']->select('test');
+		$form['post_sk']->select('z');
+		$form['post_sd']->select('z');
+		$form['post_st']->select('test');
+
+		$crawler = self::submit($form);
+		$this->assertContainsLang('WRONG_DATA_POST_SD', $crawler->filter('#cp-main')->text());
+		$this->assertContainsLang('WRONG_DATA_POST_SK', $crawler->filter('#cp-main')->text());
+		$this->assertContainsLang('WRONG_DATA_TOPIC_SD', $crawler->filter('#cp-main')->text());
+		$this->assertContainsLang('WRONG_DATA_TOPIC_SK', $crawler->filter('#cp-main')->text());
+	}
+
+	public function test_read_preferences_view()
+	{
+		$this->add_lang('ucp');
+		$this->login();
+
+		$crawler = self::request('GET', 'ucp.php?i=ucp_prefs&mode=view');
+		$this->assertContainsLang('UCP_PREFS_VIEW', $crawler->filter('#cp-main h2')->text());
+		$form = $crawler->selectButton('Submit')->form();
+
+		$this->assertEquals('a', $form->get('topic_sk')->getValue());
+		$this->assertEquals('a', $form->get('topic_sd')->getValue());
+		$this->assertEquals('1', $form->get('topic_st')->getValue());
+		$this->assertEquals('a', $form->get('post_sk')->getValue());
+		$this->assertEquals('a', $form->get('post_sd')->getValue());
+		$this->assertEquals('1', $form->get('post_st')->getValue());
+	}
+}