From 78a913581c727801240758c0a8c3bfae86d124ca Mon Sep 17 00:00:00 2001
From: v12mike <github@ingenious.co.nz>
Date: Tue, 10 Sep 2019 16:32:13 -0400
Subject: [ticket/9837] Display unapproved posts to posters

Add tests and improve style template

PHPBB3-9837
---
 .../visibility_unapproved_posts_test.php           | 360 +++++++++++++++++++++
 1 file changed, 360 insertions(+)
 create mode 100644 tests/functional/visibility_unapproved_posts_test.php

(limited to 'tests/functional')

diff --git a/tests/functional/visibility_unapproved_posts_test.php b/tests/functional/visibility_unapproved_posts_test.php
new file mode 100644
index 0000000000..4e220ddda2
--- /dev/null
+++ b/tests/functional/visibility_unapproved_posts_test.php
@@ -0,0 +1,360 @@
+<?php
+/**
+*
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
+*
+*/
+
+/**
+* @group functional
+*/
+class phpbb_functional_visibility_unapproved_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'	=> 'Unapproved Posts 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(
+				'Unapproved Posts Test #1',
+			),
+		));
+
+		$this->assert_forum_details($this->data['forums']['Unapproved Posts 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']['Unapproved Posts Test #1'], 'Unapproved Posts 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('Unapproved Posts Test Topic #1', $crawler->filter('h2')->text());
+		$this->data['topics']['Unapproved Posts Test Topic #1'] = (int) $post['topic_id'];
+		$this->data['posts']['Unapproved Posts 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']['Unapproved Posts 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']['Unapproved Posts Test Topic #1'],
+		), 'after creating topic #1');
+
+		$this->logout();
+		$this->create_user('unapproved_posts_test_user#1');
+		$this->add_user_group('NEWLY_REGISTERED', array('unapproved_posts_test_user#1'));
+		$this->login('unapproved_posts_test_user#1');
+
+		// Test creating a reply
+		$post2 = $this->create_post($this->data['forums']['Unapproved Posts Test #1'], $post['topic_id'], 'Re: Unapproved Posts 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']['Unapproved Posts Test Topic #1']}&sid={$this->sid}");
+		$this->assertNotContains('Re: Unapproved Posts Test Topic #1-#2', $crawler->filter('#page-body')->text());
+
+		$this->assert_forum_details($this->data['forums']['Unapproved Posts 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']['Unapproved Posts Test Topic #1'],
+		), 'after replying');
+
+		// Test creating topic #2
+		$post = $this->create_topic($this->data['forums']['Unapproved Posts Test #1'], 'Unapproved Posts 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']['Unapproved Posts Test #1']}&sid={$this->sid}");
+
+		$this->assertNotContains('Unapproved Posts Test Topic #2', $crawler->filter('html')->text());
+
+		$this->assert_forum_details($this->data['forums']['Unapproved Posts 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']['Unapproved Posts Test Topic #1'],
+		), 'after creating topic #2');
+
+		$this->logout();
+	}
+
+	public function test_view_unapproved_post_disabled()
+	{
+        // user who created post
+		$this->login('unapproved_posts_test_user#1');
+		$this->load_ids(array(
+			'forums' => array(
+				'Unapproved Posts Test #1',
+			),
+			'topics' => array(
+				'Unapproved Posts Test Topic #1',
+				'Unapproved Posts Test Topic #2',
+			),
+			'posts' => array(
+				'Unapproved Posts Test Topic #1',
+				'Re: Unapproved Posts Test Topic #1-#2',
+				'Unapproved Posts Test Topic #2',
+			),
+		));
+
+		$this->assert_forum_details($this->data['forums']['Unapproved Posts 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']['Unapproved Posts Test Topic #1'],
+		), 'before approving post');
+
+		$this->add_lang('posting');
+		$this->add_lang('viewtopic');
+		$this->add_lang('mcp');
+
+		//should be able to see topic 1 but not unapproved post
+		$crawler = self::request('GET', "viewtopic.php?t={$this->data['topics']['Unapproved Posts Test Topic #1']}&sid={$this->sid}");
+		$this->assertContains('Unapproved Posts Test Topic #1', $crawler->filter('h2')->text());
+		$this->assertNotContains('Re: Unapproved Posts Test Topic #1-#2', $crawler->filter('#page-body')->text());
+		$this->assertNotContains('This post is not visible to other users until it has been approved', $crawler->filter('#page-body')->text());
+
+		//should not be able to see topic 2
+		$crawler = self::request('GET', "viewforum.php?f={$this->data['forums']['Unapproved Posts Test #1']}&sid={$this->sid}");
+		$this->assertNotContains('Unapproved Posts Test Topic #2', $crawler->filter('html')->text());
+		$this->logout();
+
+		// another user
+		$this->create_user('unapproved_posts_test_user#2');
+		$this->login('unapproved_posts_test_user#2');
+
+		$this->add_lang('posting');
+		$this->add_lang('viewtopic');
+		$this->add_lang('mcp');
+
+		//should be able to see topic 1 but not unapproved post
+		$crawler = self::request('GET', "viewtopic.php?t={$this->data['topics']['Unapproved Posts Test Topic #1']}&sid={$this->sid}");
+		$this->assertContains('Unapproved Posts Test Topic #1', $crawler->filter('h2')->text());
+		$this->assertNotContains('Re: Unapproved Posts Test Topic #1-#2', $crawler->filter('#page-body')->text());
+		$this->assertNotContains('This post is not visible to other users until it has been approved', $crawler->filter('#page-body')->text());
+
+		//should not be able to see topic 2
+		$crawler = self::request('GET', "viewforum.php?f={$this->data['forums']['Unapproved Posts Test #1']}&sid={$this->sid}");
+		$this->assertNotContains('Unapproved Posts Test Topic #2', $crawler->filter('html')->text());
+	}
+
+	public function test_view_unapproved_post_enabled()
+	{
+		$this->config_display_unapproved_posts_state(true);
+
+        // user who created post
+		$this->login('unapproved_posts_test_user#1');
+		$this->load_ids(array(
+			'forums' => array(
+				'Unapproved Posts Test #1',
+			),
+			'topics' => array(
+				'Unapproved Posts Test Topic #1',
+				'Unapproved Posts Test Topic #2',
+			),
+			'posts' => array(
+				'Unapproved Posts Test Topic #1',
+				'Re: Unapproved Posts Test Topic #1-#2',
+				'Unapproved Posts Test Topic #2',
+			),
+		));
+
+		$this->assert_forum_details($this->data['forums']['Unapproved Posts 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']['Unapproved Posts Test Topic #1'],
+		), 'before approving post');
+
+		$this->add_lang('posting');
+		$this->add_lang('viewtopic');
+		$this->add_lang('mcp');
+
+		//should be able to see topic 1 and unapproved post
+		$crawler = self::request('GET', "viewtopic.php?t={$this->data['topics']['Unapproved Posts Test Topic #1']}&sid={$this->sid}");
+		$this->assertContains('Unapproved Posts Test Topic #1', $crawler->filter('h2')->text());
+		$this->assertContains('Re: Unapproved Posts Test Topic #1-#2', $crawler->filter('#page-body')->text());
+		$this->assertContains('This post is not visible to other users until it has been approved', $crawler->filter('#page-body')->text());
+
+		//should be able to see topic 2
+		$crawler = self::request('GET', "viewforum.php?f={$this->data['forums']['Unapproved Posts Test #1']}&sid={$this->sid}");
+		$this->assertContains('Unapproved Posts Test Topic #2', $crawler->filter('html')->text());
+		//should be able to see post in topic 2
+		$crawler = self::request('GET', "viewtopic.php?t={$this->data['topics']['Unapproved Posts Test Topic #2']}&sid={$this->sid}");
+		$this->assertContains('Unapproved Posts Test Topic #2', $crawler->filter('#page-body')->text());
+		$this->assertContains('This post is not visible to other users until it has been approved', $crawler->filter('#page-body')->text());
+		$this->logout();
+
+		// another user
+		$this->login('unapproved_posts_test_user#2');
+
+		$this->add_lang('posting');
+		$this->add_lang('viewtopic');
+		$this->add_lang('mcp');
+
+		//should be able to see topic 1 but not unapproved post
+		$crawler = self::request('GET', "viewtopic.php?t={$this->data['topics']['Unapproved Posts Test Topic #1']}&sid={$this->sid}");
+		$this->assertContains('Unapproved Posts Test Topic #1', $crawler->filter('h2')->text());
+		$this->assertNotContains('Re: Unapproved Posts Test Topic #1-#2', $crawler->filter('#page-body')->text());
+		$this->assertNotContains('This post is not visible to other users until it has been approved', $crawler->filter('#page-body')->text());
+
+		//should not be able to see topic 2
+		$crawler = self::request('GET', "viewforum.php?f={$this->data['forums']['Unapproved Posts Test #1']}&sid={$this->sid}");
+		$this->assertNotContains('Unapproved Posts Test Topic #2', $crawler->filter('html')->text());
+		$this->logout();
+
+		// revert the configuration
+		$this->config_display_unapproved_posts_state(false);
+	}
+
+	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);
+		}
+	}
+
+	protected function config_display_unapproved_posts_state($state)
+	{
+		$this->login();
+		$this->admin_login();
+
+		$crawler = self::request('GET', "adm/index.php?sid={$this->sid}&i=acp_board&mode=features");
+
+		$form = $crawler->selectButton('Submit')->form();
+		$values = $form->getValues();
+
+		// Enable display of unapproved posts to posters
+		$values['config[display_unapproved_posts]'] = $state;
+
+		$form->setValues($values);
+
+		$crawler = self::submit($form);
+		self::assertContainsLang('CONFIG_UPDATED', $crawler->filter('.successbox')->text());
+		$this->logout();
+	}
+}
-- 
cgit v1.2.1


