diff options
Diffstat (limited to 'tests/functional')
| -rw-r--r-- | tests/functional/browse_test.php | 14 | ||||
| -rw-r--r-- | tests/functional/controllers_compatibility_test.php | 56 | ||||
| -rw-r--r-- | tests/functional/extension_module_test.php | 11 | ||||
| -rw-r--r-- | tests/functional/feed_test.php | 133 | ||||
| -rw-r--r-- | tests/functional/fileupload_remote_test.php | 71 | ||||
| -rw-r--r-- | tests/functional/fixtures/ext/foo/bar/acp/main_info.php | 1 | ||||
| -rw-r--r-- | tests/functional/fixtures/ext/foo/bar/ucp/main_info.php | 1 | ||||
| -rw-r--r-- | tests/functional/forum_style_test.php | 24 | ||||
| -rw-r--r-- | tests/functional/notification_test.php | 10 | ||||
| -rw-r--r-- | tests/functional/posting_test.php | 91 | ||||
| -rw-r--r-- | tests/functional/private_messages_test.php | 41 | ||||
| -rw-r--r-- | tests/functional/report_post_captcha_test.php | 7 | ||||
| -rw-r--r-- | tests/functional/search/base.php | 7 | 
13 files changed, 354 insertions, 113 deletions
| diff --git a/tests/functional/browse_test.php b/tests/functional/browse_test.php index b9e74a280f..280e814c06 100644 --- a/tests/functional/browse_test.php +++ b/tests/functional/browse_test.php @@ -34,9 +34,21 @@ class phpbb_functional_browse_test extends phpbb_functional_test_case  		$this->assertGreaterThan(0, $crawler->filter('.postbody')->count());  	} +	public function test_help_faq() +	{ +		$crawler = self::request('GET', 'app.php/help/faq'); +		$this->assertGreaterThan(0, $crawler->filter('h2.faq-title')->count()); +	} + +	public function test_help_bbcode() +	{ +		$crawler = self::request('GET', 'app.php/help/bbcode'); +		$this->assertGreaterThan(0, $crawler->filter('h2.faq-title')->count()); +	} +  	public function test_feed()  	{ -		$crawler = self::request('GET', 'feed.php', array(), false); +		$crawler = self::request('GET', 'app.php/feed', array(), false);  		self::assert_response_xml();  		$this->assertGreaterThan(0, $crawler->filter('entry')->count());  	} diff --git a/tests/functional/controllers_compatibility_test.php b/tests/functional/controllers_compatibility_test.php new file mode 100644 index 0000000000..9499888a1a --- /dev/null +++ b/tests/functional/controllers_compatibility_test.php @@ -0,0 +1,56 @@ +<?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_controllers_compatibility_test extends phpbb_functional_test_case +{ +	public function test_report_compatibility() +	{ +		$this->assert301('report.php?f=1&p=1', 'app.php/post/1/report'); +		$this->assert301('report.php?p=1', 'app.php/post/1/report'); +		$this->assert301('report.php?pm=1', 'app.php/pm/1/report'); +	} + +	public function test_feed_compatibility() +	{ +		$this->assert301('feed.php', 'app.php/feed'); +		$this->assert301('feed.php?mode=foobar', 'app.php/feed/foobar'); +		$this->assert301('feed.php?mode=news', 'app.php/feed/news'); +		$this->assert301('feed.php?mode=topics', 'app.php/feed/topics'); +		$this->assert301('feed.php?mode=topics_news', 'app.php/feed/topics_news'); +		$this->assert301('feed.php?mode=topics_active', 'app.php/feed/topics_active'); +		$this->assert301('feed.php?mode=forums', 'app.php/feed/forums'); +		$this->assert301('feed.php?f=1', 'app.php/feed/forum/1'); +		$this->assert301('feed.php?t=1', 'app.php/feed/topic/1'); +	} + +	protected function assert301($from, $to) +	{ +		self::$client->followRedirects(false); +		self::request('GET', $from, array(), false); + +		// Fix sid issues +		$location = self::$client->getResponse()->getHeader('Location'); +		$location = preg_replace('#sid=[^&]+(&(amp;)?)?#', '', $location); +		if (substr($location, -1) === '?') +		{ +			$location = substr($location, 0, -1); +		} + +		$this->assertEquals(301, self::$client->getResponse()->getStatus()); +		$this->assertStringEndsWith($to, $location); +	} +} diff --git a/tests/functional/extension_module_test.php b/tests/functional/extension_module_test.php index ee084720e4..95107665cd 100644 --- a/tests/functional/extension_module_test.php +++ b/tests/functional/extension_module_test.php @@ -49,8 +49,9 @@ class phpbb_functional_extension_module_test extends phpbb_functional_test_case  		$this->phpbb_extension_manager = $this->get_extension_manager();  		$this->phpbb_extension_manager->enable('foo/bar'); -		$modules = new acp_modules();  		$db = $this->get_db(); +		$cache = $this->get_cache_driver(); +		$modules = new \phpbb\module\module_manager($cache, $db, $this->phpbb_extension_manager, MODULES_TABLE, dirname(__FILE__) . '/../../phpBB/', 'php');  		$sql = 'SELECT module_id  			FROM ' . MODULES_TABLE . " @@ -70,7 +71,7 @@ class phpbb_functional_extension_module_test extends phpbb_functional_test_case  			'module_mode'		=> '',  			'module_auth'		=> '',  		); -		$modules->update_module_data($parent_data, true); +		$modules->update_module_data($parent_data);  		$module_data = array(  			'module_basename'	=> 'foo\\bar\\acp\\main_module', @@ -82,7 +83,7 @@ class phpbb_functional_extension_module_test extends phpbb_functional_test_case  			'module_mode'		=> 'mode',  			'module_auth'		=> '',  		); -		$modules->update_module_data($module_data, true); +		$modules->update_module_data($module_data);  		$parent_data = array(  			'module_basename'	=> '', @@ -94,7 +95,7 @@ class phpbb_functional_extension_module_test extends phpbb_functional_test_case  			'module_mode'		=> '',  			'module_auth'		=> '',  		); -		$modules->update_module_data($parent_data, true); +		$modules->update_module_data($parent_data);  		$module_data = array(  			'module_basename'	=> 'foo\\bar\\ucp\\main_module', @@ -106,7 +107,7 @@ class phpbb_functional_extension_module_test extends phpbb_functional_test_case  			'module_mode'		=> 'mode',  			'module_auth'		=> '',  		); -		$modules->update_module_data($module_data, true); +		$modules->update_module_data($module_data);  		$this->purge_cache();  	} diff --git a/tests/functional/feed_test.php b/tests/functional/feed_test.php index ad5c4a5cab..16afced238 100644 --- a/tests/functional/feed_test.php +++ b/tests/functional/feed_test.php @@ -11,6 +11,8 @@  *  */ +require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php'; +  /**  * @group functional  */ @@ -24,9 +26,9 @@ class phpbb_functional_feed_test extends phpbb_functional_test_case  	{  		parent::__construct($name, $data, $dataName); -		$this->backupStaticAttributesBlacklist += array( -			'phpbb_functional_feed_test' => array('init_values'), -		); +		$this->backupStaticAttributesBlacklist['phpbb_functional_feed_test'] = array('init_values'); + +		$this->purge_cache();  	}  	public function test_setup_config_before_state() @@ -55,66 +57,64 @@ class phpbb_functional_feed_test extends phpbb_functional_test_case  		$form->setValues($values);  		$crawler = self::submit($form); -		$this->assertContainsLang('CONFIG_UPDATED', $crawler->filter('.successbox')->text()); +		self::assertContainsLang('CONFIG_UPDATED', $crawler->filter('.successbox')->text());  		// Special config (Guest can't see attachments)  		$this->add_lang('acp/permissions');  		$crawler = self::request('GET', "adm/index.php?i=acp_permissions&sid={$this->sid}&icat=16&mode=setting_group_global&group_id[0]=1"); -		$this->assertContains($this->lang('ACL_SET'), $crawler->filter('h1')->eq(1)->text()); +		self::assertContains($this->lang('ACL_SET'), $crawler->filter('h1')->eq(1)->text());  		$form = $crawler->selectButton($this->lang('APPLY_PERMISSIONS'))->form();  		$form['setting[1][0][u_download]']->select(-1);  		$crawler = self::submit($form); -		$this->assertContainsLang('AUTH_UPDATED', $crawler->filter('.successbox')->text()); +		self::assertContainsLang('AUTH_UPDATED', $crawler->filter('.successbox')->text());  	}  	public function test_dump_board_state()  	{ -		$crawler = self::request('GET', 'feed.php?mode=forums', array(), false); +		$crawler = self::request('GET', 'app.php/feed/forums', array(), false);  		self::assert_response_xml();  		self::$init_values['disapprove_user']['forums_value'] = $crawler->filterXPath('//entry')->count(); -		$crawler = self::request('GET', 'feed.php?mode=overall', array(), false); +		$crawler = self::request('GET', 'app.php/feed/overall', array(), false);  		self::assert_response_xml();  		self::$init_values['disapprove_user']['overall_value'] = $crawler->filterXPath('//entry')->count(); -		$crawler = self::request('GET', 'feed.php?mode=topics', array(), false); +		$crawler = self::request('GET', 'app.php/feed/topics', array(), false);  		self::assert_response_xml();  		self::$init_values['disapprove_user']['topics_value'] = $crawler->filterXPath('//entry')->count(); -		$crawler = self::request('GET', 'feed.php?mode=topics_new', array(), false); +		$crawler = self::request('GET', 'app.php/feed/topics_new', array(), false);  		self::assert_response_xml();  		self::$init_values['disapprove_user']['topics_new_value'] = $crawler->filterXPath('//entry')->count(); -		$crawler = self::request('GET', 'feed.php?mode=topics_active', array(), false); +		$crawler = self::request('GET', 'app.php/feed/topics_active', array(), false);  		self::assert_response_xml();  		self::$init_values['disapprove_user']['topics_active_value'] = $crawler->filterXPath('//entry')->count();  		$this->login(); -		$crawler = self::request('GET', 'feed.php?mode=forums', array(), false); +		$crawler = self::request('GET', 'app.php/feed/forums', array(), false);  		self::assert_response_xml();  		self::$init_values['admin']['forums_value'] = $crawler->filterXPath('//entry')->count(); -		$crawler = self::request('GET', 'feed.php?mode=overall', array(), false); +		$crawler = self::request('GET', 'app.php/feed/overall', array(), false);  		self::assert_response_xml();  		self::$init_values['admin']['overall_value'] = $crawler->filterXPath('//entry')->count(); -		$crawler = self::request('GET', 'feed.php?mode=topics', array(), false); +		$crawler = self::request('GET', 'app.php/feed/topics', array(), false);  		self::assert_response_xml();  		self::$init_values['admin']['topics_value'] = $crawler->filterXPath('//entry')->count(); -		$crawler = self::request('GET', 'feed.php?mode=topics_new', array(), false); +		$crawler = self::request('GET', 'app.php/feed/topics_new', array(), false);  		self::assert_response_xml();  		self::$init_values['admin']['topics_new_value'] = $crawler->filterXPath('//entry')->count(); -		$crawler = self::request('GET', 'feed.php?mode=topics_active', array(), false); +		$crawler = self::request('GET', 'app.php/feed/topics_active', array(), false);  		self::assert_response_xml();  		self::$init_values['admin']['topics_active_value'] = $crawler->filterXPath('//entry')->count(); - -  	}  	public function test_setup_forums() @@ -132,7 +132,7 @@ class phpbb_functional_feed_test extends phpbb_functional_test_case  		$form = $crawler->selectButton('update')->form(array(  			'forum_perm_from'	=> 2,  		)); -		$crawler = self::submit($form); +		self::submit($form);  		$this->load_ids(array(  			'forums' => array( @@ -149,7 +149,7 @@ class phpbb_functional_feed_test extends phpbb_functional_test_case  		$form = $crawler->selectButton('update')->form(array(  			'forum_perm_from'	=> 2,  		)); -		$crawler = self::submit($form); +		self::submit($form);  		// 'Feeds #news' will be used for feed.php?mode=news  		$crawler = self::request('GET', "adm/index.php?i=acp_forums&mode=manage&sid={$this->sid}"); @@ -160,9 +160,9 @@ class phpbb_functional_feed_test extends phpbb_functional_test_case  		$form = $crawler->selectButton('update')->form(array(  			'forum_perm_from'	=> 2,  		)); -		$crawler = self::submit($form); +		self::submit($form); -		// 'Feeds #exclude' will not be displayed on feed.php?mode=forums +		// 'Feeds #exclude' will not be displayed on app.php/feed/forums  		$crawler = self::request('GET', "adm/index.php?i=acp_forums&mode=manage&sid={$this->sid}");  		$form = $crawler->selectButton('addforum')->form(array(  			'forum_name'	=> 'Feeds #exclude', @@ -171,7 +171,7 @@ class phpbb_functional_feed_test extends phpbb_functional_test_case  		$form = $crawler->selectButton('update')->form(array(  			'forum_perm_from'	=> 2,  		)); -		$crawler = self::submit($form); +		self::submit($form);  	}  	public function test_setup_config_after_forums() @@ -195,7 +195,7 @@ class phpbb_functional_feed_test extends phpbb_functional_test_case  		$form['feed_exclude_id']->select(array($this->data['forums']['Feeds #exclude']));  		$crawler = self::submit($form); -		$this->assertContainsLang('CONFIG_UPDATED', $crawler->filter('.successbox')->text()); +		self::assertContainsLang('CONFIG_UPDATED', $crawler->filter('.successbox')->text());  	}  	public function test_feeds_empty() @@ -266,6 +266,7 @@ class phpbb_functional_feed_test extends phpbb_functional_test_case  					'id' => $this->data['forums']['Feeds #exclude'],  					'contents_lang' => array('NO_FEED'),  					'invalid' => true, +					'response_code' => 404,  				),  			),  			't' => array( @@ -273,6 +274,7 @@ class phpbb_functional_feed_test extends phpbb_functional_test_case  					'id' => $this->data['topics']['Feeds #exclude - Topic #1'],  					'contents_lang' => array('NO_FEED'),  					'invalid' => true, +					'response_code' => 404,  				),  			),  			'overall' => array( @@ -325,7 +327,7 @@ class phpbb_functional_feed_test extends phpbb_functional_test_case  		$post = $this->create_topic($this->data['forums']['Feeds #news'], 'Feeds #news - Topic #2', '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('Feeds #news - Topic #2', $crawler->filter('html')->text()); +		self::assertContains('Feeds #news - Topic #2', $crawler->filter('html')->text());  		$this->data['topics']['Feeds #news - Topic #2'] = (int) $post['topic_id'];  		$this->data['posts']['Feeds #news - Topic #2'] = (int) $this->get_parameter_from_link($crawler->filter('.post')->selectLink($this->lang('POST', '', ''))->link()->getUri(), 'p'); @@ -333,7 +335,7 @@ class phpbb_functional_feed_test extends phpbb_functional_test_case  		$post2 = $this->create_post($this->data['forums']['Feeds #news'], $post['topic_id'], 'Re: Feeds #news - Topic #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: Feeds #news - Topic #2', $crawler->filter('html')->text()); +		self::assertContains('Re: Feeds #news - Topic #2', $crawler->filter('html')->text());  		$this->data['posts']['Re: Feeds #news - Topic #2'] = (int) $post2['post_id'];  	} @@ -489,7 +491,7 @@ class phpbb_functional_feed_test extends phpbb_functional_test_case  		$post2 = $this->create_post($this->data['forums']['Feeds #1'], $post['topic_id'], 'Re: Feeds #1 - Topic #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: Feeds #1 - Topic #2', $crawler->filter('html')->text()); +		self::assertContains('Re: Feeds #1 - Topic #2', $crawler->filter('html')->text());  		$this->data['posts']['Re: Feeds #1 - Topic #2'] = (int) $post2['post_id'];  	} @@ -510,14 +512,14 @@ class phpbb_functional_feed_test extends phpbb_functional_test_case  		$this->add_lang('posting');  		$crawler = self::request('GET', "posting.php?mode=delete&f={$this->data['forums']['Feeds #1']}&p={$this->data['posts']['Re: Feeds #1 - Topic #2']}&sid={$this->sid}"); -		$this->assertContainsLang('DELETE_PERMANENTLY', $crawler->text()); +		self::assertContainsLang('DELETE_PERMANENTLY', $crawler->text());  		$form = $crawler->selectButton('Yes')->form();  		$crawler = self::submit($form); -		$this->assertContainsLang('POST_DELETED', $crawler->text()); +		self::assertContainsLang('POST_DELETED', $crawler->text());  		$crawler = self::request('GET', "viewtopic.php?t={$this->data['topics']['Feeds #1 - Topic #2']}&sid={$this->sid}"); -		$this->assertContains($this->lang('POST_DISPLAY', '', ''), $crawler->text()); +		self::assertContains($this->lang('POST_DISPLAY', '', ''), $crawler->text());  	}  	public function test_feeds_softdeleted_post_admin() @@ -609,15 +611,15 @@ class phpbb_functional_feed_test extends phpbb_functional_test_case  		$this->add_lang('posting');  		$crawler = $this->get_quickmod_page($this->data['topics']['Feeds #1 - Topic #2'], 'DELETE_TOPIC'); -		$this->assertContainsLang('DELETE_PERMANENTLY', $crawler->text()); +		self::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()); +		self::assertContainsLang('TOPIC_DELETED_SUCCESS', $crawler->text());  		$crawler = self::request('GET', "viewtopic.php?t={$this->data['topics']['Feeds #1 - Topic #2']}&sid={$this->sid}"); -		$this->assertContains('Feeds #1 - Topic #2', $crawler->filter('h2')->text()); +		self::assertContains('Feeds #1 - Topic #2', $crawler->filter('h2')->text());  	}  	public function test_feeds_softdeleted_topic_admin() @@ -710,8 +712,9 @@ class phpbb_functional_feed_test extends phpbb_functional_test_case  			't' => array(  				array(  					'id' => $this->data['topics']['Feeds #1 - Topic #2'], -					'contents_lang' => array('SORRY_AUTH_READ'), +					'contents_lang' => array('SORRY_AUTH_READ_TOPIC'),  					'invalid' => true, +					'response_code' => 403,  				),  			),  			'overall' => array( @@ -752,10 +755,10 @@ class phpbb_functional_feed_test extends phpbb_functional_test_case  		// Test creating a reply  		$this->login('disapprove_user'); -		$post2 = $this->create_post($this->data['forums']['Feeds #1.1'], $post['topic_id'], 'Re: Feeds #1.1 - Topic #2', 'This is a test post posted by the testing framework.', array(), 'POST_STORED_MOD'); +		$this->create_post($this->data['forums']['Feeds #1.1'], $post['topic_id'], 'Re: Feeds #1.1 - Topic #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']['Feeds #1.1 - Topic #2']}&sid={$this->sid}"); -		$this->assertNotContains('Re: Feeds #1.1 - Topic #2', $crawler->filter('html')->text()); +		self::assertNotContains('Re: Feeds #1.1 - Topic #2', $crawler->filter('html')->text());  	}  	public function test_feeds_unapproved_post_admin() @@ -847,7 +850,7 @@ class phpbb_functional_feed_test extends phpbb_functional_test_case  		$this->data['topics']['Feeds #1 - Topic #3'] = (int) $post['topic_id'];  		$crawler = self::request('GET', "viewforum.php?f={$this->data['forums']['Feeds #1.1']}&sid={$this->sid}"); -		$this->assertNotContains('Feeds #1.1 - Topic #3', $crawler->filter('html')->text()); +		self::assertNotContains('Feeds #1.1 - Topic #3', $crawler->filter('html')->text());  		$this->logout();  		$this->set_flood_interval(15); @@ -863,10 +866,10 @@ class phpbb_functional_feed_test extends phpbb_functional_test_case  		$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()); +		self::assertGreaterThan(0, $crawler->filter('.successbox')->count());  		$this->logout();  	} @@ -958,8 +961,9 @@ class phpbb_functional_feed_test extends phpbb_functional_test_case  			't' => array(  				array(  					'id' => $this->data['topics']['Feeds #1.1 - Topic #3'], -					'contents_lang' => array('SORRY_AUTH_READ'), +					'contents_lang' => array('SORRY_AUTH_READ_TOPIC'),  					'invalid' => true, +					'response_code' => 403,  				),  			),  			'overall' => array( @@ -998,7 +1002,7 @@ class phpbb_functional_feed_test extends phpbb_functional_test_case  		$post = $this->create_topic($this->data['forums']['Feeds #1'], 'Feeds #1 - Topic #3', 'This is a test topic posted by the testing framework. [attachment=0]Attachment #0[/attachment]', array('upload_files' => 1));  		$crawler = self::request('GET', "viewtopic.php?t={$post['topic_id']}&sid={$this->sid}"); -		$this->assertContains('Feeds #1 - Topic #3', $crawler->filter('html')->text()); +		self::assertContains('Feeds #1 - Topic #3', $crawler->filter('html')->text());  		$this->data['topics']['Feeds #1 - Topic #3'] = (int) $post['topic_id'];  	} @@ -1216,7 +1220,7 @@ class phpbb_functional_feed_test extends phpbb_functional_test_case  		$post2 = $this->create_post($this->data['forums']['Feeds #1'], $this->data['topics']['Feeds #1 - Topic #3'], 'Re: Feeds #1 - Topic #3-1', 'This is a test post posted by the testing framework. [attachment=0]Attachment #0[/attachment]');  		$crawler = self::request('GET', "viewtopic.php?t={$post2['topic_id']}&sid={$this->sid}"); -		$this->assertContains('Re: Feeds #1 - Topic #3-1', $crawler->filter('html')->text()); +		self::assertContains('Re: Feeds #1 - Topic #3-1', $crawler->filter('html')->text());  		$this->data['posts']['Re: Feeds #1 - Topic #3-1'] = (int) $post2['post_id'];  	} @@ -1316,9 +1320,14 @@ class phpbb_functional_feed_test extends phpbb_functional_test_case  		{  			foreach ($feeds as $feed_data)  			{ -				if ($mode === 'f' || $mode === 't') +				if ($mode === 'f') +				{ +					$params = "/forum/{$feed_data['id']}"; +					$this->assert_feed($params, $feed_data); +				} +				else if ($mode === 't')  				{ -					$params = "?{$mode}={$feed_data['id']}"; +					$params = "/topic/{$feed_data['id']}";  					$this->assert_feed($params, $feed_data);  				}  				else @@ -1342,10 +1351,10 @@ class phpbb_functional_feed_test extends phpbb_functional_test_case  						case 'news':  							break;  						default: -							$this->fail('Unsupported feed mode: ' . $mode); +							self::fail('Unsupported feed mode: ' . $mode);  					} -					$params = "?mode={$mode}"; +					$params = "/{$mode}";  					$this->assert_feed($params, $feed_data);  				}  			} @@ -1354,19 +1363,19 @@ class phpbb_functional_feed_test extends phpbb_functional_test_case  	protected function assert_feed($params, $data)  	{ -		$crawler = self::request('GET', 'feed.php' . $params, array(), false); +		$crawler = self::request('GET', 'app.php/feed' . $params, array(), false);  		if (empty($data['invalid']))  		{  			self::assert_response_xml(); -			$this->assertEquals($data['nb_entries'], $crawler->filter('entry')->count(), "Tested feed : 'feed.php{$params}'"); +			self::assertEquals($data['nb_entries'], $crawler->filter('entry')->count(), "Tested feed : 'app.php/feed{$params}'");  			if (!empty($data['xpath']))  			{  				foreach($data['xpath'] as $xpath => $count_expected)  				{ -					$this->assertCount($count_expected, $crawler->filterXPath($xpath), "Tested feed : 'feed.php{$params}', Search for {$xpath}"); +					self::assertCount($count_expected, $crawler->filterXPath($xpath), "Tested feed : 'app.php/feed{$params}', Search for {$xpath}");  				}  			} @@ -1375,7 +1384,7 @@ class phpbb_functional_feed_test extends phpbb_functional_test_case  				foreach($data['contents'] as $entry_id => $string)  				{  					$content = $crawler->filterXPath("//entry[{$entry_id}]/content")->text(); -					$this->assertContains($string, $content, "Tested feed : 'feed.php{$params}'"); +					self::assertContains($string, $content, "Tested feed : 'app.php/feed{$params}'");  				}  			} @@ -1384,7 +1393,7 @@ class phpbb_functional_feed_test extends phpbb_functional_test_case  				foreach($data['contents_lang'] as $entry_id => $string)  				{  					$content = $crawler->filterXPath("//entry[{$entry_id}]/content")->text(); -					$this->assertContainsLang($string, $content, "Tested feed : 'feed.php{$params}'"); +					self::assertContainsLang($string, $content, "Tested feed : 'app.php/feed{$params}'");  				}  			} @@ -1392,21 +1401,21 @@ class phpbb_functional_feed_test extends phpbb_functional_test_case  			{  				foreach($data['attachments'] as $entry_id => $attachments)  				{ +					$content = $crawler->filterXPath("//entry[{$entry_id}]/content")->text();  					foreach ($attachments as $i => $attachment)  					{ -						$content = $crawler->filterXPath("//entry[{$entry_id}]/content")->text();  						$url = self::$root_url . "download/file.php?id={$attachment['id']}";  						$string = "Attachment #{$i}";  						if ($attachment['displayed'])  						{ -							$this->assertContains($url, $content, "Tested feed : 'feed.php{$params}'"); -							$this->assertNotContains($string, $content, "Tested feed : 'feed.php{$params}'"); +							self::assertContains($url, $content, "Tested feed : 'app.php/feed{$params}'"); +							self::assertNotContains($string, $content, "Tested feed : 'app.php/feed{$params}'");  						}  						else  						{ -							$this->assertContains($string, $content, "Tested feed : 'feed.php{$params}'"); -							$this->assertNotContains($url, $content, "Tested feed : 'feed.php{$params}'"); +							self::assertContains($string, $content, "Tested feed : 'app.php/feed{$params}'"); +							self::assertNotContains($url, $content, "Tested feed : 'app.php/feed{$params}'");  						}  					}  				} @@ -1414,14 +1423,14 @@ class phpbb_functional_feed_test extends phpbb_functional_test_case  		}  		else  		{ -			self::assert_response_html(); +			self::assert_response_html($data['response_code'] ?: 202);  			if (!empty($data['contents_lang']))  			{ +				$content = $crawler->filter('html')->text();  				foreach($data['contents_lang'] as $string)  				{ -					$content = $crawler->filter('html')->text(); -					$this->assertContainsLang($string, $content, "Tested feed : 'feed.php{$params}'"); +					self::assertContainsLang($string, $content, "Tested feed : 'app.php/feed{$params}'");  				}  			}  		} @@ -1439,7 +1448,7 @@ class phpbb_functional_feed_test extends phpbb_functional_test_case  			$result = $this->db->sql_query($sql);  			while ($row = $this->db->sql_fetchrow($result))  			{ -				if (in_array($row['forum_name'], $data['forums'])) +				if (in_array($row['forum_name'], $data['forums'], false))  				{  					$this->data['forums'][$row['forum_name']] = (int) $row['forum_id'];  				} @@ -1455,7 +1464,7 @@ class phpbb_functional_feed_test extends phpbb_functional_test_case  			$result = $this->db->sql_query($sql);  			while ($row = $this->db->sql_fetchrow($result))  			{ -				if (in_array($row['topic_title'], $data['topics'])) +				if (in_array($row['topic_title'], $data['topics'], false))  				{  					$this->data['topics'][$row['topic_title']] = (int) $row['topic_id'];  				} @@ -1472,7 +1481,7 @@ class phpbb_functional_feed_test extends phpbb_functional_test_case  			$result = $this->db->sql_query($sql);  			while ($row = $this->db->sql_fetchrow($result))  			{ -				if (in_array($row['post_subject'], $data['posts'])) +				if (in_array($row['post_subject'], $data['posts'], false))  				{  					$this->data['posts'][$row['post_subject']] = (int) $row['post_id'];  					$post_ids[] = (int) $row['post_id']; diff --git a/tests/functional/fileupload_remote_test.php b/tests/functional/fileupload_remote_test.php index 6ece150b23..7e0f192b40 100644 --- a/tests/functional/fileupload_remote_test.php +++ b/tests/functional/fileupload_remote_test.php @@ -11,13 +11,29 @@  *  */ -require_once __DIR__ . '/../../phpBB/includes/functions_upload.php'; -  /**   * @group functional   */  class phpbb_functional_fileupload_remote_test extends phpbb_functional_test_case  { +	/** @var \phpbb\filesystem\filesystem_interface */ +	protected $filesystem; + +	/** @var \phpbb\files\factory */ +	protected $factory; + +	/** @var \bantu\IniGetWrapper\IniGetWrapper */ +	protected $php_ini; + +	/** @var \phpbb\language\language */ +	protected $language; + +	/** @var \phpbb\request\request_interface */ +	protected $request; + +	/** @var string phpBB root path */ +	protected $phpbb_root_path; +  	public function setUp()  	{  		parent::setUp(); @@ -25,8 +41,7 @@ class phpbb_functional_fileupload_remote_test extends phpbb_functional_test_case  		// URL  		// Global $config required by unique_id -		// Global $user required by fileupload::remote_upload -		global $config, $user; +		global $config, $phpbb_root_path, $phpEx;  		if (!is_array($config))  		{ @@ -36,8 +51,17 @@ class phpbb_functional_fileupload_remote_test extends phpbb_functional_test_case  		$config['rand_seed'] = '';  		$config['rand_seed_last_update'] = time() + 600; -		$user = new phpbb_mock_user(); -		$user->lang = new phpbb_mock_lang(); +		$this->filesystem = new \phpbb\filesystem\filesystem(); +		$this->language = new \phpbb\language\language(new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx)); +		$this->request = $this->getMock('\phpbb\request\request'); +		$this->php_ini = new \bantu\IniGetWrapper\IniGetWrapper; + +		$container = new phpbb_mock_container_builder(); +		$container->set('files.filespec', new \phpbb\files\filespec($this->filesystem, $this->language, $this->php_ini, new \FastImageSize\FastImageSize(), $this->phpbb_root_path)); +		$this->factory = new \phpbb\files\factory($container); +		$container->set('files.factory', $this->factory); +		$container->set('files.types.remote', new \phpbb\files\types\remote($this->factory, $this->language, $this->php_ini, $this->request, $phpbb_root_path)); +		$this->phpbb_root_path = $phpbb_root_path;  	}  	public function tearDown() @@ -49,30 +73,47 @@ class phpbb_functional_fileupload_remote_test extends phpbb_functional_test_case  	public function test_invalid_extension()  	{ -		$upload = new fileupload('', array('jpg'), 100); -		$file = $upload->remote_upload(self::$root_url . 'develop/blank.gif'); +		/** @var \phpbb\files\upload $upload */ +		$upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->language, $this->php_ini, $this->request, $this->phpbb_root_path); +		$upload->set_error_prefix('') +			->set_allowed_extensions(array('jpg')) +			->set_max_filesize(100); +		$file = $upload->handle_upload('files.types.remote', self::$root_url . 'develop/blank.gif');  		$this->assertEquals('URL_INVALID', $file->error[0]);  	}  	public function test_empty_file()  	{ -		$upload = new fileupload('', array('jpg'), 100); -		$file = $upload->remote_upload(self::$root_url . 'develop/blank.jpg'); +		/** @var \phpbb\files\upload $upload */ +		$upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->language, $this->php_ini, $this->request, $this->phpbb_root_path); +		$upload->set_error_prefix('') +			->set_allowed_extensions(array('jpg')) +			->set_max_filesize(100); +		$file = $upload->handle_upload('files.types.remote', self::$root_url . 'develop/blank.jpg');  		$this->assertEquals('EMPTY_REMOTE_DATA', $file->error[0]);  	}  	public function test_successful_upload()  	{ -		$upload = new fileupload('', array('gif'), 1000); -		$file = $upload->remote_upload(self::$root_url . 'styles/prosilver/theme/images/forum_read.gif'); +		/** @var \phpbb\files\upload $upload */ +		$upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->language, $this->php_ini, $this->request, $this->phpbb_root_path); +		$upload->set_error_prefix('') +			->set_allowed_extensions(array('gif')) +			->set_max_filesize(1000); +		$file = $upload->handle_upload('files.types.remote', self::$root_url . 'styles/prosilver/theme/images/forum_read.gif');  		$this->assertEquals(0, sizeof($file->error)); -		$this->assertTrue(file_exists($file->filename)); +		$this->assertTrue(file_exists($file->get('filename'))); +		$this->assertTrue($file->is_uploaded());  	}  	public function test_too_large()  	{ -		$upload = new fileupload('', array('gif'), 100); -		$file = $upload->remote_upload(self::$root_url . 'styles/prosilver/theme/images/forum_read.gif'); +		/** @var \phpbb\files\upload $upload */ +		$upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->language, $this->php_ini, $this->request, $this->phpbb_root_path); +		$upload->set_error_prefix('') +			->set_allowed_extensions(array('gif')) +			->set_max_filesize(100); +		$file = $upload->handle_upload('files.types.remote', self::$root_url . 'styles/prosilver/theme/images/forum_read.gif');  		$this->assertEquals(1, sizeof($file->error));  		$this->assertEquals('WRONG_FILESIZE', $file->error[0]);  	} diff --git a/tests/functional/fixtures/ext/foo/bar/acp/main_info.php b/tests/functional/fixtures/ext/foo/bar/acp/main_info.php index ec378e0e75..371ab7c967 100644 --- a/tests/functional/fixtures/ext/foo/bar/acp/main_info.php +++ b/tests/functional/fixtures/ext/foo/bar/acp/main_info.php @@ -28,7 +28,6 @@ class main_info  		return array(  			'filename'	=> 'foo\bar\acp\main_module',  			'title'		=> 'ACP_FOOBAR_TITLE', -			'version'	=> '1.0.0',  			'modes'		=> array(  				'mode'		=> array('title' => 'ACP_FOOBAR_MODE', 'auth' => '', 'cat' => array('ACP_FOOBAR_TITLE')),  			), diff --git a/tests/functional/fixtures/ext/foo/bar/ucp/main_info.php b/tests/functional/fixtures/ext/foo/bar/ucp/main_info.php index d34244f800..4c74442639 100644 --- a/tests/functional/fixtures/ext/foo/bar/ucp/main_info.php +++ b/tests/functional/fixtures/ext/foo/bar/ucp/main_info.php @@ -20,7 +20,6 @@ class main_info  		return array(  			'filename'	=> '\foo\bar\ucp\main_module',  			'title'		=> 'ACP_FOOBAR_TITLE', -			'version'	=> '1.0.0',  			'modes'		=> array(  				'mode'		=> array('title' => 'ACP_FOOBAR_MODE', 'auth' => '', 'cat' => array('ACP_FOOBAR_TITLE')),  			), diff --git a/tests/functional/forum_style_test.php b/tests/functional/forum_style_test.php index 65be94f4d0..b3c1115b7f 100644 --- a/tests/functional/forum_style_test.php +++ b/tests/functional/forum_style_test.php @@ -16,16 +16,28 @@  */  class phpbb_functional_forum_style_test extends phpbb_functional_test_case  { +	public function test_font_awesome_style() +	{ +		$crawler = self::request('GET', 'viewtopic.php?t=1&f=2'); +		$this->assertContains('font-awesome.min', $crawler->filter('head > link[rel=stylesheet]')->eq(0)->attr('href')); + +		$crawler = self::request('GET', 'viewtopic.php?t=1'); +		$this->assertContains('font-awesome.min', $crawler->filter('head > link[rel=stylesheet]')->eq(0)->attr('href')); + +		$crawler = self::request('GET', 'viewtopic.php?t=1&view=next'); +		$this->assertContains('font-awesome.min', $crawler->filter('head > link[rel=stylesheet]')->eq(0)->attr('href')); +	} +  	public function test_default_forum_style()  	{  		$crawler = self::request('GET', 'viewtopic.php?t=1&f=2'); -		$this->assertContains('styles/prosilver/', $crawler->filter('head > link[rel=stylesheet]')->attr('href')); +		$this->assertContains('styles/prosilver/', $crawler->filter('head > link[rel=stylesheet]')->eq(1)->attr('href'));  		$crawler = self::request('GET', 'viewtopic.php?t=1'); -		$this->assertContains('styles/prosilver/', $crawler->filter('head > link[rel=stylesheet]')->attr('href')); +		$this->assertContains('styles/prosilver/', $crawler->filter('head > link[rel=stylesheet]')->eq(1)->attr('href'));  		$crawler = self::request('GET', 'viewtopic.php?t=1&view=next'); -		$this->assertContains('styles/prosilver/', $crawler->filter('head > link[rel=stylesheet]')->attr('href')); +		$this->assertContains('styles/prosilver/', $crawler->filter('head > link[rel=stylesheet]')->eq(1)->attr('href'));  	}  	public function test_custom_forum_style() @@ -35,13 +47,13 @@ class phpbb_functional_forum_style_test extends phpbb_functional_test_case  		$db->sql_query('UPDATE ' . FORUMS_TABLE . ' SET forum_style = 2 WHERE forum_id = 2');  		$crawler = self::request('GET', 'viewtopic.php?t=1&f=2'); -		$this->assertContains('styles/test_style/', $crawler->filter('head > link[rel=stylesheet]')->attr('href')); +		$this->assertContains('styles/test_style/', $crawler->filter('head > link[rel=stylesheet]')->eq(1)->attr('href'));  		$crawler = self::request('GET', 'viewtopic.php?t=1'); -		$this->assertContains('styles/test_style/', $crawler->filter('head > link[rel=stylesheet]')->attr('href')); +		$this->assertContains('styles/test_style/', $crawler->filter('head > link[rel=stylesheet]')->eq(1)->attr('href'));  		$crawler = self::request('GET', 'viewtopic.php?t=1&view=next'); -		$this->assertContains('styles/test_style/', $crawler->filter('head > link[rel=stylesheet]')->attr('href')); +		$this->assertContains('styles/test_style/', $crawler->filter('head > link[rel=stylesheet]')->eq(1)->attr('href'));  		$db->sql_query('UPDATE ' . FORUMS_TABLE . ' SET forum_style = 0 WHERE forum_id = 2');  		$this->delete_style(2, 'test_style'); diff --git a/tests/functional/notification_test.php b/tests/functional/notification_test.php index ec03f7a6a4..87c36dd4d1 100644 --- a/tests/functional/notification_test.php +++ b/tests/functional/notification_test.php @@ -11,6 +11,8 @@  *  */ +require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php'; +  /**  * @group functional  */ @@ -21,15 +23,15 @@ class phpbb_functional_notification_test extends phpbb_functional_test_case  		return array(  			// Rows inserted by phpBB/install/schemas/schema_data.sql  			// Also see PHPBB3-11460 -			array('notification.type.post_notification', true), -			array('notification.type.topic_notification', true), +			array('notification.type.post_notification.method.board', true), +			array('notification.type.topic_notification.method.board', true),  			array('notification.type.post_notification.method.email', true),  			array('notification.type.topic_notification.method.email', true),  			// Default behaviour for in-board notifications:  			// If user did not opt-out, in-board notifications are on. -			array('notification.type.bookmark_notification', true), -			array('notification.type.quote_notification', true), +			array('notification.type.bookmark_notification.method.board', true), +			array('notification.type.quote_notification.method.board', true),  			// Default behaviour for email notifications:  			// If user did not opt-in, email notifications are off. diff --git a/tests/functional/posting_test.php b/tests/functional/posting_test.php index 33632a01e1..724c42b289 100644 --- a/tests/functional/posting_test.php +++ b/tests/functional/posting_test.php @@ -45,14 +45,6 @@ class phpbb_functional_posting_test extends phpbb_functional_test_case  		self::create_post(2,  			1, -			'Unsupported characters', -			"This is a test with these weird characters: \xF0\x9F\x88\xB3 \xF0\x9F\x9A\xB6", -			array(), -			'Your message contains the following unsupported characters' -		); - -		self::create_post(2, -			1,  			"Unsupported: \xF0\x9F\x88\xB3 \xF0\x9F\x9A\xB6",  			'This is a test with emoji characters in the topic title.',  			array(), @@ -60,6 +52,40 @@ class phpbb_functional_posting_test extends phpbb_functional_test_case  		);  	} +	public function test_supported_unicode_characters() +	{ +		$this->login(); + +		$post = $this->create_topic(2, 'Test Topic 1', 'This is a test topic posted by the testing framework.'); +		$this->create_post(2, $post['topic_id'], 'Re: Test Topic 1', "This is a test with these weird characters: \xF0\x9F\x84\x90 \xF0\x9F\x84\x91"); +		$crawler = self::request('GET', "viewtopic.php?t={$post['topic_id']}&sid={$this->sid}"); +		$this->assertContains("\xF0\x9F\x84\x90 \xF0\x9F\x84\x91", $crawler->text()); +	} + +	public function test_html_entities() +	{ +		$this->login(); + +		$post = $this->create_topic(2, 'Test Topic 1', 'This is a test topic posted by the testing framework.'); +		$this->create_post(2, $post['topic_id'], 'Re: Test Topic 1', '😀'); +		$crawler = self::request('GET', "viewtopic.php?t={$post['topic_id']}&sid={$this->sid}"); +		$this->assertContains('😀', $crawler->text()); +	} + +	public function test_quote() +	{ +		$text     = 'Test post </textarea>"\' &&amp;'; +		$expected = "(\\[quote=admin[^\\]]*\\]\n" . preg_quote($text) . "\n\\[/quote\\])"; + +		$this->login(); +		$topic = $this->create_topic(2, 'Test Topic 1', 'Test topic'); +		$post  = $this->create_post(2, $topic['topic_id'], 'Re: Test Topic 1', $text); + +		$crawler = self::request('GET', "posting.php?mode=quote&f=2&t={$post['topic_id']}&p={$post['post_id']}&sid={$this->sid}"); + +		$this->assertRegexp($expected, $crawler->filter('textarea#message')->text()); +	} +  	/**  	* @testdox max_quote_depth is applied to the text populating the posting form  	*/ @@ -67,10 +93,10 @@ class phpbb_functional_posting_test extends phpbb_functional_test_case  	{  		$text = '0[quote]1[quote]2[/quote]1[/quote]0';  		$expected = array( -			0 => '[quote="admin"]0[quote]1[quote]2[/quote]1[/quote]0[/quote]', -			1 => '[quote="admin"]00[/quote]', -			2 => '[quote="admin"]0[quote]11[/quote]0[/quote]', -			3 => '[quote="admin"]0[quote]1[quote]2[/quote]1[/quote]0[/quote]', +			0 => '0[quote]1[quote]2[/quote]1[/quote]0', +			1 => '00', +			2 => '0[quote]11[/quote]0', +			3 => '0[quote]1[quote]2[/quote]1[/quote]0',  		);  		$this->login(); @@ -83,7 +109,10 @@ class phpbb_functional_posting_test extends phpbb_functional_test_case  		{  			$this->set_quote_depth($quote_depth);  			$crawler = self::request('GET', $quote_url); -			$this->assertContains($expected_text, $crawler->filter('textarea#message')->text()); +			$this->assertRegexp( +				"(\\[quote=admin[^\\]]*\\]\n?" . preg_quote($expected_text) . "\n?\\[/quote\\])", +				$crawler->filter('textarea#message')->text() +			);  		}  	} @@ -140,4 +169,40 @@ class phpbb_functional_posting_test extends phpbb_functional_test_case  		$crawler = self::submit($form);  		$this->assertEquals(1, $crawler->filter('.successbox')->count());  	} + +	public function test_ticket_8420() +	{ +		$text = '[b][url=http://example.org] :arrow: here[/url][/b]'; + +		$this->login(); +		$crawler = self::request('GET', 'posting.php?mode=post&f=2'); +		$form = $crawler->selectButton('Preview')->form(array( +			'subject' => 'Test subject', +			'message' => $text +		)); +		$crawler = self::submit($form); +		$this->assertEquals($text, $crawler->filter('#message')->text()); +	} + +	public function test_old_signature_in_preview() +	{ +		$sql = 'UPDATE ' . USERS_TABLE . " +			SET user_sig = '[b:2u8sdcwb]My signature[/b:2u8sdcwb]', +				user_sig_bbcode_uid = '2u8sdcwb', +				user_sig_bbcode_bitfield = 'QA==' +			WHERE user_id = 2"; +		$this->get_db()->sql_query($sql); + +		$this->login(); +		$crawler = self::request('GET', 'posting.php?mode=post&f=2'); +		$form = $crawler->selectButton('Preview')->form(array( +			'subject' => 'Test subject', +			'message' => 'My post', +		)); +		$crawler = self::submit($form); +		$this->assertContains( +			'<span style="font-weight: bold">My signature</span>', +			$crawler->filter('#preview .signature')->html() +		); +	}  } diff --git a/tests/functional/private_messages_test.php b/tests/functional/private_messages_test.php index 1f6dc3a979..7fda26fb49 100644 --- a/tests/functional/private_messages_test.php +++ b/tests/functional/private_messages_test.php @@ -66,4 +66,45 @@ class phpbb_functional_private_messages_test extends phpbb_functional_test_case  		$crawler = self::submit($form);  		$this->assertContains($this->lang('CONFIG_UPDATED'), $crawler->filter('.successbox')->text());  	} + +	public function test_quote_post() +	{ +		$text = 'Test post'; + +		$this->login(); +		$topic = $this->create_topic(2, 'Test Topic 1', 'Test topic'); +		$post  = $this->create_post(2, $topic['topic_id'], 'Re: Test Topic 1', $text); + +		$expected = '(\\[quote=admin post_id=' . $post['post_id'] . ' time=\\d+ user_id=2\\]' . $text . '\\[/quote\\])'; + +		$crawler = self::request('GET', 'ucp.php?i=pm&mode=compose&action=quotepost&p=' . $post['post_id'] . '&sid=' . $this->sid); + +		$this->assertRegexp($expected, $crawler->filter('textarea#message')->text()); +	} + +	public function test_quote_pm() +	{ +		$text     = 'This is a test private message sent by the testing framework.'; +		$expected = "(\\[quote=admin time=\\d+ user_id=2\\]\n" . $text . "\n\\[/quote\\])"; + +		$this->login(); +		$message_id = $this->create_private_message('Test', $text, array(2)); + +		$crawler = self::request('GET', 'ucp.php?i=pm&mode=compose&action=quote&p=' . $message_id . '&sid=' . $this->sid); + +		$this->assertRegexp($expected, $crawler->filter('textarea#message')->text()); +	} + +	public function test_quote_forward() +	{ +		$text     = 'This is a test private message sent by the testing framework.'; +		$expected = "[quote=admin]\n" . $text . "\n[/quote]"; + +		$this->login(); +		$message_id = $this->create_private_message('Test', $text, array(2)); + +		$crawler = self::request('GET', 'ucp.php?i=pm&mode=compose&action=forward&f=0&p=' . $message_id . '&sid=' . $this->sid); + +		$this->assertContains($expected, $crawler->filter('textarea#message')->text()); +	}  } diff --git a/tests/functional/report_post_captcha_test.php b/tests/functional/report_post_captcha_test.php index 93a03bd931..36a1a9ee4d 100644 --- a/tests/functional/report_post_captcha_test.php +++ b/tests/functional/report_post_captcha_test.php @@ -18,12 +18,13 @@ class phpbb_functional_report_post_captcha_test extends phpbb_functional_test_ca  {  	public function test_guest_report_post()  	{ -		$crawler = self::request('GET', 'report.php?f=2&p=1'); +		$crawler = self::request('GET', 'app.php/post/1/report', array(), false); +		$this->assert_response_html(403);  		$this->add_lang('mcp');  		$this->assertContains($this->lang('USER_CANNOT_REPORT'), $crawler->filter('html')->text());  		$this->set_reporting_guest(1); -		$crawler = self::request('GET', 'report.php?f=2&p=1'); +		$crawler = self::request('GET', 'app.php/post/1/report');  		$this->assertContains($this->lang('CONFIRM_CODE'), $crawler->filter('html')->text());  		$this->set_reporting_guest(-1);  	} @@ -31,7 +32,7 @@ class phpbb_functional_report_post_captcha_test extends phpbb_functional_test_ca  	public function test_user_report_post()  	{  		$this->login(); -		$crawler = self::request('GET', 'report.php?f=2&p=1'); +		$crawler = self::request('GET', 'app.php/post/1/report');  		$this->assertNotContains($this->lang('CONFIRM_CODE'), $crawler->filter('html')->text());  		$this->add_lang('mcp'); diff --git a/tests/functional/search/base.php b/tests/functional/search/base.php index 1d37d748df..a3cac381d2 100644 --- a/tests/functional/search/base.php +++ b/tests/functional/search/base.php @@ -36,6 +36,8 @@ abstract class phpbb_functional_search_base extends phpbb_functional_test_case  		$this->login();  		$this->admin_login(); +		$this->create_search_index('\phpbb\search\fulltext_native'); +  		$post = $this->create_topic(2, 'Test Topic 1 foosubject', 'This is a test topic posted by the barsearch testing framework.');  		$crawler = self::request('GET', 'adm/index.php?i=acp_search&mode=settings&sid=' . $this->sid); @@ -58,6 +60,7 @@ abstract class phpbb_functional_search_base extends phpbb_functional_test_case  				$this->delete_topic($post['topic_id']);  				$this->markTestSkipped("Search backend is not supported/running");  			} +  			$this->create_search_index();  		} @@ -72,14 +75,14 @@ abstract class phpbb_functional_search_base extends phpbb_functional_test_case  		$this->delete_topic($post['topic_id']);  	} -	protected function create_search_index() +	protected function create_search_index($backend = null)  	{  		$this->add_lang('acp/search');  		$crawler = self::request(  			'POST',  			'adm/index.php?i=acp_search&mode=index&sid=' . $this->sid,  			array( -				'search_type'	=> $this->search_backend, +				'search_type'	=> ( ($backend === null) ? $this->search_backend : $backend ),  				'action'		=> 'create',  				'submit'		=> true,  			) | 
