From 1d61fcf3c9cb9a92a6c9124cc15e4fd6d61fff6e Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sun, 13 Apr 2014 20:45:09 +0200
Subject: [ticket/12371] Rename disapprove and softdelete tests

PHPBB3-12371
---
 tests/functional/disapprove_test.php            | 319 ----------
 tests/functional/softdelete_test.php            | 761 ------------------------
 tests/functional/visibility_disapprove_test.php | 319 ++++++++++
 tests/functional/visibility_softdelete_test.php | 761 ++++++++++++++++++++++++
 4 files changed, 1080 insertions(+), 1080 deletions(-)
 delete mode 100644 tests/functional/disapprove_test.php
 delete mode 100644 tests/functional/softdelete_test.php
 create mode 100644 tests/functional/visibility_disapprove_test.php
 create mode 100644 tests/functional/visibility_softdelete_test.php

(limited to 'tests/functional')

diff --git a/tests/functional/disapprove_test.php b/tests/functional/disapprove_test.php
deleted file mode 100644
index ea594b1062..0000000000
--- a/tests/functional/disapprove_test.php
+++ /dev/null
@@ -1,319 +0,0 @@
-<?php
-/**
-*
-* @package testing
-* @copyright (c) 2014 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @group functional
-*/
-class phpbb_functional_disapprove_test extends phpbb_functional_test_case
-{
-	protected $data = array();
-
-	public function test_setup_forums()
-	{
-		$this->login();
-		$this->admin_login();
-
-		$crawler = self::request('GET', "adm/index.php?i=acp_forums&mode=manage&sid={$this->sid}");
-		$form = $crawler->selectButton('addforum')->form(array(
-			'forum_name'	=> 'Disapprove Test #1',
-		));
-		$crawler = self::submit($form);
-		$form = $crawler->selectButton('update')->form(array(
-			'forum_perm_from'	=> 2,
-		));
-		$crawler = self::submit($form);
-
-		// Set flood interval to 0
-		$this->set_flood_interval(0);
-	}
-
-	public function test_create_posts()
-	{
-		$this->login();
-		$this->load_ids(array(
-			'forums' => array(
-				'Disapprove Test #1',
-			),
-		));
-
-		$this->assert_forum_details($this->data['forums']['Disapprove Test #1'], array(
-			'forum_posts_approved'		=> 0,
-			'forum_posts_unapproved'	=> 0,
-			'forum_posts_softdeleted'	=> 0,
-			'forum_topics_approved'		=> 0,
-			'forum_topics_unapproved'	=> 0,
-			'forum_topics_softdeleted'	=> 0,
-			'forum_last_post_id'		=> 0,
-		), 'initial comparison');
-
-		// Test creating topic #1
-		$post = $this->create_topic($this->data['forums']['Disapprove Test #1'], 'Disapprove Test Topic #1', 'This is a test topic posted by the testing framework.');
-		$crawler = self::request('GET', "viewtopic.php?t={$post['topic_id']}&sid={$this->sid}");
-
-		$this->assertContains('Disapprove Test Topic #1', $crawler->filter('html')->text());
-		$this->data['topics']['Disapprove Test Topic #1'] = (int) $post['topic_id'];
-		$this->data['posts']['Disapprove Test Topic #1'] = (int) $this->get_parameter_from_link($crawler->filter('.post')->selectLink($this->lang('POST', '', ''))->link()->getUri(), 'p');
-
-		$this->assert_forum_details($this->data['forums']['Disapprove Test #1'], array(
-			'forum_posts_approved'		=> 1,
-			'forum_posts_unapproved'	=> 0,
-			'forum_posts_softdeleted'	=> 0,
-			'forum_topics_approved'		=> 1,
-			'forum_topics_unapproved'	=> 0,
-			'forum_topics_softdeleted'	=> 0,
-			'forum_last_post_id'		=> $this->data['posts']['Disapprove Test Topic #1'],
-		), 'after creating topic #1');
-
-		$this->logout();
-		$this->create_user('disapprove_testuser');
-		$this->add_user_group('NEWLY_REGISTERED', array('disapprove_testuser'));
-		$this->login('disapprove_testuser');
-
-		// Test creating a reply
-		$post2 = $this->create_post($this->data['forums']['Disapprove Test #1'], $post['topic_id'], 'Re: Disapprove Test Topic #1-#2', 'This is a test post posted by the testing framework.', array(), 'POST_STORED_MOD');
-
-		$crawler = self::request('GET', "viewtopic.php?t={$this->data['topics']['Disapprove Test Topic #1']}&sid={$this->sid}");
-		$this->assertNotContains('Re: Disapprove Test Topic #1-#2', $crawler->filter('html')->text());
-
-		$this->assert_forum_details($this->data['forums']['Disapprove Test #1'], array(
-			'forum_posts_approved'		=> 1,
-			'forum_posts_unapproved'	=> 1,
-			'forum_posts_softdeleted'	=> 0,
-			'forum_topics_approved'		=> 1,
-			'forum_topics_unapproved'	=> 0,
-			'forum_topics_softdeleted'	=> 0,
-			'forum_last_post_id'		=> $this->data['posts']['Disapprove Test Topic #1'],
-		), 'after replying');
-
-		// Test creating topic #2
-		$post = $this->create_topic($this->data['forums']['Disapprove Test #1'], 'Disapprove Test Topic #2', 'This is a test topic posted by the testing framework.', array(), 'POST_STORED_MOD');
-		$crawler = self::request('GET', "viewforum.php?f={$this->data['forums']['Disapprove Test #1']}&sid={$this->sid}");
-
-		$this->assertNotContains('Disapprove Test Topic #2', $crawler->filter('html')->text());
-
-		$this->assert_forum_details($this->data['forums']['Disapprove Test #1'], array(
-			'forum_posts_approved'		=> 1,
-			'forum_posts_unapproved'	=> 2,
-			'forum_posts_softdeleted'	=> 0,
-			'forum_topics_approved'		=> 1,
-			'forum_topics_unapproved'	=> 1,
-			'forum_topics_softdeleted'	=> 0,
-			'forum_last_post_id'		=> $this->data['posts']['Disapprove Test Topic #1'],
-		), 'after creating topic #2');
-
-		$this->logout();
-	}
-
-	public function test_reset_flood_interval()
-	{
-		$this->login();
-		$this->admin_login();
-
-		// Set flood interval back to 15
-		$this->set_flood_interval(15);
-	}
-
-	public function test_disapprove_post()
-	{
-		$this->login();
-		$this->load_ids(array(
-			'forums' => array(
-				'Disapprove Test #1',
-			),
-			'topics' => array(
-				'Disapprove Test Topic #1',
-				'Disapprove Test Topic #2',
-			),
-			'posts' => array(
-				'Disapprove Test Topic #1',
-				'Re: Disapprove Test Topic #1-#2',
-				'Disapprove Test Topic #2',
-			),
-		));
-
-		$this->assert_forum_details($this->data['forums']['Disapprove Test #1'], array(
-			'forum_posts_approved'		=> 1,
-			'forum_posts_unapproved'	=> 2,
-			'forum_posts_softdeleted'	=> 0,
-			'forum_topics_approved'		=> 1,
-			'forum_topics_unapproved'	=> 1,
-			'forum_topics_softdeleted'	=> 0,
-			'forum_last_post_id'		=> $this->data['posts']['Disapprove Test Topic #1'],
-		), 'before disapproving post');
-
-		$this->add_lang('posting');
-		$this->add_lang('viewtopic');
-		$this->add_lang('mcp');
-		$crawler = self::request('GET', "viewtopic.php?t={$this->data['topics']['Disapprove Test Topic #1']}&sid={$this->sid}");
-		$this->assertContains('Disapprove Test Topic #1', $crawler->filter('html')->text());
-		$this->assertContains('Re: Disapprove Test Topic #1-#2', $crawler->filter('html')->text());
-
-		$form = $crawler->selectButton($this->lang('DISAPPROVE'))->form();
-		$crawler = self::submit($form);
-		$form = $crawler->selectButton($this->lang('YES'))->form();
-		$crawler = self::submit($form);
-		$this->assertContainsLang('POST_DISAPPROVED_SUCCESS', $crawler->text());
-
-		$this->assert_forum_details($this->data['forums']['Disapprove Test #1'], array(
-			'forum_posts_approved'		=> 1,
-			'forum_posts_unapproved'	=> 1,
-			'forum_posts_softdeleted'	=> 0,
-			'forum_topics_approved'		=> 1,
-			'forum_topics_unapproved'	=> 1,
-			'forum_topics_softdeleted'	=> 0,
-			'forum_last_post_id'		=> $this->data['posts']['Disapprove Test Topic #1'],
-		), 'after disapproving post');
-
-		$link = $crawler->selectLink($this->lang('RETURN_PAGE', '', ''))->link();
-		$link_url = $link->getUri();
-		$this->assertContains('viewtopic.php?f=' . $this->data['forums']['Disapprove Test #1'] . '&t=' . $this->data['topics']['Disapprove Test Topic #1'], $link_url);
-
-		$crawler = self::request('GET', "viewtopic.php?t={$this->data['topics']['Disapprove Test Topic #1']}&sid={$this->sid}");
-		$this->assertContains('Disapprove Test Topic #1', $crawler->filter('html')->text());
-		$this->assertNotContains('Re: Disapprove Test Topic #1-#2', $crawler->filter('html')->text());
-	}
-
-	public function test_disapprove_topic()
-	{
-		$this->login();
-		$this->load_ids(array(
-			'forums' => array(
-				'Disapprove Test #1',
-			),
-			'topics' => array(
-				'Disapprove Test Topic #1',
-				'Disapprove Test Topic #2',
-			),
-			'posts' => array(
-				'Disapprove Test Topic #1',
-				'Disapprove Test Topic #2',
-			),
-		));
-
-		$this->assert_forum_details($this->data['forums']['Disapprove Test #1'], array(
-			'forum_posts_approved'		=> 1,
-			'forum_posts_unapproved'	=> 1,
-			'forum_posts_softdeleted'	=> 0,
-			'forum_topics_approved'		=> 1,
-			'forum_topics_unapproved'	=> 1,
-			'forum_topics_softdeleted'	=> 0,
-			'forum_last_post_id'		=> $this->data['posts']['Disapprove Test Topic #1'],
-		), 'before disapproving topic');
-
-		$this->add_lang('posting');
-		$this->add_lang('viewtopic');
-		$this->add_lang('mcp');
-		$crawler = self::request('GET', "viewtopic.php?t={$this->data['topics']['Disapprove Test Topic #2']}&sid={$this->sid}");
-		$this->assertContains('Disapprove Test Topic #2', $crawler->filter('html')->text());
-
-		$form = $crawler->selectButton($this->lang('DISAPPROVE'))->form();
-		$crawler = self::submit($form);
-		$form = $crawler->selectButton($this->lang('YES'))->form();
-		$crawler = self::submit($form);
-		$this->assertContainsLang('TOPIC_DISAPPROVED_SUCCESS', $crawler->text());
-
-		$this->assert_forum_details($this->data['forums']['Disapprove Test #1'], array(
-			'forum_posts_approved'		=> 1,
-			'forum_posts_unapproved'	=> 0,
-			'forum_posts_softdeleted'	=> 0,
-			'forum_topics_approved'		=> 1,
-			'forum_topics_unapproved'	=> 0,
-			'forum_topics_softdeleted'	=> 0,
-			'forum_last_post_id'		=> $this->data['posts']['Disapprove Test Topic #1'],
-		), 'after disapproving topic');
-
-		$link = $crawler->selectLink($this->lang('RETURN_PAGE', '', ''))->link();
-		$link_url = $link->getUri();
-		$this->assertContains('viewforum.php?f=' . $this->data['forums']['Disapprove Test #1'], $link_url);
-
-		$crawler = self::request('GET', "viewtopic.php?t={$this->data['topics']['Disapprove Test Topic #2']}&sid={$this->sid}", array(), false);
-		self::assert_response_html(404);
-		$this->assertNotContains('Disapprove Test Topic #2', $crawler->filter('html')->text());
-	}
-
-	protected function assert_forum_details($forum_id, $details, $additional_error_message = '')
-	{
-		$this->db = $this->get_db();
-
-		$sql = 'SELECT ' . implode(', ', array_keys($details)) . '
-			FROM phpbb_forums
-			WHERE forum_id = ' . (int) $forum_id;
-		$result = $this->db->sql_query($sql);
-		$data = $this->db->sql_fetchrow($result);
-		$this->db->sql_freeresult($result);
-
-		$this->assertEquals($details, $data, "Forum {$forum_id} does not match expected {$additional_error_message}");
-	}
-
-	protected function set_flood_interval($flood_interval)
-	{
-		$crawler = self::request('GET', 'adm/index.php?sid=' . $this->sid . '&i=acp_board&mode=post');
-
-		$form = $crawler->selectButton('Submit')->form();
-		$values = $form->getValues();
-
-		$values["config[flood_interval]"] = $flood_interval;
-		$form->setValues($values);
-		$crawler = self::submit($form);
-		$this->assertGreaterThan(0, $crawler->filter('.successbox')->count());
-	}
-
-	protected function load_ids($data)
-	{
-		$this->db = $this->get_db();
-
-		if (!empty($data['forums']))
-		{
-			$sql = 'SELECT *
-				FROM phpbb_forums
-				WHERE ' . $this->db->sql_in_set('forum_name', $data['forums']);
-			$result = $this->db->sql_query($sql);
-			while ($row = $this->db->sql_fetchrow($result))
-			{
-				if (in_array($row['forum_name'], $data['forums']))
-				{
-					$this->data['forums'][$row['forum_name']] = (int) $row['forum_id'];
-				}
-			}
-			$this->db->sql_freeresult($result);
-		}
-
-		if (!empty($data['topics']))
-		{
-			$sql = 'SELECT *
-				FROM phpbb_topics
-				WHERE ' . $this->db->sql_in_set('topic_title', $data['topics']);
-			$result = $this->db->sql_query($sql);
-			while ($row = $this->db->sql_fetchrow($result))
-			{
-				if (in_array($row['topic_title'], $data['topics']))
-				{
-					$this->data['topics'][$row['topic_title']] = (int) $row['topic_id'];
-				}
-			}
-			$this->db->sql_freeresult($result);
-		}
-
-		if (!empty($data['posts']))
-		{
-			$sql = 'SELECT *
-				FROM phpbb_posts
-				WHERE ' . $this->db->sql_in_set('post_subject', $data['posts']);
-			$result = $this->db->sql_query($sql);
-			while ($row = $this->db->sql_fetchrow($result))
-			{
-				if (in_array($row['post_subject'], $data['posts']))
-				{
-					$this->data['posts'][$row['post_subject']] = (int) $row['post_id'];
-				}
-			}
-			$this->db->sql_freeresult($result);
-		}
-	}
-}
diff --git a/tests/functional/softdelete_test.php b/tests/functional/softdelete_test.php
deleted file mode 100644
index 1c86d00b9b..0000000000
--- a/tests/functional/softdelete_test.php
+++ /dev/null
@@ -1,761 +0,0 @@
-<?php
-/**
-*
-* @package testing
-* @copyright (c) 2013 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-/**
-* @group functional
-*/
-class phpbb_functional_softdelete_test extends phpbb_functional_test_case
-{
-	protected $data = array();
-
-	public function test_setup_forums()
-	{
-		$this->login();
-		$this->admin_login();
-
-		$crawler = self::request('GET', "adm/index.php?i=acp_forums&mode=manage&sid={$this->sid}");
-		$form = $crawler->selectButton('addforum')->form(array(
-			'forum_name'	=> 'Soft Delete #1',
-		));
-		$crawler = self::submit($form);
-		$form = $crawler->selectButton('update')->form(array(
-			'forum_perm_from'	=> 2,
-		));
-		$crawler = self::submit($form);
-
-		$crawler = self::request('GET', "adm/index.php?i=acp_forums&mode=manage&sid={$this->sid}");
-		$form = $crawler->selectButton('addforum')->form(array(
-			'forum_name'	=> 'Soft Delete #2',
-		));
-		$crawler = self::submit($form);
-		$form = $crawler->selectButton('update')->form(array(
-			'forum_perm_from'	=> 2,
-		));
-		$crawler = self::submit($form);
-	}
-
-	public function test_create_post()
-	{
-		$this->login();
-		$this->load_ids(array(
-			'forums' => array(
-				'Soft Delete #1',
-				'Soft Delete #2',
-			),
-		));
-
-		$this->assert_forum_details($this->data['forums']['Soft Delete #1'], array(
-			'forum_posts_approved'		=> 0,
-			'forum_posts_unapproved'	=> 0,
-			'forum_posts_softdeleted'	=> 0,
-			'forum_topics_approved'		=> 0,
-			'forum_topics_unapproved'	=> 0,
-			'forum_topics_softdeleted'	=> 0,
-			'forum_last_post_id'		=> 0,
-		), 'initial comparison');
-
-		// Test creating topic
-		$post = $this->create_topic($this->data['forums']['Soft Delete #1'], 'Soft Delete Topic #1', 'This is a test topic posted by the testing framework.');
-		$crawler = self::request('GET', "viewtopic.php?t={$post['topic_id']}&sid={$this->sid}");
-
-		$this->assertContains('Soft Delete Topic #1', $crawler->filter('html')->text());
-		$this->data['topics']['Soft Delete Topic #1'] = (int) $post['topic_id'];
-		$this->data['posts']['Soft Delete Topic #1'] = (int) $this->get_parameter_from_link($crawler->filter('.post')->selectLink($this->lang('POST', '', ''))->link()->getUri(), 'p');
-
-		$this->assert_forum_details($this->data['forums']['Soft Delete #1'], array(
-			'forum_posts_approved'		=> 1,
-			'forum_posts_unapproved'	=> 0,
-			'forum_posts_softdeleted'	=> 0,
-			'forum_topics_approved'		=> 1,
-			'forum_topics_unapproved'	=> 0,
-			'forum_topics_softdeleted'	=> 0,
-			'forum_last_post_id'		=> $this->data['posts']['Soft Delete Topic #1'],
-		), 'after creating topic #1');
-
-		// Test creating a reply
-		$post2 = $this->create_post($this->data['forums']['Soft Delete #1'], $post['topic_id'], 'Re: Soft Delete Topic #1-#2', 'This is a test post posted by the testing framework.');
-		$crawler = self::request('GET', "viewtopic.php?t={$post2['topic_id']}&sid={$this->sid}");
-
-		$this->assertContains('Re: Soft Delete Topic #1-#2', $crawler->filter('html')->text());
-		$this->data['posts']['Re: Soft Delete Topic #1-#2'] = (int) $post2['post_id'];
-
-		$this->assert_forum_details($this->data['forums']['Soft Delete #1'], array(
-			'forum_posts_approved'		=> 2,
-			'forum_posts_unapproved'	=> 0,
-			'forum_posts_softdeleted'	=> 0,
-			'forum_topics_approved'		=> 1,
-			'forum_topics_unapproved'	=> 0,
-			'forum_topics_softdeleted'	=> 0,
-			'forum_last_post_id'		=> $this->data['posts']['Re: Soft Delete Topic #1-#2'],
-		), 'after replying');
-	}
-
-	public function test_softdelete_post()
-	{
-		$this->login();
-		$this->load_ids(array(
-			'forums' => array(
-				'Soft Delete #1',
-				'Soft Delete #2',
-			),
-			'topics' => array(
-				'Soft Delete Topic #1',
-			),
-			'posts' => array(
-				'Soft Delete Topic #1',
-				'Re: Soft Delete Topic #1-#2',
-			),
-		));
-
-		$this->assert_forum_details($this->data['forums']['Soft Delete #1'], array(
-			'forum_posts_approved'		=> 2,
-			'forum_posts_unapproved'	=> 0,
-			'forum_posts_softdeleted'	=> 0,
-			'forum_topics_approved'		=> 1,
-			'forum_topics_unapproved'	=> 0,
-			'forum_topics_softdeleted'	=> 0,
-			'forum_last_post_id'		=> $this->data['posts']['Re: Soft Delete Topic #1-#2'],
-		), 'before softdelete');
-
-		$this->add_lang('posting');
-		$crawler = self::request('GET', "posting.php?mode=delete&f={$this->data['forums']['Soft Delete #1']}&p={$this->data['posts']['Re: Soft Delete Topic #1-#2']}&sid={$this->sid}");
-		$this->assertContainsLang('DELETE_PERMANENTLY', $crawler->text());
-
-		$form = $crawler->selectButton('Yes')->form();
-		$crawler = self::submit($form);
-		$this->assertContainsLang('POST_DELETED', $crawler->text());
-
-		$this->assert_forum_details($this->data['forums']['Soft Delete #1'], array(
-			'forum_posts_approved'		=> 1,
-			'forum_posts_unapproved'	=> 0,
-			'forum_posts_softdeleted'	=> 1,
-			'forum_topics_approved'		=> 1,
-			'forum_topics_unapproved'	=> 0,
-			'forum_topics_softdeleted'	=> 0,
-			'forum_last_post_id'		=> $this->data['posts']['Soft Delete Topic #1'],
-		), 'after softdelete');
-
-		$crawler = self::request('GET', "viewtopic.php?t={$this->data['topics']['Soft Delete Topic #1']}&sid={$this->sid}");
-		$this->assertContains($this->lang('POST_DISPLAY', '', ''), $crawler->text());
-	}
-
-	public function test_move_softdeleted_post()
-	{
-		$this->login();
-		$this->load_ids(array(
-			'forums' => array(
-				'Soft Delete #1',
-				'Soft Delete #2',
-			),
-			'topics' => array(
-				'Soft Delete Topic #1',
-			),
-			'posts' => array(
-				'Soft Delete Topic #1',
-				'Re: Soft Delete Topic #1-#2',
-			),
-		));
-
-		$this->assert_forum_details($this->data['forums']['Soft Delete #1'], array(
-			'forum_posts_approved'		=> 1,
-			'forum_posts_unapproved'	=> 0,
-			'forum_posts_softdeleted'	=> 1,
-			'forum_topics_approved'		=> 1,
-			'forum_topics_unapproved'	=> 0,
-			'forum_topics_softdeleted'	=> 0,
-			'forum_last_post_id'		=> $this->data['posts']['Soft Delete Topic #1'],
-		), 'before moving #1');
-
-		$this->assert_forum_details($this->data['forums']['Soft Delete #2'], array(
-			'forum_posts_approved'		=> 0,
-			'forum_posts_unapproved'	=> 0,
-			'forum_posts_softdeleted'	=> 0,
-			'forum_topics_approved'		=> 0,
-			'forum_topics_unapproved'	=> 0,
-			'forum_topics_softdeleted'	=> 0,
-			'forum_last_post_id'		=> 0,
-		), 'before moving #2');
-
-		$crawler = self::request('GET', "viewtopic.php?t={$this->data['topics']['Soft Delete Topic #1']}&sid={$this->sid}");
-
-		$form = $crawler->selectButton('Go')->eq(2)->form();
-		$form['action']->select('move');
-		$crawler = self::submit($form);
-		$this->assertContainsLang('SELECT_DESTINATION_FORUM', $crawler->text());
-
-		$this->add_lang('mcp');
-		$form = $crawler->selectButton('Yes')->form();
-		$form['to_forum_id']->select($this->data['forums']['Soft Delete #2']);
-		$crawler = self::submit($form);
-		$this->assertContainsLang('TOPIC_MOVED_SUCCESS', $crawler->text());
-
-		$crawler = self::request('GET', "viewtopic.php?t={$this->data['topics']['Soft Delete Topic #1']}&sid={$this->sid}");
-		$this->assertContains('Soft Delete #2', $crawler->filter('.navlinks')->text());
-		$this->assertContains('Soft Delete Topic #1', $crawler->filter('h2')->text());
-
-		$this->assert_forum_details($this->data['forums']['Soft Delete #1'], array(
-			'forum_posts_approved'		=> 0,
-			'forum_posts_unapproved'	=> 0,
-			'forum_posts_softdeleted'	=> 0,
-			'forum_topics_approved'		=> 0,
-			'forum_topics_unapproved'	=> 0,
-			'forum_topics_softdeleted'	=> 0,
-			'forum_last_post_id'		=> 0,
-		), 'after moving #1');
-
-		$this->assert_forum_details($this->data['forums']['Soft Delete #2'], array(
-			'forum_posts_approved'		=> 1,
-			'forum_posts_unapproved'	=> 0,
-			'forum_posts_softdeleted'	=> 1,
-			'forum_topics_approved'		=> 1,
-			'forum_topics_unapproved'	=> 0,
-			'forum_topics_softdeleted'	=> 0,
-			'forum_last_post_id'		=> $this->data['posts']['Soft Delete Topic #1'],
-		), 'after moving #2');
-	}
-
-	public function test_softdelete_topic()
-	{
-		$this->login();
-		$this->load_ids(array(
-			'forums' => array(
-				'Soft Delete #1',
-				'Soft Delete #2',
-			),
-			'topics' => array(
-				'Soft Delete Topic #1',
-			),
-			'posts' => array(
-				'Soft Delete Topic #1',
-				'Re: Soft Delete Topic #1-#2',
-			),
-		));
-
-		$this->assert_forum_details($this->data['forums']['Soft Delete #1'], array(
-			'forum_posts_approved'		=> 0,
-			'forum_posts_unapproved'	=> 0,
-			'forum_posts_softdeleted'	=> 0,
-			'forum_topics_approved'		=> 0,
-			'forum_topics_unapproved'	=> 0,
-			'forum_topics_softdeleted'	=> 0,
-			'forum_last_post_id'		=> 0,
-		), 'before softdeleting #1');
-
-		$this->assert_forum_details($this->data['forums']['Soft Delete #2'], array(
-			'forum_posts_approved'		=> 1,
-			'forum_posts_unapproved'	=> 0,
-			'forum_posts_softdeleted'	=> 1,
-			'forum_topics_approved'		=> 1,
-			'forum_topics_unapproved'	=> 0,
-			'forum_topics_softdeleted'	=> 0,
-			'forum_last_post_id'		=> $this->data['posts']['Soft Delete Topic #1'],
-		), 'before softdeleting #2');
-
-		$crawler = self::request('GET', "viewtopic.php?t={$this->data['topics']['Soft Delete Topic #1']}&sid={$this->sid}");
-
-		$this->add_lang('posting');
-		$form = $crawler->selectButton('Go')->eq(2)->form();
-		$form['action']->select('delete_topic');
-		$crawler = self::submit($form);
-		$this->assertContainsLang('DELETE_PERMANENTLY', $crawler->text());
-
-		$this->add_lang('mcp');
-		$form = $crawler->selectButton('Yes')->form();
-		$crawler = self::submit($form);
-		$this->assertContainsLang('TOPIC_DELETED_SUCCESS', $crawler->text());
-
-		$crawler = self::request('GET', "viewtopic.php?t={$this->data['topics']['Soft Delete Topic #1']}&sid={$this->sid}");
-		$this->assertContains('Soft Delete #2', $crawler->filter('.navlinks')->text());
-		$this->assertContains('Soft Delete Topic #1', $crawler->filter('h2')->text());
-
-		$this->assert_forum_details($this->data['forums']['Soft Delete #1'], array(
-			'forum_posts_approved'		=> 0,
-			'forum_posts_unapproved'	=> 0,
-			'forum_posts_softdeleted'	=> 0,
-			'forum_topics_approved'		=> 0,
-			'forum_topics_unapproved'	=> 0,
-			'forum_topics_softdeleted'	=> 0,
-			'forum_last_post_id'		=> 0,
-		), 'after moving #1');
-
-		$this->assert_forum_details($this->data['forums']['Soft Delete #2'], array(
-			'forum_posts_approved'		=> 0,
-			'forum_posts_unapproved'	=> 0,
-			'forum_posts_softdeleted'	=> 2,
-			'forum_topics_approved'		=> 0,
-			'forum_topics_unapproved'	=> 0,
-			'forum_topics_softdeleted'	=> 1,
-			'forum_last_post_id'		=> 0,
-		), 'after moving #2');
-	}
-
-	public function test_move_softdeleted_topic()
-	{
-		$this->login();
-		$this->load_ids(array(
-			'forums' => array(
-				'Soft Delete #1',
-				'Soft Delete #2',
-			),
-			'topics' => array(
-				'Soft Delete Topic #1',
-			),
-			'posts' => array(
-				'Soft Delete Topic #1',
-				'Re: Soft Delete Topic #1-#2',
-			),
-		));
-
-		$this->assert_forum_details($this->data['forums']['Soft Delete #1'], array(
-			'forum_posts_approved'		=> 0,
-			'forum_posts_unapproved'	=> 0,
-			'forum_posts_softdeleted'	=> 0,
-			'forum_topics_approved'		=> 0,
-			'forum_topics_unapproved'	=> 0,
-			'forum_topics_softdeleted'	=> 0,
-			'forum_last_post_id'		=> 0,
-		), 'before moving #1');
-
-		$this->assert_forum_details($this->data['forums']['Soft Delete #2'], array(
-			'forum_posts_approved'		=> 0,
-			'forum_posts_unapproved'	=> 0,
-			'forum_posts_softdeleted'	=> 2,
-			'forum_topics_approved'		=> 0,
-			'forum_topics_unapproved'	=> 0,
-			'forum_topics_softdeleted'	=> 1,
-			'forum_last_post_id'		=> 0,
-		), 'before moving #2');
-
-		$crawler = self::request('GET', "viewtopic.php?t={$this->data['topics']['Soft Delete Topic #1']}&sid={$this->sid}");
-
-		$form = $crawler->selectButton('Go')->eq(2)->form();
-		$form['action']->select('move');
-		$crawler = self::submit($form);
-		$this->assertContainsLang('SELECT_DESTINATION_FORUM', $crawler->text());
-
-		$this->add_lang('mcp');
-		$form = $crawler->selectButton('Yes')->form();
-		$form['to_forum_id']->select($this->data['forums']['Soft Delete #1']);
-		$crawler = self::submit($form);
-		$this->assertContainsLang('TOPIC_MOVED_SUCCESS', $crawler->text());
-
-		$crawler = self::request('GET', "viewtopic.php?t={$this->data['topics']['Soft Delete Topic #1']}&sid={$this->sid}");
-		$this->assertContains('Soft Delete #1', $crawler->filter('.navlinks')->text());
-		$this->assertContains('Soft Delete Topic #1', $crawler->filter('h2')->text());
-
-		$this->assert_forum_details($this->data['forums']['Soft Delete #1'], array(
-			'forum_posts_approved'		=> 0,
-			'forum_posts_unapproved'	=> 0,
-			'forum_posts_softdeleted'	=> 2,
-			'forum_topics_approved'		=> 0,
-			'forum_topics_unapproved'	=> 0,
-			'forum_topics_softdeleted'	=> 1,
-			'forum_last_post_id'		=> 0,
-		), 'after moving #1');
-
-		$this->assert_forum_details($this->data['forums']['Soft Delete #2'], array(
-			'forum_posts_approved'		=> 0,
-			'forum_posts_unapproved'	=> 0,
-			'forum_posts_softdeleted'	=> 0,
-			'forum_topics_approved'		=> 0,
-			'forum_topics_unapproved'	=> 0,
-			'forum_topics_softdeleted'	=> 0,
-			'forum_last_post_id'		=> 0,
-		), 'after moving #2');
-	}
-
-	public function test_restore_post()
-	{
-		$this->login();
-		$this->load_ids(array(
-			'forums' => array(
-				'Soft Delete #1',
-				'Soft Delete #2',
-			),
-			'topics' => array(
-				'Soft Delete Topic #1',
-			),
-			'posts' => array(
-				'Soft Delete Topic #1',
-				'Re: Soft Delete Topic #1-#2',
-			),
-		));
-
-		$this->assert_forum_details($this->data['forums']['Soft Delete #1'], array(
-			'forum_posts_approved'		=> 0,
-			'forum_posts_unapproved'	=> 0,
-			'forum_posts_softdeleted'	=> 2,
-			'forum_topics_approved'		=> 0,
-			'forum_topics_unapproved'	=> 0,
-			'forum_topics_softdeleted'	=> 1,
-			'forum_last_post_id'		=> 0,
-		), 'before restoring #1');
-
-		$this->assert_forum_details($this->data['forums']['Soft Delete #2'], array(
-			'forum_posts_approved'		=> 0,
-			'forum_posts_unapproved'	=> 0,
-			'forum_posts_softdeleted'	=> 0,
-			'forum_topics_approved'		=> 0,
-			'forum_topics_unapproved'	=> 0,
-			'forum_topics_softdeleted'	=> 0,
-			'forum_last_post_id'		=> 0,
-		), 'before restoring #2');
-
-		$crawler = self::request('GET', "viewtopic.php?t={$this->data['topics']['Soft Delete Topic #1']}&sid={$this->sid}");
-
-		$this->add_lang('mcp');
-		$form = $crawler->filter('#p' . $this->data['posts']['Soft Delete Topic #1'])->selectButton($this->lang('RESTORE'))->form();
-		$crawler = self::submit($form);
-		$this->assertContainsLang('RESTORE_POST', $crawler->text());
-
-		$form = $crawler->selectButton('Yes')->form();
-		$crawler = self::submit($form);
-		$this->assertContainsLang('POST_RESTORED_SUCCESS', $crawler->text());
-
-		$crawler = self::request('GET', "viewtopic.php?t={$this->data['topics']['Soft Delete Topic #1']}&sid={$this->sid}");
-		$this->assertContains('Soft Delete #1', $crawler->filter('.navlinks')->text());
-		$this->assertContains('Soft Delete Topic #1', $crawler->filter('h2')->text());
-
-		$this->assert_forum_details($this->data['forums']['Soft Delete #1'], array(
-			'forum_posts_approved'		=> 1,
-			'forum_posts_unapproved'	=> 0,
-			'forum_posts_softdeleted'	=> 1,
-			'forum_topics_approved'		=> 1,
-			'forum_topics_unapproved'	=> 0,
-			'forum_topics_softdeleted'	=> 0,
-			'forum_last_post_id'		=> $this->data['posts']['Soft Delete Topic #1'],
-		), 'after restoring #1');
-
-		$this->assert_forum_details($this->data['forums']['Soft Delete #2'], array(
-			'forum_posts_approved'		=> 0,
-			'forum_posts_unapproved'	=> 0,
-			'forum_posts_softdeleted'	=> 0,
-			'forum_topics_approved'		=> 0,
-			'forum_topics_unapproved'	=> 0,
-			'forum_topics_softdeleted'	=> 0,
-			'forum_last_post_id'		=> 0,
-		), 'after restoring #2');
-	}
-
-	public function test_split_topic()
-	{
-		$this->login();
-		$this->load_ids(array(
-			'forums' => array(
-				'Soft Delete #1',
-				'Soft Delete #2',
-			),
-			'topics' => array(
-				'Soft Delete Topic #1',
-			),
-			'posts' => array(
-				'Soft Delete Topic #1',
-				'Re: Soft Delete Topic #1-#2',
-			),
-		));
-
-		$this->assert_forum_details($this->data['forums']['Soft Delete #1'], array(
-			'forum_posts_approved'		=> 1,
-			'forum_posts_unapproved'	=> 0,
-			'forum_posts_softdeleted'	=> 1,
-			'forum_topics_approved'		=> 1,
-			'forum_topics_unapproved'	=> 0,
-			'forum_topics_softdeleted'	=> 0,
-			'forum_last_post_id'		=> $this->data['posts']['Soft Delete Topic #1'],
-		), 'before splitting #1');
-
-		$this->assert_forum_details($this->data['forums']['Soft Delete #2'], array(
-			'forum_posts_approved'		=> 0,
-			'forum_posts_unapproved'	=> 0,
-			'forum_posts_softdeleted'	=> 0,
-			'forum_topics_approved'		=> 0,
-			'forum_topics_unapproved'	=> 0,
-			'forum_topics_softdeleted'	=> 0,
-			'forum_last_post_id'		=> 0,
-		), 'before splitting #2');
-
-		$crawler = self::request('GET', "viewtopic.php?t={$this->data['topics']['Soft Delete Topic #1']}&sid={$this->sid}");
-
-		$this->add_lang('mcp');
-		$form = $crawler->selectButton('Go')->eq(2)->form();
-		$form['action']->select('split');
-		$crawler = self::submit($form);
-		$this->assertContainsLang('SPLIT_TOPIC_EXPLAIN', $crawler->text());
-
-		$form = $crawler->selectButton('Submit')->form(array(
-			'subject'			=> 'Soft Delete Topic #2',
-		));
-		$form['to_forum_id']->select($this->data['forums']['Soft Delete #2']);
-		$form['post_id_list'][1]->tick();
-		$crawler = self::submit($form);
-
-		$form = $crawler->selectButton('Yes')->form();
-		$crawler = self::submit($form);
-		$this->assertContainsLang('TOPIC_SPLIT_SUCCESS', $crawler->text());
-
-		$crawler = self::request('GET', "viewtopic.php?t={$this->data['topics']['Soft Delete Topic #1']}&sid={$this->sid}");
-		$this->assertContains('Soft Delete Topic #1', $crawler->filter('h2')->text());
-		$this->assertNotContains('Re: Soft Delete Topic #1-#2', $crawler->text());
-
-		$this->assert_forum_details($this->data['forums']['Soft Delete #1'], array(
-			'forum_posts_approved'		=> 1,
-			'forum_posts_unapproved'	=> 0,
-			'forum_posts_softdeleted'	=> 0,
-			'forum_topics_approved'		=> 1,
-			'forum_topics_unapproved'	=> 0,
-			'forum_topics_softdeleted'	=> 0,
-			'forum_last_post_id'		=> $this->data['posts']['Soft Delete Topic #1'],
-		), 'after restoring #1');
-
-		$this->assert_forum_details($this->data['forums']['Soft Delete #2'], array(
-			'forum_posts_approved'		=> 0,
-			'forum_posts_unapproved'	=> 0,
-			'forum_posts_softdeleted'	=> 1,
-			'forum_topics_approved'		=> 0,
-			'forum_topics_unapproved'	=> 0,
-			'forum_topics_softdeleted'	=> 1,
-			'forum_last_post_id'		=> 0,
-		), 'after restoring #2');
-	}
-
-	public function test_move_topic_back()
-	{
-		$this->login();
-		$this->load_ids(array(
-			'forums' => array(
-				'Soft Delete #1',
-				'Soft Delete #2',
-			),
-			'topics' => array(
-				'Soft Delete Topic #1',
-				'Soft Delete Topic #2',
-			),
-			'posts' => array(
-				'Soft Delete Topic #1',
-				'Re: Soft Delete Topic #1-#2',
-			),
-		));
-
-		$crawler = self::request('GET', "viewtopic.php?t={$this->data['topics']['Soft Delete Topic #2']}&sid={$this->sid}");
-
-		$form = $crawler->selectButton('Go')->eq(1)->form();
-		$form['action']->select('move');
-		$crawler = self::submit($form);
-
-		$form = $crawler->selectButton('Yes')->form();
-		$form['to_forum_id']->select($this->data['forums']['Soft Delete #1']);
-		$crawler = self::submit($form);
-
-		$this->assert_forum_details($this->data['forums']['Soft Delete #1'], array(
-			'forum_posts_approved'		=> 1,
-			'forum_posts_unapproved'	=> 0,
-			'forum_posts_softdeleted'	=> 1,
-			'forum_topics_approved'		=> 1,
-			'forum_topics_unapproved'	=> 0,
-			'forum_topics_softdeleted'	=> 1,
-			'forum_last_post_id'		=> $this->data['posts']['Soft Delete Topic #1'],
-		), 'after moving back');
-	}
-
-	public function test_merge_topics()
-	{
-		$this->login();
-		$this->load_ids(array(
-			'forums' => array(
-				'Soft Delete #1',
-				'Soft Delete #2',
-			),
-			'topics' => array(
-				'Soft Delete Topic #1',
-				'Soft Delete Topic #2',
-			),
-			'posts' => array(
-				'Soft Delete Topic #1',
-				'Re: Soft Delete Topic #1-#2',
-			),
-		));
-
-		$this->assert_forum_details($this->data['forums']['Soft Delete #1'], array(
-			'forum_posts_approved'		=> 1,
-			'forum_posts_unapproved'	=> 0,
-			'forum_posts_softdeleted'	=> 1,
-			'forum_topics_approved'		=> 1,
-			'forum_topics_unapproved'	=> 0,
-			'forum_topics_softdeleted'	=> 1,
-			'forum_last_post_id'		=> $this->data['posts']['Soft Delete Topic #1'],
-		), 'before merging #1');
-
-		$crawler = self::request('GET', "viewtopic.php?t={$this->data['topics']['Soft Delete Topic #2']}&sid={$this->sid}");
-
-		$this->add_lang('mcp');
-		$form = $crawler->selectButton('Go')->eq(1)->form();
-		$form['action']->select('merge_topic');
-		$crawler = self::submit($form);
-		$this->assertContainsLang('SELECT_MERGE', $crawler->text());
-
-		$crawler = self::request('GET', "mcp.php?f={$this->data['forums']['Soft Delete #1']}&t={$this->data['topics']['Soft Delete Topic #2']}&i=main&mode=forum_view&action=merge_topic&to_topic_id={$this->data['topics']['Soft Delete Topic #1']}");
-		$this->assertContainsLang('MERGE_TOPICS_CONFIRM', $crawler->text());
-
-		$form = $crawler->selectButton('Yes')->form();
-		$crawler = self::submit($form);
-		$this->assertContainsLang('POSTS_MERGED_SUCCESS', $crawler->text());
-
-		$crawler = self::request('GET', "viewtopic.php?t={$this->data['topics']['Soft Delete Topic #1']}&sid={$this->sid}");
-		$this->assertContains('Soft Delete Topic #1', $crawler->filter('h2')->text());
-		$this->assertContainsLang('POST_DELETED', $crawler->filter('body')->text());
-
-		$this->assert_forum_details($this->data['forums']['Soft Delete #1'], array(
-			'forum_posts_approved'		=> 1,
-			'forum_posts_unapproved'	=> 0,
-			'forum_posts_softdeleted'	=> 1,
-			'forum_topics_approved'		=> 1,
-			'forum_topics_unapproved'	=> 0,
-			'forum_topics_softdeleted'	=> 0,
-			'forum_last_post_id'		=> $this->data['posts']['Soft Delete Topic #1'],
-		), 'after merging #1');
-	}
-
-	public function test_fork_topic()
-	{
-		$this->login();
-		$this->load_ids(array(
-			'forums' => array(
-				'Soft Delete #1',
-				'Soft Delete #2',
-			),
-			'topics' => array(
-				'Soft Delete Topic #1',
-			),
-			'posts' => array(
-				'Soft Delete Topic #1',
-				'Re: Soft Delete Topic #1-#2',
-			),
-		));
-
-		$this->assert_forum_details($this->data['forums']['Soft Delete #1'], array(
-			'forum_posts_approved'		=> 1,
-			'forum_posts_unapproved'	=> 0,
-			'forum_posts_softdeleted'	=> 1,
-			'forum_topics_approved'		=> 1,
-			'forum_topics_unapproved'	=> 0,
-			'forum_topics_softdeleted'	=> 0,
-			'forum_last_post_id'		=> $this->data['posts']['Soft Delete Topic #1'],
-		), 'before forking #1');
-
-		$this->assert_forum_details($this->data['forums']['Soft Delete #2'], array(
-			'forum_posts_approved'		=> 0,
-			'forum_posts_unapproved'	=> 0,
-			'forum_posts_softdeleted'	=> 0,
-			'forum_topics_approved'		=> 0,
-			'forum_topics_unapproved'	=> 0,
-			'forum_topics_softdeleted'	=> 0,
-			'forum_last_post_id'		=> 0,
-		), 'before forking #2');
-
-		$crawler = self::request('GET', "viewtopic.php?t={$this->data['topics']['Soft Delete Topic #1']}&sid={$this->sid}");
-
-		$this->add_lang('mcp');
-		$form = $crawler->selectButton('Go')->eq(2)->form();
-		$form['action']->select('fork');
-		$crawler = self::submit($form);
-		$this->assertContainsLang('FORK_TOPIC', $crawler->text());
-
-		$form = $crawler->selectButton('Yes')->form();
-		$form['to_forum_id']->select($this->data['forums']['Soft Delete #2']);
-		$crawler = self::submit($form);
-		$this->assertContainsLang('TOPIC_FORKED_SUCCESS', $crawler->text());
-
-		$this->assert_forum_details($this->data['forums']['Soft Delete #1'], array(
-			'forum_posts_approved'		=> 1,
-			'forum_posts_unapproved'	=> 0,
-			'forum_posts_softdeleted'	=> 1,
-			'forum_topics_approved'		=> 1,
-			'forum_topics_unapproved'	=> 0,
-			'forum_topics_softdeleted'	=> 0,
-			'forum_last_post_id'		=> $this->data['posts']['Soft Delete Topic #1'],
-		), 'after forking #1');
-
-		$this->assert_forum_details($this->data['forums']['Soft Delete #2'], array(
-			'forum_posts_approved'		=> 1,
-			'forum_posts_unapproved'	=> 0,
-			'forum_posts_softdeleted'	=> 1,
-			'forum_topics_approved'		=> 1,
-			'forum_topics_unapproved'	=> 0,
-			'forum_topics_softdeleted'	=> 0,
-			'forum_last_post_id'		=> $this->data['posts']['Soft Delete Topic #1'] + 2,
-		), 'after forking #2');
-	}
-
-	public function assert_forum_details($forum_id, $details, $additional_error_message = '')
-	{
-		$this->db = $this->get_db();
-
-		$sql = 'SELECT ' . implode(', ', array_keys($details)) . '
-			FROM phpbb_forums
-			WHERE forum_id = ' . (int) $forum_id;
-		$result = $this->db->sql_query($sql);
-		$data = $this->db->sql_fetchrow($result);
-		$this->db->sql_freeresult($result);
-
-		$this->assertEquals($details, $data, "Forum {$forum_id} does not match expected {$additional_error_message}");
-	}
-
-	public function load_ids($data)
-	{
-		$this->db = $this->get_db();
-
-		if (!empty($data['forums']))
-		{
-			$sql = 'SELECT *
-				FROM phpbb_forums
-				WHERE ' . $this->db->sql_in_set('forum_name', $data['forums']);
-			$result = $this->db->sql_query($sql);
-			while ($row = $this->db->sql_fetchrow($result))
-			{
-				if (in_array($row['forum_name'], $data['forums']))
-				{
-					$this->data['forums'][$row['forum_name']] = (int) $row['forum_id'];
-				}
-			}
-			$this->db->sql_freeresult($result);
-		}
-
-		if (!empty($data['topics']))
-		{
-			$sql = 'SELECT *
-				FROM phpbb_topics
-				WHERE ' . $this->db->sql_in_set('topic_title', $data['topics']);
-			$result = $this->db->sql_query($sql);
-			while ($row = $this->db->sql_fetchrow($result))
-			{
-				if (in_array($row['topic_title'], $data['topics']))
-				{
-					$this->data['topics'][$row['topic_title']] = (int) $row['topic_id'];
-				}
-			}
-			$this->db->sql_freeresult($result);
-		}
-
-		if (!empty($data['posts']))
-		{
-			$sql = 'SELECT *
-				FROM phpbb_posts
-				WHERE ' . $this->db->sql_in_set('post_subject', $data['posts']);
-			$result = $this->db->sql_query($sql);
-			while ($row = $this->db->sql_fetchrow($result))
-			{
-				if (in_array($row['post_subject'], $data['posts']))
-				{
-					$this->data['posts'][$row['post_subject']] = (int) $row['post_id'];
-				}
-			}
-			$this->db->sql_freeresult($result);
-		}
-	}
-}
diff --git a/tests/functional/visibility_disapprove_test.php b/tests/functional/visibility_disapprove_test.php
new file mode 100644
index 0000000000..ca6f6f5f37
--- /dev/null
+++ b/tests/functional/visibility_disapprove_test.php
@@ -0,0 +1,319 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2014 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @group functional
+*/
+class phpbb_functional_visibility_disapprove_test extends phpbb_functional_test_case
+{
+	protected $data = array();
+
+	public function test_setup_forums()
+	{
+		$this->login();
+		$this->admin_login();
+
+		$crawler = self::request('GET', "adm/index.php?i=acp_forums&mode=manage&sid={$this->sid}");
+		$form = $crawler->selectButton('addforum')->form(array(
+			'forum_name'	=> 'Disapprove Test #1',
+		));
+		$crawler = self::submit($form);
+		$form = $crawler->selectButton('update')->form(array(
+			'forum_perm_from'	=> 2,
+		));
+		$crawler = self::submit($form);
+
+		// Set flood interval to 0
+		$this->set_flood_interval(0);
+	}
+
+	public function test_create_posts()
+	{
+		$this->login();
+		$this->load_ids(array(
+			'forums' => array(
+				'Disapprove Test #1',
+			),
+		));
+
+		$this->assert_forum_details($this->data['forums']['Disapprove Test #1'], array(
+			'forum_posts_approved'		=> 0,
+			'forum_posts_unapproved'	=> 0,
+			'forum_posts_softdeleted'	=> 0,
+			'forum_topics_approved'		=> 0,
+			'forum_topics_unapproved'	=> 0,
+			'forum_topics_softdeleted'	=> 0,
+			'forum_last_post_id'		=> 0,
+		), 'initial comparison');
+
+		// Test creating topic #1
+		$post = $this->create_topic($this->data['forums']['Disapprove Test #1'], 'Disapprove Test Topic #1', 'This is a test topic posted by the testing framework.');
+		$crawler = self::request('GET', "viewtopic.php?t={$post['topic_id']}&sid={$this->sid}");
+
+		$this->assertContains('Disapprove Test Topic #1', $crawler->filter('html')->text());
+		$this->data['topics']['Disapprove Test Topic #1'] = (int) $post['topic_id'];
+		$this->data['posts']['Disapprove Test Topic #1'] = (int) $this->get_parameter_from_link($crawler->filter('.post')->selectLink($this->lang('POST', '', ''))->link()->getUri(), 'p');
+
+		$this->assert_forum_details($this->data['forums']['Disapprove Test #1'], array(
+			'forum_posts_approved'		=> 1,
+			'forum_posts_unapproved'	=> 0,
+			'forum_posts_softdeleted'	=> 0,
+			'forum_topics_approved'		=> 1,
+			'forum_topics_unapproved'	=> 0,
+			'forum_topics_softdeleted'	=> 0,
+			'forum_last_post_id'		=> $this->data['posts']['Disapprove Test Topic #1'],
+		), 'after creating topic #1');
+
+		$this->logout();
+		$this->create_user('disapprove_testuser');
+		$this->add_user_group('NEWLY_REGISTERED', array('disapprove_testuser'));
+		$this->login('disapprove_testuser');
+
+		// Test creating a reply
+		$post2 = $this->create_post($this->data['forums']['Disapprove Test #1'], $post['topic_id'], 'Re: Disapprove Test Topic #1-#2', 'This is a test post posted by the testing framework.', array(), 'POST_STORED_MOD');
+
+		$crawler = self::request('GET', "viewtopic.php?t={$this->data['topics']['Disapprove Test Topic #1']}&sid={$this->sid}");
+		$this->assertNotContains('Re: Disapprove Test Topic #1-#2', $crawler->filter('html')->text());
+
+		$this->assert_forum_details($this->data['forums']['Disapprove Test #1'], array(
+			'forum_posts_approved'		=> 1,
+			'forum_posts_unapproved'	=> 1,
+			'forum_posts_softdeleted'	=> 0,
+			'forum_topics_approved'		=> 1,
+			'forum_topics_unapproved'	=> 0,
+			'forum_topics_softdeleted'	=> 0,
+			'forum_last_post_id'		=> $this->data['posts']['Disapprove Test Topic #1'],
+		), 'after replying');
+
+		// Test creating topic #2
+		$post = $this->create_topic($this->data['forums']['Disapprove Test #1'], 'Disapprove Test Topic #2', 'This is a test topic posted by the testing framework.', array(), 'POST_STORED_MOD');
+		$crawler = self::request('GET', "viewforum.php?f={$this->data['forums']['Disapprove Test #1']}&sid={$this->sid}");
+
+		$this->assertNotContains('Disapprove Test Topic #2', $crawler->filter('html')->text());
+
+		$this->assert_forum_details($this->data['forums']['Disapprove Test #1'], array(
+			'forum_posts_approved'		=> 1,
+			'forum_posts_unapproved'	=> 2,
+			'forum_posts_softdeleted'	=> 0,
+			'forum_topics_approved'		=> 1,
+			'forum_topics_unapproved'	=> 1,
+			'forum_topics_softdeleted'	=> 0,
+			'forum_last_post_id'		=> $this->data['posts']['Disapprove Test Topic #1'],
+		), 'after creating topic #2');
+
+		$this->logout();
+	}
+
+	public function test_reset_flood_interval()
+	{
+		$this->login();
+		$this->admin_login();
+
+		// Set flood interval back to 15
+		$this->set_flood_interval(15);
+	}
+
+	public function test_disapprove_post()
+	{
+		$this->login();
+		$this->load_ids(array(
+			'forums' => array(
+				'Disapprove Test #1',
+			),
+			'topics' => array(
+				'Disapprove Test Topic #1',
+				'Disapprove Test Topic #2',
+			),
+			'posts' => array(
+				'Disapprove Test Topic #1',
+				'Re: Disapprove Test Topic #1-#2',
+				'Disapprove Test Topic #2',
+			),
+		));
+
+		$this->assert_forum_details($this->data['forums']['Disapprove Test #1'], array(
+			'forum_posts_approved'		=> 1,
+			'forum_posts_unapproved'	=> 2,
+			'forum_posts_softdeleted'	=> 0,
+			'forum_topics_approved'		=> 1,
+			'forum_topics_unapproved'	=> 1,
+			'forum_topics_softdeleted'	=> 0,
+			'forum_last_post_id'		=> $this->data['posts']['Disapprove Test Topic #1'],
+		), 'before disapproving post');
+
+		$this->add_lang('posting');
+		$this->add_lang('viewtopic');
+		$this->add_lang('mcp');
+		$crawler = self::request('GET', "viewtopic.php?t={$this->data['topics']['Disapprove Test Topic #1']}&sid={$this->sid}");
+		$this->assertContains('Disapprove Test Topic #1', $crawler->filter('html')->text());
+		$this->assertContains('Re: Disapprove Test Topic #1-#2', $crawler->filter('html')->text());
+
+		$form = $crawler->selectButton($this->lang('DISAPPROVE'))->form();
+		$crawler = self::submit($form);
+		$form = $crawler->selectButton($this->lang('YES'))->form();
+		$crawler = self::submit($form);
+		$this->assertContainsLang('POST_DISAPPROVED_SUCCESS', $crawler->text());
+
+		$this->assert_forum_details($this->data['forums']['Disapprove Test #1'], array(
+			'forum_posts_approved'		=> 1,
+			'forum_posts_unapproved'	=> 1,
+			'forum_posts_softdeleted'	=> 0,
+			'forum_topics_approved'		=> 1,
+			'forum_topics_unapproved'	=> 1,
+			'forum_topics_softdeleted'	=> 0,
+			'forum_last_post_id'		=> $this->data['posts']['Disapprove Test Topic #1'],
+		), 'after disapproving post');
+
+		$link = $crawler->selectLink($this->lang('RETURN_PAGE', '', ''))->link();
+		$link_url = $link->getUri();
+		$this->assertContains('viewtopic.php?f=' . $this->data['forums']['Disapprove Test #1'] . '&t=' . $this->data['topics']['Disapprove Test Topic #1'], $link_url);
+
+		$crawler = self::request('GET', "viewtopic.php?t={$this->data['topics']['Disapprove Test Topic #1']}&sid={$this->sid}");
+		$this->assertContains('Disapprove Test Topic #1', $crawler->filter('html')->text());
+		$this->assertNotContains('Re: Disapprove Test Topic #1-#2', $crawler->filter('html')->text());
+	}
+
+	public function test_disapprove_topic()
+	{
+		$this->login();
+		$this->load_ids(array(
+			'forums' => array(
+				'Disapprove Test #1',
+			),
+			'topics' => array(
+				'Disapprove Test Topic #1',
+				'Disapprove Test Topic #2',
+			),
+			'posts' => array(
+				'Disapprove Test Topic #1',
+				'Disapprove Test Topic #2',
+			),
+		));
+
+		$this->assert_forum_details($this->data['forums']['Disapprove Test #1'], array(
+			'forum_posts_approved'		=> 1,
+			'forum_posts_unapproved'	=> 1,
+			'forum_posts_softdeleted'	=> 0,
+			'forum_topics_approved'		=> 1,
+			'forum_topics_unapproved'	=> 1,
+			'forum_topics_softdeleted'	=> 0,
+			'forum_last_post_id'		=> $this->data['posts']['Disapprove Test Topic #1'],
+		), 'before disapproving topic');
+
+		$this->add_lang('posting');
+		$this->add_lang('viewtopic');
+		$this->add_lang('mcp');
+		$crawler = self::request('GET', "viewtopic.php?t={$this->data['topics']['Disapprove Test Topic #2']}&sid={$this->sid}");
+		$this->assertContains('Disapprove Test Topic #2', $crawler->filter('html')->text());
+
+		$form = $crawler->selectButton($this->lang('DISAPPROVE'))->form();
+		$crawler = self::submit($form);
+		$form = $crawler->selectButton($this->lang('YES'))->form();
+		$crawler = self::submit($form);
+		$this->assertContainsLang('TOPIC_DISAPPROVED_SUCCESS', $crawler->text());
+
+		$this->assert_forum_details($this->data['forums']['Disapprove Test #1'], array(
+			'forum_posts_approved'		=> 1,
+			'forum_posts_unapproved'	=> 0,
+			'forum_posts_softdeleted'	=> 0,
+			'forum_topics_approved'		=> 1,
+			'forum_topics_unapproved'	=> 0,
+			'forum_topics_softdeleted'	=> 0,
+			'forum_last_post_id'		=> $this->data['posts']['Disapprove Test Topic #1'],
+		), 'after disapproving topic');
+
+		$link = $crawler->selectLink($this->lang('RETURN_PAGE', '', ''))->link();
+		$link_url = $link->getUri();
+		$this->assertContains('viewforum.php?f=' . $this->data['forums']['Disapprove Test #1'], $link_url);
+
+		$crawler = self::request('GET', "viewtopic.php?t={$this->data['topics']['Disapprove Test Topic #2']}&sid={$this->sid}", array(), false);
+		self::assert_response_html(404);
+		$this->assertNotContains('Disapprove Test Topic #2', $crawler->filter('html')->text());
+	}
+
+	protected function assert_forum_details($forum_id, $details, $additional_error_message = '')
+	{
+		$this->db = $this->get_db();
+
+		$sql = 'SELECT ' . implode(', ', array_keys($details)) . '
+			FROM phpbb_forums
+			WHERE forum_id = ' . (int) $forum_id;
+		$result = $this->db->sql_query($sql);
+		$data = $this->db->sql_fetchrow($result);
+		$this->db->sql_freeresult($result);
+
+		$this->assertEquals($details, $data, "Forum {$forum_id} does not match expected {$additional_error_message}");
+	}
+
+	protected function set_flood_interval($flood_interval)
+	{
+		$crawler = self::request('GET', 'adm/index.php?sid=' . $this->sid . '&i=acp_board&mode=post');
+
+		$form = $crawler->selectButton('Submit')->form();
+		$values = $form->getValues();
+
+		$values["config[flood_interval]"] = $flood_interval;
+		$form->setValues($values);
+		$crawler = self::submit($form);
+		$this->assertGreaterThan(0, $crawler->filter('.successbox')->count());
+	}
+
+	protected function load_ids($data)
+	{
+		$this->db = $this->get_db();
+
+		if (!empty($data['forums']))
+		{
+			$sql = 'SELECT *
+				FROM phpbb_forums
+				WHERE ' . $this->db->sql_in_set('forum_name', $data['forums']);
+			$result = $this->db->sql_query($sql);
+			while ($row = $this->db->sql_fetchrow($result))
+			{
+				if (in_array($row['forum_name'], $data['forums']))
+				{
+					$this->data['forums'][$row['forum_name']] = (int) $row['forum_id'];
+				}
+			}
+			$this->db->sql_freeresult($result);
+		}
+
+		if (!empty($data['topics']))
+		{
+			$sql = 'SELECT *
+				FROM phpbb_topics
+				WHERE ' . $this->db->sql_in_set('topic_title', $data['topics']);
+			$result = $this->db->sql_query($sql);
+			while ($row = $this->db->sql_fetchrow($result))
+			{
+				if (in_array($row['topic_title'], $data['topics']))
+				{
+					$this->data['topics'][$row['topic_title']] = (int) $row['topic_id'];
+				}
+			}
+			$this->db->sql_freeresult($result);
+		}
+
+		if (!empty($data['posts']))
+		{
+			$sql = 'SELECT *
+				FROM phpbb_posts
+				WHERE ' . $this->db->sql_in_set('post_subject', $data['posts']);
+			$result = $this->db->sql_query($sql);
+			while ($row = $this->db->sql_fetchrow($result))
+			{
+				if (in_array($row['post_subject'], $data['posts']))
+				{
+					$this->data['posts'][$row['post_subject']] = (int) $row['post_id'];
+				}
+			}
+			$this->db->sql_freeresult($result);
+		}
+	}
+}
diff --git a/tests/functional/visibility_softdelete_test.php b/tests/functional/visibility_softdelete_test.php
new file mode 100644
index 0000000000..f8ada9687c
--- /dev/null
+++ b/tests/functional/visibility_softdelete_test.php
@@ -0,0 +1,761 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @group functional
+*/
+class phpbb_functional_visibility_softdelete_test extends phpbb_functional_test_case
+{
+	protected $data = array();
+
+	public function test_setup_forums()
+	{
+		$this->login();
+		$this->admin_login();
+
+		$crawler = self::request('GET', "adm/index.php?i=acp_forums&mode=manage&sid={$this->sid}");
+		$form = $crawler->selectButton('addforum')->form(array(
+			'forum_name'	=> 'Soft Delete #1',
+		));
+		$crawler = self::submit($form);
+		$form = $crawler->selectButton('update')->form(array(
+			'forum_perm_from'	=> 2,
+		));
+		$crawler = self::submit($form);
+
+		$crawler = self::request('GET', "adm/index.php?i=acp_forums&mode=manage&sid={$this->sid}");
+		$form = $crawler->selectButton('addforum')->form(array(
+			'forum_name'	=> 'Soft Delete #2',
+		));
+		$crawler = self::submit($form);
+		$form = $crawler->selectButton('update')->form(array(
+			'forum_perm_from'	=> 2,
+		));
+		$crawler = self::submit($form);
+	}
+
+	public function test_create_post()
+	{
+		$this->login();
+		$this->load_ids(array(
+			'forums' => array(
+				'Soft Delete #1',
+				'Soft Delete #2',
+			),
+		));
+
+		$this->assert_forum_details($this->data['forums']['Soft Delete #1'], array(
+			'forum_posts_approved'		=> 0,
+			'forum_posts_unapproved'	=> 0,
+			'forum_posts_softdeleted'	=> 0,
+			'forum_topics_approved'		=> 0,
+			'forum_topics_unapproved'	=> 0,
+			'forum_topics_softdeleted'	=> 0,
+			'forum_last_post_id'		=> 0,
+		), 'initial comparison');
+
+		// Test creating topic
+		$post = $this->create_topic($this->data['forums']['Soft Delete #1'], 'Soft Delete Topic #1', 'This is a test topic posted by the testing framework.');
+		$crawler = self::request('GET', "viewtopic.php?t={$post['topic_id']}&sid={$this->sid}");
+
+		$this->assertContains('Soft Delete Topic #1', $crawler->filter('html')->text());
+		$this->data['topics']['Soft Delete Topic #1'] = (int) $post['topic_id'];
+		$this->data['posts']['Soft Delete Topic #1'] = (int) $this->get_parameter_from_link($crawler->filter('.post')->selectLink($this->lang('POST', '', ''))->link()->getUri(), 'p');
+
+		$this->assert_forum_details($this->data['forums']['Soft Delete #1'], array(
+			'forum_posts_approved'		=> 1,
+			'forum_posts_unapproved'	=> 0,
+			'forum_posts_softdeleted'	=> 0,
+			'forum_topics_approved'		=> 1,
+			'forum_topics_unapproved'	=> 0,
+			'forum_topics_softdeleted'	=> 0,
+			'forum_last_post_id'		=> $this->data['posts']['Soft Delete Topic #1'],
+		), 'after creating topic #1');
+
+		// Test creating a reply
+		$post2 = $this->create_post($this->data['forums']['Soft Delete #1'], $post['topic_id'], 'Re: Soft Delete Topic #1-#2', 'This is a test post posted by the testing framework.');
+		$crawler = self::request('GET', "viewtopic.php?t={$post2['topic_id']}&sid={$this->sid}");
+
+		$this->assertContains('Re: Soft Delete Topic #1-#2', $crawler->filter('html')->text());
+		$this->data['posts']['Re: Soft Delete Topic #1-#2'] = (int) $post2['post_id'];
+
+		$this->assert_forum_details($this->data['forums']['Soft Delete #1'], array(
+			'forum_posts_approved'		=> 2,
+			'forum_posts_unapproved'	=> 0,
+			'forum_posts_softdeleted'	=> 0,
+			'forum_topics_approved'		=> 1,
+			'forum_topics_unapproved'	=> 0,
+			'forum_topics_softdeleted'	=> 0,
+			'forum_last_post_id'		=> $this->data['posts']['Re: Soft Delete Topic #1-#2'],
+		), 'after replying');
+	}
+
+	public function test_softdelete_post()
+	{
+		$this->login();
+		$this->load_ids(array(
+			'forums' => array(
+				'Soft Delete #1',
+				'Soft Delete #2',
+			),
+			'topics' => array(
+				'Soft Delete Topic #1',
+			),
+			'posts' => array(
+				'Soft Delete Topic #1',
+				'Re: Soft Delete Topic #1-#2',
+			),
+		));
+
+		$this->assert_forum_details($this->data['forums']['Soft Delete #1'], array(
+			'forum_posts_approved'		=> 2,
+			'forum_posts_unapproved'	=> 0,
+			'forum_posts_softdeleted'	=> 0,
+			'forum_topics_approved'		=> 1,
+			'forum_topics_unapproved'	=> 0,
+			'forum_topics_softdeleted'	=> 0,
+			'forum_last_post_id'		=> $this->data['posts']['Re: Soft Delete Topic #1-#2'],
+		), 'before softdelete');
+
+		$this->add_lang('posting');
+		$crawler = self::request('GET', "posting.php?mode=delete&f={$this->data['forums']['Soft Delete #1']}&p={$this->data['posts']['Re: Soft Delete Topic #1-#2']}&sid={$this->sid}");
+		$this->assertContainsLang('DELETE_PERMANENTLY', $crawler->text());
+
+		$form = $crawler->selectButton('Yes')->form();
+		$crawler = self::submit($form);
+		$this->assertContainsLang('POST_DELETED', $crawler->text());
+
+		$this->assert_forum_details($this->data['forums']['Soft Delete #1'], array(
+			'forum_posts_approved'		=> 1,
+			'forum_posts_unapproved'	=> 0,
+			'forum_posts_softdeleted'	=> 1,
+			'forum_topics_approved'		=> 1,
+			'forum_topics_unapproved'	=> 0,
+			'forum_topics_softdeleted'	=> 0,
+			'forum_last_post_id'		=> $this->data['posts']['Soft Delete Topic #1'],
+		), 'after softdelete');
+
+		$crawler = self::request('GET', "viewtopic.php?t={$this->data['topics']['Soft Delete Topic #1']}&sid={$this->sid}");
+		$this->assertContains($this->lang('POST_DISPLAY', '', ''), $crawler->text());
+	}
+
+	public function test_move_softdeleted_post()
+	{
+		$this->login();
+		$this->load_ids(array(
+			'forums' => array(
+				'Soft Delete #1',
+				'Soft Delete #2',
+			),
+			'topics' => array(
+				'Soft Delete Topic #1',
+			),
+			'posts' => array(
+				'Soft Delete Topic #1',
+				'Re: Soft Delete Topic #1-#2',
+			),
+		));
+
+		$this->assert_forum_details($this->data['forums']['Soft Delete #1'], array(
+			'forum_posts_approved'		=> 1,
+			'forum_posts_unapproved'	=> 0,
+			'forum_posts_softdeleted'	=> 1,
+			'forum_topics_approved'		=> 1,
+			'forum_topics_unapproved'	=> 0,
+			'forum_topics_softdeleted'	=> 0,
+			'forum_last_post_id'		=> $this->data['posts']['Soft Delete Topic #1'],
+		), 'before moving #1');
+
+		$this->assert_forum_details($this->data['forums']['Soft Delete #2'], array(
+			'forum_posts_approved'		=> 0,
+			'forum_posts_unapproved'	=> 0,
+			'forum_posts_softdeleted'	=> 0,
+			'forum_topics_approved'		=> 0,
+			'forum_topics_unapproved'	=> 0,
+			'forum_topics_softdeleted'	=> 0,
+			'forum_last_post_id'		=> 0,
+		), 'before moving #2');
+
+		$crawler = self::request('GET', "viewtopic.php?t={$this->data['topics']['Soft Delete Topic #1']}&sid={$this->sid}");
+
+		$form = $crawler->selectButton('Go')->eq(2)->form();
+		$form['action']->select('move');
+		$crawler = self::submit($form);
+		$this->assertContainsLang('SELECT_DESTINATION_FORUM', $crawler->text());
+
+		$this->add_lang('mcp');
+		$form = $crawler->selectButton('Yes')->form();
+		$form['to_forum_id']->select($this->data['forums']['Soft Delete #2']);
+		$crawler = self::submit($form);
+		$this->assertContainsLang('TOPIC_MOVED_SUCCESS', $crawler->text());
+
+		$crawler = self::request('GET', "viewtopic.php?t={$this->data['topics']['Soft Delete Topic #1']}&sid={$this->sid}");
+		$this->assertContains('Soft Delete #2', $crawler->filter('.navlinks')->text());
+		$this->assertContains('Soft Delete Topic #1', $crawler->filter('h2')->text());
+
+		$this->assert_forum_details($this->data['forums']['Soft Delete #1'], array(
+			'forum_posts_approved'		=> 0,
+			'forum_posts_unapproved'	=> 0,
+			'forum_posts_softdeleted'	=> 0,
+			'forum_topics_approved'		=> 0,
+			'forum_topics_unapproved'	=> 0,
+			'forum_topics_softdeleted'	=> 0,
+			'forum_last_post_id'		=> 0,
+		), 'after moving #1');
+
+		$this->assert_forum_details($this->data['forums']['Soft Delete #2'], array(
+			'forum_posts_approved'		=> 1,
+			'forum_posts_unapproved'	=> 0,
+			'forum_posts_softdeleted'	=> 1,
+			'forum_topics_approved'		=> 1,
+			'forum_topics_unapproved'	=> 0,
+			'forum_topics_softdeleted'	=> 0,
+			'forum_last_post_id'		=> $this->data['posts']['Soft Delete Topic #1'],
+		), 'after moving #2');
+	}
+
+	public function test_softdelete_topic()
+	{
+		$this->login();
+		$this->load_ids(array(
+			'forums' => array(
+				'Soft Delete #1',
+				'Soft Delete #2',
+			),
+			'topics' => array(
+				'Soft Delete Topic #1',
+			),
+			'posts' => array(
+				'Soft Delete Topic #1',
+				'Re: Soft Delete Topic #1-#2',
+			),
+		));
+
+		$this->assert_forum_details($this->data['forums']['Soft Delete #1'], array(
+			'forum_posts_approved'		=> 0,
+			'forum_posts_unapproved'	=> 0,
+			'forum_posts_softdeleted'	=> 0,
+			'forum_topics_approved'		=> 0,
+			'forum_topics_unapproved'	=> 0,
+			'forum_topics_softdeleted'	=> 0,
+			'forum_last_post_id'		=> 0,
+		), 'before softdeleting #1');
+
+		$this->assert_forum_details($this->data['forums']['Soft Delete #2'], array(
+			'forum_posts_approved'		=> 1,
+			'forum_posts_unapproved'	=> 0,
+			'forum_posts_softdeleted'	=> 1,
+			'forum_topics_approved'		=> 1,
+			'forum_topics_unapproved'	=> 0,
+			'forum_topics_softdeleted'	=> 0,
+			'forum_last_post_id'		=> $this->data['posts']['Soft Delete Topic #1'],
+		), 'before softdeleting #2');
+
+		$crawler = self::request('GET', "viewtopic.php?t={$this->data['topics']['Soft Delete Topic #1']}&sid={$this->sid}");
+
+		$this->add_lang('posting');
+		$form = $crawler->selectButton('Go')->eq(2)->form();
+		$form['action']->select('delete_topic');
+		$crawler = self::submit($form);
+		$this->assertContainsLang('DELETE_PERMANENTLY', $crawler->text());
+
+		$this->add_lang('mcp');
+		$form = $crawler->selectButton('Yes')->form();
+		$crawler = self::submit($form);
+		$this->assertContainsLang('TOPIC_DELETED_SUCCESS', $crawler->text());
+
+		$crawler = self::request('GET', "viewtopic.php?t={$this->data['topics']['Soft Delete Topic #1']}&sid={$this->sid}");
+		$this->assertContains('Soft Delete #2', $crawler->filter('.navlinks')->text());
+		$this->assertContains('Soft Delete Topic #1', $crawler->filter('h2')->text());
+
+		$this->assert_forum_details($this->data['forums']['Soft Delete #1'], array(
+			'forum_posts_approved'		=> 0,
+			'forum_posts_unapproved'	=> 0,
+			'forum_posts_softdeleted'	=> 0,
+			'forum_topics_approved'		=> 0,
+			'forum_topics_unapproved'	=> 0,
+			'forum_topics_softdeleted'	=> 0,
+			'forum_last_post_id'		=> 0,
+		), 'after moving #1');
+
+		$this->assert_forum_details($this->data['forums']['Soft Delete #2'], array(
+			'forum_posts_approved'		=> 0,
+			'forum_posts_unapproved'	=> 0,
+			'forum_posts_softdeleted'	=> 2,
+			'forum_topics_approved'		=> 0,
+			'forum_topics_unapproved'	=> 0,
+			'forum_topics_softdeleted'	=> 1,
+			'forum_last_post_id'		=> 0,
+		), 'after moving #2');
+	}
+
+	public function test_move_softdeleted_topic()
+	{
+		$this->login();
+		$this->load_ids(array(
+			'forums' => array(
+				'Soft Delete #1',
+				'Soft Delete #2',
+			),
+			'topics' => array(
+				'Soft Delete Topic #1',
+			),
+			'posts' => array(
+				'Soft Delete Topic #1',
+				'Re: Soft Delete Topic #1-#2',
+			),
+		));
+
+		$this->assert_forum_details($this->data['forums']['Soft Delete #1'], array(
+			'forum_posts_approved'		=> 0,
+			'forum_posts_unapproved'	=> 0,
+			'forum_posts_softdeleted'	=> 0,
+			'forum_topics_approved'		=> 0,
+			'forum_topics_unapproved'	=> 0,
+			'forum_topics_softdeleted'	=> 0,
+			'forum_last_post_id'		=> 0,
+		), 'before moving #1');
+
+		$this->assert_forum_details($this->data['forums']['Soft Delete #2'], array(
+			'forum_posts_approved'		=> 0,
+			'forum_posts_unapproved'	=> 0,
+			'forum_posts_softdeleted'	=> 2,
+			'forum_topics_approved'		=> 0,
+			'forum_topics_unapproved'	=> 0,
+			'forum_topics_softdeleted'	=> 1,
+			'forum_last_post_id'		=> 0,
+		), 'before moving #2');
+
+		$crawler = self::request('GET', "viewtopic.php?t={$this->data['topics']['Soft Delete Topic #1']}&sid={$this->sid}");
+
+		$form = $crawler->selectButton('Go')->eq(2)->form();
+		$form['action']->select('move');
+		$crawler = self::submit($form);
+		$this->assertContainsLang('SELECT_DESTINATION_FORUM', $crawler->text());
+
+		$this->add_lang('mcp');
+		$form = $crawler->selectButton('Yes')->form();
+		$form['to_forum_id']->select($this->data['forums']['Soft Delete #1']);
+		$crawler = self::submit($form);
+		$this->assertContainsLang('TOPIC_MOVED_SUCCESS', $crawler->text());
+
+		$crawler = self::request('GET', "viewtopic.php?t={$this->data['topics']['Soft Delete Topic #1']}&sid={$this->sid}");
+		$this->assertContains('Soft Delete #1', $crawler->filter('.navlinks')->text());
+		$this->assertContains('Soft Delete Topic #1', $crawler->filter('h2')->text());
+
+		$this->assert_forum_details($this->data['forums']['Soft Delete #1'], array(
+			'forum_posts_approved'		=> 0,
+			'forum_posts_unapproved'	=> 0,
+			'forum_posts_softdeleted'	=> 2,
+			'forum_topics_approved'		=> 0,
+			'forum_topics_unapproved'	=> 0,
+			'forum_topics_softdeleted'	=> 1,
+			'forum_last_post_id'		=> 0,
+		), 'after moving #1');
+
+		$this->assert_forum_details($this->data['forums']['Soft Delete #2'], array(
+			'forum_posts_approved'		=> 0,
+			'forum_posts_unapproved'	=> 0,
+			'forum_posts_softdeleted'	=> 0,
+			'forum_topics_approved'		=> 0,
+			'forum_topics_unapproved'	=> 0,
+			'forum_topics_softdeleted'	=> 0,
+			'forum_last_post_id'		=> 0,
+		), 'after moving #2');
+	}
+
+	public function test_restore_post()
+	{
+		$this->login();
+		$this->load_ids(array(
+			'forums' => array(
+				'Soft Delete #1',
+				'Soft Delete #2',
+			),
+			'topics' => array(
+				'Soft Delete Topic #1',
+			),
+			'posts' => array(
+				'Soft Delete Topic #1',
+				'Re: Soft Delete Topic #1-#2',
+			),
+		));
+
+		$this->assert_forum_details($this->data['forums']['Soft Delete #1'], array(
+			'forum_posts_approved'		=> 0,
+			'forum_posts_unapproved'	=> 0,
+			'forum_posts_softdeleted'	=> 2,
+			'forum_topics_approved'		=> 0,
+			'forum_topics_unapproved'	=> 0,
+			'forum_topics_softdeleted'	=> 1,
+			'forum_last_post_id'		=> 0,
+		), 'before restoring #1');
+
+		$this->assert_forum_details($this->data['forums']['Soft Delete #2'], array(
+			'forum_posts_approved'		=> 0,
+			'forum_posts_unapproved'	=> 0,
+			'forum_posts_softdeleted'	=> 0,
+			'forum_topics_approved'		=> 0,
+			'forum_topics_unapproved'	=> 0,
+			'forum_topics_softdeleted'	=> 0,
+			'forum_last_post_id'		=> 0,
+		), 'before restoring #2');
+
+		$crawler = self::request('GET', "viewtopic.php?t={$this->data['topics']['Soft Delete Topic #1']}&sid={$this->sid}");
+
+		$this->add_lang('mcp');
+		$form = $crawler->filter('#p' . $this->data['posts']['Soft Delete Topic #1'])->selectButton($this->lang('RESTORE'))->form();
+		$crawler = self::submit($form);
+		$this->assertContainsLang('RESTORE_POST', $crawler->text());
+
+		$form = $crawler->selectButton('Yes')->form();
+		$crawler = self::submit($form);
+		$this->assertContainsLang('POST_RESTORED_SUCCESS', $crawler->text());
+
+		$crawler = self::request('GET', "viewtopic.php?t={$this->data['topics']['Soft Delete Topic #1']}&sid={$this->sid}");
+		$this->assertContains('Soft Delete #1', $crawler->filter('.navlinks')->text());
+		$this->assertContains('Soft Delete Topic #1', $crawler->filter('h2')->text());
+
+		$this->assert_forum_details($this->data['forums']['Soft Delete #1'], array(
+			'forum_posts_approved'		=> 1,
+			'forum_posts_unapproved'	=> 0,
+			'forum_posts_softdeleted'	=> 1,
+			'forum_topics_approved'		=> 1,
+			'forum_topics_unapproved'	=> 0,
+			'forum_topics_softdeleted'	=> 0,
+			'forum_last_post_id'		=> $this->data['posts']['Soft Delete Topic #1'],
+		), 'after restoring #1');
+
+		$this->assert_forum_details($this->data['forums']['Soft Delete #2'], array(
+			'forum_posts_approved'		=> 0,
+			'forum_posts_unapproved'	=> 0,
+			'forum_posts_softdeleted'	=> 0,
+			'forum_topics_approved'		=> 0,
+			'forum_topics_unapproved'	=> 0,
+			'forum_topics_softdeleted'	=> 0,
+			'forum_last_post_id'		=> 0,
+		), 'after restoring #2');
+	}
+
+	public function test_split_topic()
+	{
+		$this->login();
+		$this->load_ids(array(
+			'forums' => array(
+				'Soft Delete #1',
+				'Soft Delete #2',
+			),
+			'topics' => array(
+				'Soft Delete Topic #1',
+			),
+			'posts' => array(
+				'Soft Delete Topic #1',
+				'Re: Soft Delete Topic #1-#2',
+			),
+		));
+
+		$this->assert_forum_details($this->data['forums']['Soft Delete #1'], array(
+			'forum_posts_approved'		=> 1,
+			'forum_posts_unapproved'	=> 0,
+			'forum_posts_softdeleted'	=> 1,
+			'forum_topics_approved'		=> 1,
+			'forum_topics_unapproved'	=> 0,
+			'forum_topics_softdeleted'	=> 0,
+			'forum_last_post_id'		=> $this->data['posts']['Soft Delete Topic #1'],
+		), 'before splitting #1');
+
+		$this->assert_forum_details($this->data['forums']['Soft Delete #2'], array(
+			'forum_posts_approved'		=> 0,
+			'forum_posts_unapproved'	=> 0,
+			'forum_posts_softdeleted'	=> 0,
+			'forum_topics_approved'		=> 0,
+			'forum_topics_unapproved'	=> 0,
+			'forum_topics_softdeleted'	=> 0,
+			'forum_last_post_id'		=> 0,
+		), 'before splitting #2');
+
+		$crawler = self::request('GET', "viewtopic.php?t={$this->data['topics']['Soft Delete Topic #1']}&sid={$this->sid}");
+
+		$this->add_lang('mcp');
+		$form = $crawler->selectButton('Go')->eq(2)->form();
+		$form['action']->select('split');
+		$crawler = self::submit($form);
+		$this->assertContainsLang('SPLIT_TOPIC_EXPLAIN', $crawler->text());
+
+		$form = $crawler->selectButton('Submit')->form(array(
+			'subject'			=> 'Soft Delete Topic #2',
+		));
+		$form['to_forum_id']->select($this->data['forums']['Soft Delete #2']);
+		$form['post_id_list'][1]->tick();
+		$crawler = self::submit($form);
+
+		$form = $crawler->selectButton('Yes')->form();
+		$crawler = self::submit($form);
+		$this->assertContainsLang('TOPIC_SPLIT_SUCCESS', $crawler->text());
+
+		$crawler = self::request('GET', "viewtopic.php?t={$this->data['topics']['Soft Delete Topic #1']}&sid={$this->sid}");
+		$this->assertContains('Soft Delete Topic #1', $crawler->filter('h2')->text());
+		$this->assertNotContains('Re: Soft Delete Topic #1-#2', $crawler->text());
+
+		$this->assert_forum_details($this->data['forums']['Soft Delete #1'], array(
+			'forum_posts_approved'		=> 1,
+			'forum_posts_unapproved'	=> 0,
+			'forum_posts_softdeleted'	=> 0,
+			'forum_topics_approved'		=> 1,
+			'forum_topics_unapproved'	=> 0,
+			'forum_topics_softdeleted'	=> 0,
+			'forum_last_post_id'		=> $this->data['posts']['Soft Delete Topic #1'],
+		), 'after restoring #1');
+
+		$this->assert_forum_details($this->data['forums']['Soft Delete #2'], array(
+			'forum_posts_approved'		=> 0,
+			'forum_posts_unapproved'	=> 0,
+			'forum_posts_softdeleted'	=> 1,
+			'forum_topics_approved'		=> 0,
+			'forum_topics_unapproved'	=> 0,
+			'forum_topics_softdeleted'	=> 1,
+			'forum_last_post_id'		=> 0,
+		), 'after restoring #2');
+	}
+
+	public function test_move_topic_back()
+	{
+		$this->login();
+		$this->load_ids(array(
+			'forums' => array(
+				'Soft Delete #1',
+				'Soft Delete #2',
+			),
+			'topics' => array(
+				'Soft Delete Topic #1',
+				'Soft Delete Topic #2',
+			),
+			'posts' => array(
+				'Soft Delete Topic #1',
+				'Re: Soft Delete Topic #1-#2',
+			),
+		));
+
+		$crawler = self::request('GET', "viewtopic.php?t={$this->data['topics']['Soft Delete Topic #2']}&sid={$this->sid}");
+
+		$form = $crawler->selectButton('Go')->eq(1)->form();
+		$form['action']->select('move');
+		$crawler = self::submit($form);
+
+		$form = $crawler->selectButton('Yes')->form();
+		$form['to_forum_id']->select($this->data['forums']['Soft Delete #1']);
+		$crawler = self::submit($form);
+
+		$this->assert_forum_details($this->data['forums']['Soft Delete #1'], array(
+			'forum_posts_approved'		=> 1,
+			'forum_posts_unapproved'	=> 0,
+			'forum_posts_softdeleted'	=> 1,
+			'forum_topics_approved'		=> 1,
+			'forum_topics_unapproved'	=> 0,
+			'forum_topics_softdeleted'	=> 1,
+			'forum_last_post_id'		=> $this->data['posts']['Soft Delete Topic #1'],
+		), 'after moving back');
+	}
+
+	public function test_merge_topics()
+	{
+		$this->login();
+		$this->load_ids(array(
+			'forums' => array(
+				'Soft Delete #1',
+				'Soft Delete #2',
+			),
+			'topics' => array(
+				'Soft Delete Topic #1',
+				'Soft Delete Topic #2',
+			),
+			'posts' => array(
+				'Soft Delete Topic #1',
+				'Re: Soft Delete Topic #1-#2',
+			),
+		));
+
+		$this->assert_forum_details($this->data['forums']['Soft Delete #1'], array(
+			'forum_posts_approved'		=> 1,
+			'forum_posts_unapproved'	=> 0,
+			'forum_posts_softdeleted'	=> 1,
+			'forum_topics_approved'		=> 1,
+			'forum_topics_unapproved'	=> 0,
+			'forum_topics_softdeleted'	=> 1,
+			'forum_last_post_id'		=> $this->data['posts']['Soft Delete Topic #1'],
+		), 'before merging #1');
+
+		$crawler = self::request('GET', "viewtopic.php?t={$this->data['topics']['Soft Delete Topic #2']}&sid={$this->sid}");
+
+		$this->add_lang('mcp');
+		$form = $crawler->selectButton('Go')->eq(1)->form();
+		$form['action']->select('merge_topic');
+		$crawler = self::submit($form);
+		$this->assertContainsLang('SELECT_MERGE', $crawler->text());
+
+		$crawler = self::request('GET', "mcp.php?f={$this->data['forums']['Soft Delete #1']}&t={$this->data['topics']['Soft Delete Topic #2']}&i=main&mode=forum_view&action=merge_topic&to_topic_id={$this->data['topics']['Soft Delete Topic #1']}");
+		$this->assertContainsLang('MERGE_TOPICS_CONFIRM', $crawler->text());
+
+		$form = $crawler->selectButton('Yes')->form();
+		$crawler = self::submit($form);
+		$this->assertContainsLang('POSTS_MERGED_SUCCESS', $crawler->text());
+
+		$crawler = self::request('GET', "viewtopic.php?t={$this->data['topics']['Soft Delete Topic #1']}&sid={$this->sid}");
+		$this->assertContains('Soft Delete Topic #1', $crawler->filter('h2')->text());
+		$this->assertContainsLang('POST_DELETED', $crawler->filter('body')->text());
+
+		$this->assert_forum_details($this->data['forums']['Soft Delete #1'], array(
+			'forum_posts_approved'		=> 1,
+			'forum_posts_unapproved'	=> 0,
+			'forum_posts_softdeleted'	=> 1,
+			'forum_topics_approved'		=> 1,
+			'forum_topics_unapproved'	=> 0,
+			'forum_topics_softdeleted'	=> 0,
+			'forum_last_post_id'		=> $this->data['posts']['Soft Delete Topic #1'],
+		), 'after merging #1');
+	}
+
+	public function test_fork_topic()
+	{
+		$this->login();
+		$this->load_ids(array(
+			'forums' => array(
+				'Soft Delete #1',
+				'Soft Delete #2',
+			),
+			'topics' => array(
+				'Soft Delete Topic #1',
+			),
+			'posts' => array(
+				'Soft Delete Topic #1',
+				'Re: Soft Delete Topic #1-#2',
+			),
+		));
+
+		$this->assert_forum_details($this->data['forums']['Soft Delete #1'], array(
+			'forum_posts_approved'		=> 1,
+			'forum_posts_unapproved'	=> 0,
+			'forum_posts_softdeleted'	=> 1,
+			'forum_topics_approved'		=> 1,
+			'forum_topics_unapproved'	=> 0,
+			'forum_topics_softdeleted'	=> 0,
+			'forum_last_post_id'		=> $this->data['posts']['Soft Delete Topic #1'],
+		), 'before forking #1');
+
+		$this->assert_forum_details($this->data['forums']['Soft Delete #2'], array(
+			'forum_posts_approved'		=> 0,
+			'forum_posts_unapproved'	=> 0,
+			'forum_posts_softdeleted'	=> 0,
+			'forum_topics_approved'		=> 0,
+			'forum_topics_unapproved'	=> 0,
+			'forum_topics_softdeleted'	=> 0,
+			'forum_last_post_id'		=> 0,
+		), 'before forking #2');
+
+		$crawler = self::request('GET', "viewtopic.php?t={$this->data['topics']['Soft Delete Topic #1']}&sid={$this->sid}");
+
+		$this->add_lang('mcp');
+		$form = $crawler->selectButton('Go')->eq(2)->form();
+		$form['action']->select('fork');
+		$crawler = self::submit($form);
+		$this->assertContainsLang('FORK_TOPIC', $crawler->text());
+
+		$form = $crawler->selectButton('Yes')->form();
+		$form['to_forum_id']->select($this->data['forums']['Soft Delete #2']);
+		$crawler = self::submit($form);
+		$this->assertContainsLang('TOPIC_FORKED_SUCCESS', $crawler->text());
+
+		$this->assert_forum_details($this->data['forums']['Soft Delete #1'], array(
+			'forum_posts_approved'		=> 1,
+			'forum_posts_unapproved'	=> 0,
+			'forum_posts_softdeleted'	=> 1,
+			'forum_topics_approved'		=> 1,
+			'forum_topics_unapproved'	=> 0,
+			'forum_topics_softdeleted'	=> 0,
+			'forum_last_post_id'		=> $this->data['posts']['Soft Delete Topic #1'],
+		), 'after forking #1');
+
+		$this->assert_forum_details($this->data['forums']['Soft Delete #2'], array(
+			'forum_posts_approved'		=> 1,
+			'forum_posts_unapproved'	=> 0,
+			'forum_posts_softdeleted'	=> 1,
+			'forum_topics_approved'		=> 1,
+			'forum_topics_unapproved'	=> 0,
+			'forum_topics_softdeleted'	=> 0,
+			'forum_last_post_id'		=> $this->data['posts']['Soft Delete Topic #1'] + 2,
+		), 'after forking #2');
+	}
+
+	public function assert_forum_details($forum_id, $details, $additional_error_message = '')
+	{
+		$this->db = $this->get_db();
+
+		$sql = 'SELECT ' . implode(', ', array_keys($details)) . '
+			FROM phpbb_forums
+			WHERE forum_id = ' . (int) $forum_id;
+		$result = $this->db->sql_query($sql);
+		$data = $this->db->sql_fetchrow($result);
+		$this->db->sql_freeresult($result);
+
+		$this->assertEquals($details, $data, "Forum {$forum_id} does not match expected {$additional_error_message}");
+	}
+
+	public function load_ids($data)
+	{
+		$this->db = $this->get_db();
+
+		if (!empty($data['forums']))
+		{
+			$sql = 'SELECT *
+				FROM phpbb_forums
+				WHERE ' . $this->db->sql_in_set('forum_name', $data['forums']);
+			$result = $this->db->sql_query($sql);
+			while ($row = $this->db->sql_fetchrow($result))
+			{
+				if (in_array($row['forum_name'], $data['forums']))
+				{
+					$this->data['forums'][$row['forum_name']] = (int) $row['forum_id'];
+				}
+			}
+			$this->db->sql_freeresult($result);
+		}
+
+		if (!empty($data['topics']))
+		{
+			$sql = 'SELECT *
+				FROM phpbb_topics
+				WHERE ' . $this->db->sql_in_set('topic_title', $data['topics']);
+			$result = $this->db->sql_query($sql);
+			while ($row = $this->db->sql_fetchrow($result))
+			{
+				if (in_array($row['topic_title'], $data['topics']))
+				{
+					$this->data['topics'][$row['topic_title']] = (int) $row['topic_id'];
+				}
+			}
+			$this->db->sql_freeresult($result);
+		}
+
+		if (!empty($data['posts']))
+		{
+			$sql = 'SELECT *
+				FROM phpbb_posts
+				WHERE ' . $this->db->sql_in_set('post_subject', $data['posts']);
+			$result = $this->db->sql_query($sql);
+			while ($row = $this->db->sql_fetchrow($result))
+			{
+				if (in_array($row['post_subject'], $data['posts']))
+				{
+					$this->data['posts'][$row['post_subject']] = (int) $row['post_id'];
+				}
+			}
+			$this->db->sql_freeresult($result);
+		}
+	}
+}
-- 
cgit v1.2.1


