5 files changed, 40 insertions, 8 deletions
diff --git a/tests/functional/auth_test.php b/tests/functional/auth_test.php
index cfd85571b7..d3fed18094 100644
--- a/tests/functional/auth_test.php
+++ b/tests/functional/auth_test.php
@@ -18,7 +18,7 @@ class phpbb_functional_auth_test extends phpbb_functional_test_case
 
 		// check for logout link
 		$crawler = self::request('GET', 'index.php');
-		$this->assertContains($this->lang('LOGOUT_USER', 'admin'), $crawler->filter('.navbar')->text());
+		$this->assertContains($this->lang('LOGOUT', 'admin'), $crawler->filter('.navbar')->text());
 	}
 
 	public function test_login_other()
@@ -26,7 +26,7 @@ class phpbb_functional_auth_test extends phpbb_functional_test_case
 		$this->create_user('anothertestuser');
 		$this->login('anothertestuser');
 		$crawler = self::request('GET', 'index.php');
-		$this->assertContains('anothertestuser', $crawler->filter('.icon-logout')->text());
+		$this->assertContains('anothertestuser', $crawler->filter('#username_logged_in')->text());
 	}
 
 	/**
diff --git a/tests/functional/extension_acp_test.php b/tests/functional/extension_acp_test.php
index 1d79043eae..5f02158e20 100644
--- a/tests/functional/extension_acp_test.php
+++ b/tests/functional/extension_acp_test.php
@@ -85,14 +85,14 @@ class phpbb_functional_extension_acp_test extends phpbb_functional_test_case
 		$this->assertContains('phpBB Foo Extension', $crawler->filter('.ext_enabled')->eq(0)->text());
 		$this->assertContainsLang('EXTENSION_DISABLE', $crawler->filter('.ext_enabled')->eq(0)->text());
 
-		$this->assertContains('phpBB Moo Extension', $crawler->filter('.ext_disabled')->eq(1)->text());
-		$this->assertContainsLang('DETAILS', $crawler->filter('.ext_disabled')->eq(1)->text());
-		$this->assertContainsLang('EXTENSION_ENABLE', $crawler->filter('.ext_disabled')->eq(1)->text());
-		$this->assertContainsLang('EXTENSION_DELETE_DATA', $crawler->filter('.ext_disabled')->eq(1)->text());
+		$this->assertContains('phpBB Moo Extension', $crawler->filter('.ext_disabled')->eq(2)->text());
+		$this->assertContainsLang('DETAILS', $crawler->filter('.ext_disabled')->eq(2)->text());
+		$this->assertContainsLang('EXTENSION_ENABLE', $crawler->filter('.ext_disabled')->eq(2)->text());
+		$this->assertContainsLang('EXTENSION_DELETE_DATA', $crawler->filter('.ext_disabled')->eq(2)->text());
 
 		$this->assertContains('The “vendor/test2” extension is not valid.', $crawler->filter('.ext_disabled')->eq(0)->text());
 
-		$this->assertContains('The “vendor/test3” extension is not valid.', $crawler->filter('.ext_disabled')->eq(2)->text());
+		$this->assertContains('The “vendor/test3” extension is not valid.', $crawler->filter('.ext_disabled')->eq(1)->text());
 
 		$this->assertContains('phpBB Bar Extension', $crawler->filter('.ext_disabled')->eq(3)->text());
 		$this->assertContainsLang('DETAILS', $crawler->filter('.ext_disabled')->eq(3)->text());
diff --git a/tests/functional/fileupload_form_test.php b/tests/functional/fileupload_form_test.php
index c291712c71..30f6fd7b47 100644
--- a/tests/functional/fileupload_form_test.php
+++ b/tests/functional/fileupload_form_test.php
@@ -76,6 +76,38 @@ class phpbb_functional_fileupload_form_test extends phpbb_functional_test_case
 		$this->assertEquals($this->lang('DISALLOWED_EXTENSION', 'bif'), $crawler->filter('p.error')->text());
 	}
 
+	public function test_disallowed_content()
+	{
+		$this->login();
+
+		$crawler = $this->upload_file('disallowed.jpg', 'image/jpeg');
+		$this->assertEquals($this->lang('DISALLOWED_CONTENT'), $crawler->filter('p.error')->text());
+	}
+
+	public function test_disallowed_content_no_check()
+	{
+		$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();
+
+		$values["config[check_attachment_content]"] = 0;
+		$form->setValues($values);
+		$crawler = self::submit($form);
+
+		// Request index for correct URL
+		$crawler = 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->assertEquals($this->lang('UNABLE_GET_IMAGE_SIZE'), $crawler->filter('p.error')->text());
+	}
+
 	public function test_too_large()
 	{
 		$this->create_user('fileupload');
diff --git a/tests/functional/fixtures/files/disallowed.jpg b/tests/functional/fixtures/files/disallowed.jpg
new file mode 100644
index 0000000000..06a437585a
--- /dev/null
+++ b/tests/functional/fixtures/files/disallowed.jpg
diff --git a/tests/functional/notification_test.php b/tests/functional/notification_test.php
index dd1b8ec981..9ae37842fe 100644
--- a/tests/functional/notification_test.php
+++ b/tests/functional/notification_test.php
@@ -60,7 +60,7 @@ class phpbb_functional_notification_test extends phpbb_functional_test_case
 		$this->add_user_group('NEWLY_REGISTERED', array('notificationtestuser'));
 		$this->login('notificationtestuser');
 		$crawler = self::request('GET', 'index.php');
-		$this->assertContains('notificationtestuser', $crawler->filter('.icon-logout')->text());
+		$this->assertContains('notificationtestuser', $crawler->filter('#username_logged_in')->text());
 
 		// Post a new post that needs approval
 		$this->create_post(2, 1, 'Re: Welcome to phpBB3', 'This is a test [b]post[/b] posted by notificationtestuser.', array(), 'POST_STORED_MOD');