From 0f57f3d90d1983c49bde1d56b6018a761f92264b Mon Sep 17 00:00:00 2001
From: v12mike <v12mike@ingenious.co.nz>
Date: Mon, 4 Nov 2019 09:21:27 -0500
Subject: [ticket/9837] Display unapproved posts to their authors

Coding guidelines fixes

PHPBB3-9837
---
 .../visibility_unapproved_posts_test.php           | 113 ++++++++++-----------
 1 file changed, 56 insertions(+), 57 deletions(-)

(limited to 'tests/functional')

diff --git a/tests/functional/visibility_unapproved_posts_test.php b/tests/functional/visibility_unapproved_posts_test.php
index 4e220ddda2..f29e081977 100644
--- a/tests/functional/visibility_unapproved_posts_test.php
+++ b/tests/functional/visibility_unapproved_posts_test.php
@@ -16,7 +16,7 @@
 */
 class phpbb_functional_visibility_unapproved_test extends phpbb_functional_test_case
 {
-	protected $data = array();
+	protected $data = [];
 
 	public function test_setup_forums()
 	{
@@ -24,13 +24,13 @@ class phpbb_functional_visibility_unapproved_test extends phpbb_functional_test_
 		$this->admin_login();
 
 		$crawler = self::request('GET', "adm/index.php?i=acp_forums&mode=manage&sid={$this->sid}");
-		$form = $crawler->selectButton('addforum')->form(array(
+		$form = $crawler->selectButton('addforum')->form([
 			'forum_name'	=> 'Unapproved Posts Test #1',
-		));
+		]);
 		$crawler = self::submit($form);
-		$form = $crawler->selectButton('update')->form(array(
+		$form = $crawler->selectButton('update')->form([
 			'forum_perm_from'	=> 2,
-		));
+		]);
 		$crawler = self::submit($form);
 
 		// Set flood interval to 0
@@ -40,13 +40,13 @@ class phpbb_functional_visibility_unapproved_test extends phpbb_functional_test_
 	public function test_create_posts()
 	{
 		$this->login();
-		$this->load_ids(array(
-			'forums' => array(
+		$this->load_ids([
+			'forums' => [
 				'Unapproved Posts Test #1',
-			),
-		));
+			],
+		]);
 
-		$this->assert_forum_details($this->data['forums']['Unapproved Posts Test #1'], array(
+		$this->assert_forum_details($this->data['forums']['Unapproved Posts Test #1'], [
 			'forum_posts_approved'		=> 0,
 			'forum_posts_unapproved'	=> 0,
 			'forum_posts_softdeleted'	=> 0,
@@ -54,7 +54,7 @@ class phpbb_functional_visibility_unapproved_test extends phpbb_functional_test_
 			'forum_topics_unapproved'	=> 0,
 			'forum_topics_softdeleted'	=> 0,
 			'forum_last_post_id'		=> 0,
-		), 'initial comparison');
+		], 'initial comparison');
 
 		// Test creating topic #1
 		$post = $this->create_topic($this->data['forums']['Unapproved Posts Test #1'], 'Unapproved Posts Test Topic #1', 'This is a test topic posted by the testing framework.');
@@ -64,7 +64,7 @@ class phpbb_functional_visibility_unapproved_test extends phpbb_functional_test_
 		$this->data['topics']['Unapproved Posts Test Topic #1'] = (int) $post['topic_id'];
 		$this->data['posts']['Unapproved Posts 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']['Unapproved Posts Test #1'], array(
+		$this->assert_forum_details($this->data['forums']['Unapproved Posts Test #1'], [
 			'forum_posts_approved'		=> 1,
 			'forum_posts_unapproved'	=> 0,
 			'forum_posts_softdeleted'	=> 0,
@@ -72,20 +72,20 @@ class phpbb_functional_visibility_unapproved_test extends phpbb_functional_test_
 			'forum_topics_unapproved'	=> 0,
 			'forum_topics_softdeleted'	=> 0,
 			'forum_last_post_id'		=> $this->data['posts']['Unapproved Posts Test Topic #1'],
-		), 'after creating topic #1');
+		], 'after creating topic #1');
 
 		$this->logout();
 		$this->create_user('unapproved_posts_test_user#1');
-		$this->add_user_group('NEWLY_REGISTERED', array('unapproved_posts_test_user#1'));
+		$this->add_user_group('NEWLY_REGISTERED', ['unapproved_posts_test_user#1']);
 		$this->login('unapproved_posts_test_user#1');
 
 		// Test creating a reply
-		$post2 = $this->create_post($this->data['forums']['Unapproved Posts Test #1'], $post['topic_id'], 'Re: Unapproved Posts Test Topic #1-#2', 'This is a test post posted by the testing framework.', array(), 'POST_STORED_MOD');
+		$post2 = $this->create_post($this->data['forums']['Unapproved Posts Test #1'], $post['topic_id'], 'Re: Unapproved Posts Test Topic #1-#2', 'This is a test post posted by the testing framework.', [], 'POST_STORED_MOD');
 
 		$crawler = self::request('GET', "viewtopic.php?t={$this->data['topics']['Unapproved Posts Test Topic #1']}&sid={$this->sid}");
 		$this->assertNotContains('Re: Unapproved Posts Test Topic #1-#2', $crawler->filter('#page-body')->text());
 
-		$this->assert_forum_details($this->data['forums']['Unapproved Posts Test #1'], array(
+		$this->assert_forum_details($this->data['forums']['Unapproved Posts Test #1'], [
 			'forum_posts_approved'		=> 1,
 			'forum_posts_unapproved'	=> 1,
 			'forum_posts_softdeleted'	=> 0,
@@ -93,15 +93,15 @@ class phpbb_functional_visibility_unapproved_test extends phpbb_functional_test_
 			'forum_topics_unapproved'	=> 0,
 			'forum_topics_softdeleted'	=> 0,
 			'forum_last_post_id'		=> $this->data['posts']['Unapproved Posts Test Topic #1'],
-		), 'after replying');
+		], 'after replying');
 
 		// Test creating topic #2
-		$post = $this->create_topic($this->data['forums']['Unapproved Posts Test #1'], 'Unapproved Posts Test Topic #2', 'This is a test topic posted by the testing framework.', array(), 'POST_STORED_MOD');
+		$post = $this->create_topic($this->data['forums']['Unapproved Posts Test #1'], 'Unapproved Posts Test Topic #2', 'This is a test topic posted by the testing framework.', [], 'POST_STORED_MOD');
 		$crawler = self::request('GET', "viewforum.php?f={$this->data['forums']['Unapproved Posts Test #1']}&sid={$this->sid}");
 
 		$this->assertNotContains('Unapproved Posts Test Topic #2', $crawler->filter('html')->text());
 
-		$this->assert_forum_details($this->data['forums']['Unapproved Posts Test #1'], array(
+		$this->assert_forum_details($this->data['forums']['Unapproved Posts Test #1'], [
 			'forum_posts_approved'		=> 1,
 			'forum_posts_unapproved'	=> 2,
 			'forum_posts_softdeleted'	=> 0,
@@ -109,31 +109,31 @@ class phpbb_functional_visibility_unapproved_test extends phpbb_functional_test_
 			'forum_topics_unapproved'	=> 1,
 			'forum_topics_softdeleted'	=> 0,
 			'forum_last_post_id'		=> $this->data['posts']['Unapproved Posts Test Topic #1'],
-		), 'after creating topic #2');
+		], 'after creating topic #2');
 
 		$this->logout();
 	}
 
 	public function test_view_unapproved_post_disabled()
 	{
-        // user who created post
+		// user who created post
 		$this->login('unapproved_posts_test_user#1');
-		$this->load_ids(array(
-			'forums' => array(
+		$this->load_ids([
+			'forums' => [
 				'Unapproved Posts Test #1',
-			),
-			'topics' => array(
+			],
+			'topics' => [
 				'Unapproved Posts Test Topic #1',
 				'Unapproved Posts Test Topic #2',
-			),
-			'posts' => array(
+			],
+			'posts' => [
 				'Unapproved Posts Test Topic #1',
 				'Re: Unapproved Posts Test Topic #1-#2',
 				'Unapproved Posts Test Topic #2',
-			),
-		));
+			],
+		]);
 
-		$this->assert_forum_details($this->data['forums']['Unapproved Posts Test #1'], array(
+		$this->assert_forum_details($this->data['forums']['Unapproved Posts Test #1'], [
 			'forum_posts_approved'		=> 1,
 			'forum_posts_unapproved'	=> 2,
 			'forum_posts_softdeleted'	=> 0,
@@ -141,19 +141,19 @@ class phpbb_functional_visibility_unapproved_test extends phpbb_functional_test_
 			'forum_topics_unapproved'	=> 1,
 			'forum_topics_softdeleted'	=> 0,
 			'forum_last_post_id'		=> $this->data['posts']['Unapproved Posts Test Topic #1'],
-		), 'before approving post');
+		], 'before approving post');
 
 		$this->add_lang('posting');
 		$this->add_lang('viewtopic');
 		$this->add_lang('mcp');
 
-		//should be able to see topic 1 but not unapproved post
+		// should be able to see topic 1 but not unapproved post
 		$crawler = self::request('GET', "viewtopic.php?t={$this->data['topics']['Unapproved Posts Test Topic #1']}&sid={$this->sid}");
 		$this->assertContains('Unapproved Posts Test Topic #1', $crawler->filter('h2')->text());
 		$this->assertNotContains('Re: Unapproved Posts Test Topic #1-#2', $crawler->filter('#page-body')->text());
 		$this->assertNotContains('This post is not visible to other users until it has been approved', $crawler->filter('#page-body')->text());
 
-		//should not be able to see topic 2
+		// should not be able to see topic 2
 		$crawler = self::request('GET', "viewforum.php?f={$this->data['forums']['Unapproved Posts Test #1']}&sid={$this->sid}");
 		$this->assertNotContains('Unapproved Posts Test Topic #2', $crawler->filter('html')->text());
 		$this->logout();
@@ -162,17 +162,15 @@ class phpbb_functional_visibility_unapproved_test extends phpbb_functional_test_
 		$this->create_user('unapproved_posts_test_user#2');
 		$this->login('unapproved_posts_test_user#2');
 
-		$this->add_lang('posting');
-		$this->add_lang('viewtopic');
-		$this->add_lang('mcp');
+		$this->add_lang('posting', 'viewtopic', 'mcp');
 
-		//should be able to see topic 1 but not unapproved post
+		// should be able to see topic 1 but not unapproved post
 		$crawler = self::request('GET', "viewtopic.php?t={$this->data['topics']['Unapproved Posts Test Topic #1']}&sid={$this->sid}");
 		$this->assertContains('Unapproved Posts Test Topic #1', $crawler->filter('h2')->text());
 		$this->assertNotContains('Re: Unapproved Posts Test Topic #1-#2', $crawler->filter('#page-body')->text());
 		$this->assertNotContains('This post is not visible to other users until it has been approved', $crawler->filter('#page-body')->text());
 
-		//should not be able to see topic 2
+		// should not be able to see topic 2
 		$crawler = self::request('GET', "viewforum.php?f={$this->data['forums']['Unapproved Posts Test #1']}&sid={$this->sid}");
 		$this->assertNotContains('Unapproved Posts Test Topic #2', $crawler->filter('html')->text());
 	}
@@ -181,24 +179,24 @@ class phpbb_functional_visibility_unapproved_test extends phpbb_functional_test_
 	{
 		$this->config_display_unapproved_posts_state(true);
 
-        // user who created post
+		// user who created post
 		$this->login('unapproved_posts_test_user#1');
-		$this->load_ids(array(
-			'forums' => array(
+		$this->load_ids([
+			'forums' => [
 				'Unapproved Posts Test #1',
-			),
-			'topics' => array(
+			],
+			'topics' => [
 				'Unapproved Posts Test Topic #1',
 				'Unapproved Posts Test Topic #2',
-			),
-			'posts' => array(
+			],
+			'posts' => [
 				'Unapproved Posts Test Topic #1',
 				'Re: Unapproved Posts Test Topic #1-#2',
 				'Unapproved Posts Test Topic #2',
-			),
-		));
+			],
+		]);
 
-		$this->assert_forum_details($this->data['forums']['Unapproved Posts Test #1'], array(
+		$this->assert_forum_details($this->data['forums']['Unapproved Posts Test #1'], [
 			'forum_posts_approved'		=> 1,
 			'forum_posts_unapproved'	=> 2,
 			'forum_posts_softdeleted'	=> 0,
@@ -206,22 +204,23 @@ class phpbb_functional_visibility_unapproved_test extends phpbb_functional_test_
 			'forum_topics_unapproved'	=> 1,
 			'forum_topics_softdeleted'	=> 0,
 			'forum_last_post_id'		=> $this->data['posts']['Unapproved Posts Test Topic #1'],
-		), 'before approving post');
+		], 'before approving post');
 
 		$this->add_lang('posting');
 		$this->add_lang('viewtopic');
 		$this->add_lang('mcp');
 
-		//should be able to see topic 1 and unapproved post
+		// should be able to see topic 1 and unapproved post
 		$crawler = self::request('GET', "viewtopic.php?t={$this->data['topics']['Unapproved Posts Test Topic #1']}&sid={$this->sid}");
 		$this->assertContains('Unapproved Posts Test Topic #1', $crawler->filter('h2')->text());
 		$this->assertContains('Re: Unapproved Posts Test Topic #1-#2', $crawler->filter('#page-body')->text());
 		$this->assertContains('This post is not visible to other users until it has been approved', $crawler->filter('#page-body')->text());
 
-		//should be able to see topic 2
+		// should be able to see topic 2
 		$crawler = self::request('GET', "viewforum.php?f={$this->data['forums']['Unapproved Posts Test #1']}&sid={$this->sid}");
 		$this->assertContains('Unapproved Posts Test Topic #2', $crawler->filter('html')->text());
-		//should be able to see post in topic 2
+
+		// should be able to see post in topic 2
 		$crawler = self::request('GET', "viewtopic.php?t={$this->data['topics']['Unapproved Posts Test Topic #2']}&sid={$this->sid}");
 		$this->assertContains('Unapproved Posts Test Topic #2', $crawler->filter('#page-body')->text());
 		$this->assertContains('This post is not visible to other users until it has been approved', $crawler->filter('#page-body')->text());
@@ -234,13 +233,13 @@ class phpbb_functional_visibility_unapproved_test extends phpbb_functional_test_
 		$this->add_lang('viewtopic');
 		$this->add_lang('mcp');
 
-		//should be able to see topic 1 but not unapproved post
+		// should be able to see topic 1 but not unapproved post
 		$crawler = self::request('GET', "viewtopic.php?t={$this->data['topics']['Unapproved Posts Test Topic #1']}&sid={$this->sid}");
 		$this->assertContains('Unapproved Posts Test Topic #1', $crawler->filter('h2')->text());
 		$this->assertNotContains('Re: Unapproved Posts Test Topic #1-#2', $crawler->filter('#page-body')->text());
 		$this->assertNotContains('This post is not visible to other users until it has been approved', $crawler->filter('#page-body')->text());
 
-		//should not be able to see topic 2
+		// should not be able to see topic 2
 		$crawler = self::request('GET', "viewforum.php?f={$this->data['forums']['Unapproved Posts Test #1']}&sid={$this->sid}");
 		$this->assertNotContains('Unapproved Posts Test Topic #2', $crawler->filter('html')->text());
 		$this->logout();
@@ -274,12 +273,12 @@ class phpbb_functional_visibility_unapproved_test extends phpbb_functional_test_
 
 	protected function set_flood_interval($flood_interval)
 	{
-		$crawler = self::request('GET', 'adm/index.php?sid=' . $this->sid . '&i=acp_board&mode=post');
+		$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;
+		$values['config[flood_interval]'] = $flood_interval;
 		$form->setValues($values);
 		$crawler = self::submit($form);
 		$this->assertGreaterThan(0, $crawler->filter('.successbox')->count());
@@ -291,7 +290,7 @@ class phpbb_functional_visibility_unapproved_test extends phpbb_functional_test_
 
 		if (!empty($data['forums']))
 		{
-			$sql = 'SELECT *
+			$sql = 'SELECT forum_id, forum_name
 				FROM phpbb_forums
 				WHERE ' . $this->db->sql_in_set('forum_name', $data['forums']);
 			$result = $this->db->sql_query($sql);
-- 
cgit v1.2.1


From 29be971fad6ba90c147d0fd8b2d07d69e5efddec Mon Sep 17 00:00:00 2001
From: v12mike <v12mike.git@ingenious.co.nz>
Date: Tue, 19 Nov 2019 07:20:44 -0500
Subject: [ticket/9837] Make unapproved posts visible to author

review comments

PHPBB3-9837
---
 tests/functional/visibility_unapproved_posts_test.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'tests/functional')

diff --git a/tests/functional/visibility_unapproved_posts_test.php b/tests/functional/visibility_unapproved_posts_test.php
index f29e081977..2fb2ef3403 100644
--- a/tests/functional/visibility_unapproved_posts_test.php
+++ b/tests/functional/visibility_unapproved_posts_test.php
@@ -244,8 +244,8 @@ class phpbb_functional_visibility_unapproved_test extends phpbb_functional_test_
 		$this->assertNotContains('Unapproved Posts Test Topic #2', $crawler->filter('html')->text());
 		$this->logout();
 
-		// revert the configuration
-		$this->config_display_unapproved_posts_state(false);
+		// revert the configuration (if necessary)
+		//$this->config_display_unapproved_posts_state(false);
 	}
 
 	public function test_reset_flood_interval()
-- 
cgit v1.2.1


From 4a10062933d9e221e4efd813058adae4c87f3fc2 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Thu, 21 Nov 2019 13:40:05 +0100
Subject: [ticket/9837] Remove not needed lines in test

PHPBB3-9837
---
 tests/functional/visibility_unapproved_posts_test.php | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'tests/functional')

diff --git a/tests/functional/visibility_unapproved_posts_test.php b/tests/functional/visibility_unapproved_posts_test.php
index 2fb2ef3403..9f6491d1d8 100644
--- a/tests/functional/visibility_unapproved_posts_test.php
+++ b/tests/functional/visibility_unapproved_posts_test.php
@@ -243,9 +243,6 @@ class phpbb_functional_visibility_unapproved_test extends phpbb_functional_test_
 		$crawler = self::request('GET', "viewforum.php?f={$this->data['forums']['Unapproved Posts Test #1']}&sid={$this->sid}");
 		$this->assertNotContains('Unapproved Posts Test Topic #2', $crawler->filter('html')->text());
 		$this->logout();
-
-		// revert the configuration (if necessary)
-		//$this->config_display_unapproved_posts_state(false);
 	}
 
 	public function test_reset_flood_interval()
-- 
cgit v1.2.1