From 793680478bb751a4541aadd6ab4c973f24f5d8f2 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sun, 13 Apr 2014 20:46:27 +0200
Subject: [ticket/12371] Add functional tests for reapproving

PHPBB3-12371
---
 tests/functional/visibility_reapprove_test.php | 406 +++++++++++++++++++++++++
 1 file changed, 406 insertions(+)
 create mode 100644 tests/functional/visibility_reapprove_test.php

(limited to 'tests/functional')

diff --git a/tests/functional/visibility_reapprove_test.php b/tests/functional/visibility_reapprove_test.php
new file mode 100644
index 0000000000..ae97c7e785
--- /dev/null
+++ b/tests/functional/visibility_reapprove_test.php
@@ -0,0 +1,406 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2014 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @group functional
+*/
+class phpbb_functional_visibility_reapprove_test extends phpbb_functional_test_case
+{
+	protected $data = array();
+
+	public function test_setup_forums()
+	{
+		$this->login();
+		$this->admin_login();
+
+		$crawler = self::request('GET', "adm/index.php?i=acp_forums&mode=manage&sid={$this->sid}");
+		$form = $crawler->selectButton('addforum')->form(array(
+			'forum_name'	=> 'Reapprove Test #1',
+		));
+		$crawler = self::submit($form);
+		$form = $crawler->selectButton('update')->form(array(
+			'forum_perm_from'	=> 2,
+		));
+		$crawler = self::submit($form);
+
+		// Set flood interval to 0
+		$this->set_flood_interval(0);
+	}
+
+	public function test_create_posts()
+	{
+		$this->login();
+		$this->load_ids(array(
+			'forums' => array(
+				'Reapprove Test #1',
+			),
+		));
+
+		$this->assert_forum_details($this->data['forums']['Reapprove Test #1'], array(
+			'forum_posts_approved'		=> 0,
+			'forum_posts_unapproved'	=> 0,
+			'forum_posts_softdeleted'	=> 0,
+			'forum_topics_approved'		=> 0,
+			'forum_topics_unapproved'	=> 0,
+			'forum_topics_softdeleted'	=> 0,
+			'forum_last_post_id'		=> 0,
+		), 'initial comparison');
+
+		// Test creating topic #1
+		$post = $this->create_topic($this->data['forums']['Reapprove Test #1'], 'Reapprove Test Topic #1', 'This is a test topic posted by the testing framework.');
+		$crawler = self::request('GET', "viewtopic.php?t={$post['topic_id']}&sid={$this->sid}");
+
+		$this->assertContains('Reapprove Test Topic #1', $crawler->filter('h2')->text());
+		$this->data['topics']['Reapprove Test Topic #1'] = (int) $post['topic_id'];
+		$this->data['posts']['Reapprove Test Topic #1'] = (int) $this->get_parameter_from_link($crawler->filter('.post')->selectLink($this->lang('POST', '', ''))->link()->getUri(), 'p');
+
+		$this->assert_forum_details($this->data['forums']['Reapprove Test #1'], array(
+			'forum_posts_approved'		=> 1,
+			'forum_posts_unapproved'	=> 0,
+			'forum_posts_softdeleted'	=> 0,
+			'forum_topics_approved'		=> 1,
+			'forum_topics_unapproved'	=> 0,
+			'forum_topics_softdeleted'	=> 0,
+			'forum_last_post_id'		=> $this->data['posts']['Reapprove Test Topic #1'],
+		), 'after creating topic #1');
+
+		$this->logout();
+		$this->create_user('reapprove_testuser');
+		$this->add_user_group('NEWLY_REGISTERED', array('reapprove_testuser'));
+		$this->login('reapprove_testuser');
+
+		// Test creating a reply
+		$post2 = $this->create_post($this->data['forums']['Reapprove Test #1'], $post['topic_id'], 'Re: Reapprove Test Topic #1-#2', 'This is a test post posted by the testing framework.', array(), 'POST_STORED_MOD');
+
+		$crawler = self::request('GET', "viewtopic.php?t={$this->data['topics']['Reapprove Test Topic #1']}&sid={$this->sid}");
+		$this->assertNotContains('Re: Reapprove Test Topic #1-#2', $crawler->filter('#page-body')->text());
+
+		$this->assert_forum_details($this->data['forums']['Reapprove Test #1'], array(
+			'forum_posts_approved'		=> 1,
+			'forum_posts_unapproved'	=> 1,
+			'forum_posts_softdeleted'	=> 0,
+			'forum_topics_approved'		=> 1,
+			'forum_topics_unapproved'	=> 0,
+			'forum_topics_softdeleted'	=> 0,
+			'forum_last_post_id'		=> $this->data['posts']['Reapprove Test Topic #1'],
+		), 'after replying');
+
+		// Test creating topic #2
+		$post = $this->create_topic($this->data['forums']['Reapprove Test #1'], 'Reapprove Test Topic #2', 'This is a test topic posted by the testing framework.', array(), 'POST_STORED_MOD');
+		$crawler = self::request('GET', "viewforum.php?f={$this->data['forums']['Reapprove Test #1']}&sid={$this->sid}");
+
+		$this->assertNotContains('Reapprove Test Topic #2', $crawler->filter('html')->text());
+
+		$this->assert_forum_details($this->data['forums']['Reapprove Test #1'], array(
+			'forum_posts_approved'		=> 1,
+			'forum_posts_unapproved'	=> 2,
+			'forum_posts_softdeleted'	=> 0,
+			'forum_topics_approved'		=> 1,
+			'forum_topics_unapproved'	=> 1,
+			'forum_topics_softdeleted'	=> 0,
+			'forum_last_post_id'		=> $this->data['posts']['Reapprove Test Topic #1'],
+		), 'after creating topic #2');
+
+		$this->logout();
+	}
+
+	public function test_approve_post()
+	{
+		$this->login();
+		$this->load_ids(array(
+			'forums' => array(
+				'Reapprove Test #1',
+			),
+			'topics' => array(
+				'Reapprove Test Topic #1',
+				'Reapprove Test Topic #2',
+			),
+			'posts' => array(
+				'Reapprove Test Topic #1',
+				'Re: Reapprove Test Topic #1-#2',
+				'Reapprove Test Topic #2',
+			),
+		));
+
+		$this->assert_forum_details($this->data['forums']['Reapprove Test #1'], array(
+			'forum_posts_approved'		=> 1,
+			'forum_posts_unapproved'	=> 2,
+			'forum_posts_softdeleted'	=> 0,
+			'forum_topics_approved'		=> 1,
+			'forum_topics_unapproved'	=> 1,
+			'forum_topics_softdeleted'	=> 0,
+			'forum_last_post_id'		=> $this->data['posts']['Reapprove Test Topic #1'],
+		), 'before approving post');
+
+		$this->add_lang('posting');
+		$this->add_lang('viewtopic');
+		$this->add_lang('mcp');
+		$crawler = self::request('GET', "viewtopic.php?t={$this->data['topics']['Reapprove Test Topic #1']}&sid={$this->sid}");
+		$this->assertContains('Reapprove Test Topic #1', $crawler->filter('h2')->text());
+		$this->assertContains('Re: Reapprove Test Topic #1-#2', $crawler->filter('#page-body')->text());
+
+		$form = $crawler->selectButton($this->lang('APPROVE'))->form();
+		$crawler = self::submit($form);
+		$form = $crawler->selectButton($this->lang('YES'))->form();
+		$crawler = self::submit($form);
+		$this->assertContainsLang('POST_APPROVED_SUCCESS', $crawler->text());
+
+		$this->assert_forum_details($this->data['forums']['Reapprove Test #1'], array(
+			'forum_posts_approved'		=> 2,
+			'forum_posts_unapproved'	=> 1,
+			'forum_posts_softdeleted'	=> 0,
+			'forum_topics_approved'		=> 1,
+			'forum_topics_unapproved'	=> 1,
+			'forum_topics_softdeleted'	=> 0,
+			'forum_last_post_id'		=> $this->data['posts']['Re: Reapprove Test Topic #1-#2'],
+		), 'after approving post');
+
+		$link = $crawler->selectLink($this->lang('RETURN_PAGE', '', ''))->link();
+		$link_url = $link->getUri();
+		$this->assertContains('viewtopic.php?f=' . $this->data['forums']['Reapprove Test #1'] . '&t=' . $this->data['topics']['Reapprove Test Topic #1'], $link_url);
+
+		$crawler = self::request('GET', "viewtopic.php?t={$this->data['topics']['Reapprove Test Topic #1']}&sid={$this->sid}");
+		$this->assertContains('Reapprove Test Topic #1', $crawler->filter('h2')->text());
+		$this->assertContains('Re: Reapprove Test Topic #1-#2', $crawler->filter('#page-body')->text());
+	}
+
+	public function test_approve_topic()
+	{
+		$this->login();
+		$this->load_ids(array(
+			'forums' => array(
+				'Reapprove Test #1',
+			),
+			'topics' => array(
+				'Reapprove Test Topic #1',
+				'Reapprove Test Topic #2',
+			),
+			'posts' => array(
+				'Reapprove Test Topic #1',
+				'Re: Reapprove Test Topic #1-#2',
+				'Reapprove Test Topic #2',
+			),
+		));
+
+		$this->assert_forum_details($this->data['forums']['Reapprove Test #1'], array(
+			'forum_posts_approved'		=> 2,
+			'forum_posts_unapproved'	=> 1,
+			'forum_posts_softdeleted'	=> 0,
+			'forum_topics_approved'		=> 1,
+			'forum_topics_unapproved'	=> 1,
+			'forum_topics_softdeleted'	=> 0,
+			'forum_last_post_id'		=> $this->data['posts']['Re: Reapprove Test Topic #1-#2'],
+		), 'before approving topic');
+
+		$this->add_lang('posting');
+		$this->add_lang('viewtopic');
+		$this->add_lang('mcp');
+		$crawler = self::request('GET', "viewtopic.php?t={$this->data['topics']['Reapprove Test Topic #2']}&sid={$this->sid}");
+		$this->assertContains('Reapprove Test Topic #2', $crawler->filter('h2')->text());
+
+		$form = $crawler->selectButton($this->lang('APPROVE'))->form();
+		$crawler = self::submit($form);
+		$form = $crawler->selectButton($this->lang('YES'))->form();
+		$crawler = self::submit($form);
+		//@todo $this->assertContainsLang('TOPIC_APPROVED_SUCCESS', $crawler->text());
+		$this->assertContainsLang('POST_APPROVED_SUCCESS', $crawler->text());
+
+		$this->assert_forum_details($this->data['forums']['Reapprove Test #1'], array(
+			'forum_posts_approved'		=> 3,
+			'forum_posts_unapproved'	=> 0,
+			'forum_posts_softdeleted'	=> 0,
+			'forum_topics_approved'		=> 2,
+			'forum_topics_unapproved'	=> 0,
+			'forum_topics_softdeleted'	=> 0,
+			'forum_last_post_id'		=> $this->data['posts']['Reapprove Test Topic #2'],
+		), 'after approving topic');
+
+		$link = $crawler->selectLink($this->lang('RETURN_PAGE', '', ''))->link();
+		$link_url = $link->getUri();
+		$this->assertContains('viewtopic.php?f=' . $this->data['topic']['Reapprove Test Topic #2'], $link_url);
+
+		$crawler = self::request('GET', "viewtopic.php?t={$this->data['topics']['Reapprove Test Topic #2']}&sid={$this->sid}");
+		$this->assertContains('Reapprove Test Topic #2', $crawler->filter('h2')->text());
+	}
+
+	public function test_edit_posts()
+	{
+		$this->load_ids(array(
+			'forums' => array(
+				'Reapprove Test #1',
+			),
+			'topics' => array(
+				'Reapprove Test Topic #1',
+				'Reapprove Test Topic #2',
+			),
+			'posts' => array(
+				'Reapprove Test Topic #1',
+				'Re: Reapprove Test Topic #1-#2',
+				'Reapprove Test Topic #2',
+			),
+		));
+		$this->add_lang('posting');
+
+		$this->assert_forum_details($this->data['forums']['Reapprove Test #1'], array(
+			'forum_posts_approved'		=> 3,
+			'forum_posts_unapproved'	=> 0,
+			'forum_posts_softdeleted'	=> 0,
+			'forum_topics_approved'		=> 2,
+			'forum_topics_unapproved'	=> 0,
+			'forum_topics_softdeleted'	=> 0,
+			'forum_last_post_id'		=> $this->data['posts']['Reapprove Test Topic #2'],
+		), 'before editing post');
+
+		$this->login('reapprove_testuser');
+		$this->add_user_group('NEWLY_REGISTERED', array('reapprove_testuser'));
+
+		// Test editing a post
+		$posting_url = "posting.php?mode=edit&f={$this->data['forums']['Reapprove Test #1']}&p={$this->data['posts']['Re: Reapprove Test Topic #1-#2']}&sid={$this->sid}";
+		$form_data = array(
+			'message'	=> 'Post edited by testing framework',
+			'subject'	=> 'Re: Reapprove Test Topic #1-#2',
+			'post'		=> true,
+		);
+		$this->submit_post($posting_url, 'EDIT_POST', $form_data, 'POST_EDITED_MOD');
+
+		$crawler = self::request('GET', "viewtopic.php?t={$this->data['topics']['Reapprove Test Topic #1']}&sid={$this->sid}");
+		$this->assertNotContains('Re: Reapprove Test Topic #1-#2', $crawler->filter('#page-body')->text());
+		$this->assertNotContains('Post edited by testing framework', $crawler->filter('#page-body')->text());
+
+		$this->assert_forum_details($this->data['forums']['Reapprove Test #1'], array(
+			'forum_posts_approved'		=> 2,
+			'forum_posts_unapproved'	=> 1,
+			'forum_posts_softdeleted'	=> 0,
+			'forum_topics_approved'		=> 2,
+			'forum_topics_unapproved'	=> 0,
+			'forum_topics_softdeleted'	=> 0,
+			'forum_last_post_id'		=> $this->data['posts']['Reapprove Test Topic #2'],
+		), 'after editing post');
+
+		// Test editing a topic
+		$posting_url = "posting.php?mode=edit&f={$this->data['forums']['Reapprove Test #1']}&p={$this->data['posts']['Reapprove Test Topic #2']}&sid={$this->sid}";
+		$form_data = array(
+			'message'	=> 'Post edited by testing framework',
+			'subject'	=> 'Reapprove Test Topic #2',
+			'post'		=> true,
+		);
+		$this->submit_post($posting_url, 'EDIT_POST', $form_data, 'POST_EDITED_MOD');
+
+		$crawler = self::request('GET', "viewtopic.php?t={$this->data['topics']['Reapprove Test Topic #2']}&sid={$this->sid}", array(), false);
+		self::assert_response_html(404);
+		$this->assertNotContains('Reapprove Test Topic #2', $crawler->filter('#page-body')->text());
+		$this->assertNotContains('Post edited by testing framework', $crawler->filter('#page-body')->text());
+
+		$this->assert_forum_details($this->data['forums']['Reapprove Test #1'], array(
+			'forum_posts_approved'		=> 1,
+			'forum_posts_unapproved'	=> 2,
+			'forum_posts_softdeleted'	=> 0,
+			'forum_topics_approved'		=> 1,
+			'forum_topics_unapproved'	=> 1,
+			'forum_topics_softdeleted'	=> 0,
+			'forum_last_post_id'		=> $this->data['posts']['Reapprove Test Topic #1'],
+		), 'after editing topic');
+
+		$this->logout();
+		$this->login();
+
+		$crawler = self::request('GET', "viewtopic.php?t={$this->data['topics']['Reapprove Test Topic #1']}&sid={$this->sid}");
+		$this->assertContains('Re: Reapprove Test Topic #1-#2', $crawler->filter('#page-body')->text());
+		$this->assertContains('Post edited by testing framework', $crawler->filter('#page-body')->text());
+	}
+
+	public function test_reset_flood_interval()
+	{
+		$this->login();
+		$this->admin_login();
+
+		// Set flood interval back to 15
+		$this->set_flood_interval(15);
+	}
+
+	protected function assert_forum_details($forum_id, $details, $additional_error_message = '')
+	{
+		$this->db = $this->get_db();
+
+		$sql = 'SELECT ' . implode(', ', array_keys($details)) . '
+			FROM phpbb_forums
+			WHERE forum_id = ' . (int) $forum_id;
+		$result = $this->db->sql_query($sql);
+		$data = $this->db->sql_fetchrow($result);
+		$this->db->sql_freeresult($result);
+
+		$this->assertEquals($details, $data, "Forum {$forum_id} does not match expected {$additional_error_message}");
+	}
+
+	protected function set_flood_interval($flood_interval)
+	{
+		$crawler = self::request('GET', 'adm/index.php?sid=' . $this->sid . '&i=acp_board&mode=post');
+
+		$form = $crawler->selectButton('Submit')->form();
+		$values = $form->getValues();
+
+		$values["config[flood_interval]"] = $flood_interval;
+		$form->setValues($values);
+		$crawler = self::submit($form);
+		$this->assertGreaterThan(0, $crawler->filter('.successbox')->count());
+	}
+
+	protected function load_ids($data)
+	{
+		$this->db = $this->get_db();
+
+		if (!empty($data['forums']))
+		{
+			$sql = 'SELECT *
+				FROM phpbb_forums
+				WHERE ' . $this->db->sql_in_set('forum_name', $data['forums']);
+			$result = $this->db->sql_query($sql);
+			while ($row = $this->db->sql_fetchrow($result))
+			{
+				if (in_array($row['forum_name'], $data['forums']))
+				{
+					$this->data['forums'][$row['forum_name']] = (int) $row['forum_id'];
+				}
+			}
+			$this->db->sql_freeresult($result);
+		}
+
+		if (!empty($data['topics']))
+		{
+			$sql = 'SELECT *
+				FROM phpbb_topics
+				WHERE ' . $this->db->sql_in_set('topic_title', $data['topics']);
+			$result = $this->db->sql_query($sql);
+			while ($row = $this->db->sql_fetchrow($result))
+			{
+				if (in_array($row['topic_title'], $data['topics']))
+				{
+					$this->data['topics'][$row['topic_title']] = (int) $row['topic_id'];
+				}
+			}
+			$this->db->sql_freeresult($result);
+		}
+
+		if (!empty($data['posts']))
+		{
+			$sql = 'SELECT *
+				FROM phpbb_posts
+				WHERE ' . $this->db->sql_in_set('post_subject', $data['posts']);
+			$result = $this->db->sql_query($sql);
+			while ($row = $this->db->sql_fetchrow($result))
+			{
+				if (in_array($row['post_subject'], $data['posts']))
+				{
+					$this->data['posts'][$row['post_subject']] = (int) $row['post_id'];
+				}
+			}
+			$this->db->sql_freeresult($result);
+		}
+	}
+}
-- 
cgit v1.2.1


From 16329c7ad90299a620855252902b3ef4d6959019 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sun, 13 Apr 2014 21:15:08 +0200
Subject: [ticket/12371] Reapprove the post and topic again in tests

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

(limited to 'tests/functional')

diff --git a/tests/functional/visibility_reapprove_test.php b/tests/functional/visibility_reapprove_test.php
index ae97c7e785..70134ef724 100644
--- a/tests/functional/visibility_reapprove_test.php
+++ b/tests/functional/visibility_reapprove_test.php
@@ -315,6 +315,16 @@ class phpbb_functional_visibility_reapprove_test extends phpbb_functional_test_c
 		$this->assertContains('Post edited by testing framework', $crawler->filter('#page-body')->text());
 	}
 
+	public function test_approve_post_again()
+	{
+		$this->test_approve_post();
+	}
+
+	public function test_approve_topic_again()
+	{
+		$this->test_approve_topic();
+	}
+
 	public function test_reset_flood_interval()
 	{
 		$this->login();
-- 
cgit v1.2.1