Merge branch 'develop' into ticket/11215

* develop: (53 commits) [ticket/11671] Update composer.lock [ticket/11671] Update composer.lock [ticket/11671] Add phing as a dependency and upgrade deps [ticket/11668] Move lint test to the end for travis [ticket/11626] Remove last reference to template in ldap [ticket/11626] Remove LDAP dependency on template [develop-olympus] Increment version number to 3.0.13-dev. [develop-olympus] Add changelog for 3.0.12 release. [develop-olympus] Bump version numbers for 3.0.12-RC1 release. [develop-olympus] Bumping version numbers to final for 3.0.12 releases. [ticket/11669] Fix PHP bug #55124 (recursive mkdir on /./) [ticket/11668] Run lint test at the end of the test suite [ticket/11548] Fix test errors in groups test on develop [ticket/11548] Check upload avatar URL the same way as in phpBB 3.0 [ticket/11548] Fix incorrect usage of array_map on acp groups page [ticket/11665] Fix test class name [ticket/11664] Stop creating php.html file in root path in tests [ticket/11665] Can't change file names already sent to set_filenames [ticket/11662] Typos: occured -> occurred [ticket/11662] Typos: occured -> occurred ...
author: David King <imkingdavid@gmail.com> 2013-07-13 11:33:49 -0400
committer: David King <imkingdavid@gmail.com> 2013-07-13 11:33:49 -0400
commit: 2bc918d3f9282de887cc09f830ff35073865366e (patch)
tree: af266a7b312ae4e4f9fdddb952d2f53e5d240c06 /tests
parent: 068d35065278bf52e85fcc96b629d25712f19c26 (diff)
parent: fd10d97cb1e6c43b88b923bab1015cafe03d379c (diff)
download: forums-2bc918d3f9282de887cc09f830ff35073865366e.tar
forums-2bc918d3f9282de887cc09f830ff35073865366e.tar.gz
forums-2bc918d3f9282de887cc09f830ff35073865366e.tar.bz2
forums-2bc918d3f9282de887cc09f830ff35073865366e.tar.xz
forums-2bc918d3f9282de887cc09f830ff35073865366e.zip
13 files changed, 373 insertions, 52 deletions
diff --git a/tests/acp_board/auth_provider/invalid.php b/tests/acp_board/auth_provider/invalid.php
new file mode 100644
index 0000000000..c12851afe6
--- /dev/null
+++ b/tests/acp_board/auth_provider/invalid.php
@@ -0,0 +1,13 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+class phpbb_auth_provider_acp_board_invalid
+{
+
+}
diff --git a/tests/acp_board/auth_provider/valid.php b/tests/acp_board/auth_provider/valid.php
new file mode 100644
index 0000000000..42b14cb0af
--- /dev/null
+++ b/tests/acp_board/auth_provider/valid.php
@@ -0,0 +1,16 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+class phpbb_auth_provider_acp_board_valid extends phpbb_auth_provider_base
+{
+	public function login($username, $password)
+	{
+		return;
+	}
+}
diff --git a/tests/acp_board/select_auth_method_test.php b/tests/acp_board/select_auth_method_test.php
new file mode 100644
index 0000000000..91aa5d1232
--- /dev/null
+++ b/tests/acp_board/select_auth_method_test.php
@@ -0,0 +1,48 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+require_once dirname(__FILE__) . '/../../phpBB/includes/acp/acp_board.php';
+require_once dirname(__FILE__) . '/auth_provider/invalid.php';
+require_once dirname(__FILE__) . '/auth_provider/valid.php';
+
+class phpbb_acp_board_select_auth_method_test extends phpbb_test_case
+{
+	protected $acp_board;
+
+	public static function select_auth_method_data()
+	{
+		return array(
+			array('acp_board_valid', '<option value="acp_board_valid" selected="selected">Acp_board_valid</option>'),
+			array('acp_board_invalid', '<option value="acp_board_valid">Acp_board_valid</option>'),
+		);
+	}
+
+	public function setUp()
+	{
+		parent::setUp();
+
+		global $phpbb_container;
+		$phpbb_container = new phpbb_mock_container_builder();
+
+		$phpbb_container->set('auth.provider_collection', array(
+				'auth.provider.acp_board_valid'		=> new phpbb_auth_provider_acp_board_valid,
+				'auth.provider.acp_board_invalid'	=> new phpbb_auth_provider_acp_board_invalid,
+		));
+
+		$this->acp_board = new acp_board();
+	}
+
+	/**
+	* @dataProvider select_auth_method_data
+	*/
+	public function test_select_auth_method($selected, $expected)
+	{
+		$this->assertEquals($expected, $this->acp_board->select_auth_method($selected));
+	}
+}
diff --git a/tests/functional/common_groups_test.php b/tests/functional/common_groups_test.php
index 8c014aebed..6c6572af62 100644
--- a/tests/functional/common_groups_test.php
+++ b/tests/functional/common_groups_test.php
@@ -36,6 +36,26 @@ abstract class phpbb_functional_common_groups_test extends phpbb_functional_test
 		$this->add_lang(array('ucp', 'acp/groups'));
 	}
 
+	// Enable all avatars in the ACP
+	protected function enable_all_avatars()
+	{
+		$this->add_lang('acp/board');
+
+		$crawler = self::request('GET', 'adm/index.php?i=board&mode=avatar&sid=' . $this->sid);
+		// Check the default entries we should have
+		$this->assertContains($this->lang('ALLOW_REMOTE'), $crawler->text());
+		$this->assertContains($this->lang('ALLOW_AVATARS'), $crawler->text());
+		$this->assertContains($this->lang('ALLOW_LOCAL'), $crawler->text());
+
+		// Now start setting the needed settings
+		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
+		$form['config[allow_avatar_local]']->select(1);
+		$form['config[allow_avatar_remote]']->select(1);
+		$form['config[allow_avatar_remote_upload]']->select(1);
+		$crawler = self::submit($form);
+		$this->assertContains($this->lang('CONFIG_UPDATED'), $crawler->text());
+	}
+
 	public function groups_manage_test_data()
 	{
 		return array(
@@ -60,4 +80,34 @@ abstract class phpbb_functional_common_groups_test extends phpbb_functional_test
 		$crawler = self::submit($form);
 		$this->assertContains($this->lang($expected), $crawler->text());
 	}
+
+	public function group_avatar_min_max_data()
+	{
+		return array(
+			array('avatar_driver_upload', 'avatar_upload_url', 'foo', 'AVATAR_URL_INVALID'),
+			array('avatar_driver_upload', 'avatar_upload_url', 'foobar', 'AVATAR_URL_INVALID'),
+			array('avatar_driver_upload', 'avatar_upload_url', 'http://www.phpbb.com/' . str_repeat('f', 240) . '.png', 'TOO_LONG'),
+			array('avatar_driver_remote', 'avatar_remote_url', 'foo', 'AVATAR_URL_INVALID'),
+			array('avatar_driver_remote', 'avatar_remote_url', 'foobar', 'AVATAR_URL_INVALID'),
+			array('avatar_driver_remote', 'avatar_remote_url', 'http://www.phpbb.com/' . str_repeat('f', 240) . '.png', 'TOO_LONG'),
+		);
+	}
+
+	/**
+	* @dataProvider group_avatar_min_max_data
+	*/
+	public function test_group_avatar_min_max($avatar_type, $form_name, $input, $expected)
+	{
+		$this->login();
+		$this->admin_login();
+		$this->add_lang(array('ucp', 'acp/groups'));
+		$this->enable_all_avatars();
+
+		$crawler = self::request('GET', $this->get_url() . '&g=5&sid=' . $this->sid);
+		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
+		$form['avatar_driver']->setValue($avatar_type);
+		$form[$form_name]->setValue($input);
+		$crawler = self::submit($form);
+		$this->assertContains($this->lang($expected), $crawler->text());
+	}
 }
diff --git a/tests/functional/ucp_groups_test.php b/tests/functional/ucp_groups_test.php
index 1f9749ec15..f48c793ea1 100644
--- a/tests/functional/ucp_groups_test.php
+++ b/tests/functional/ucp_groups_test.php
@@ -50,53 +50,4 @@ class phpbb_functional_ucp_groups_test extends phpbb_functional_common_groups_te
 		$this->assertContains($this->lang('GROUP_UPDATED'), $crawler->text());
 		$this->assertEquals($teampage_settings, $this->get_teampage_settings());
 	}
-
-	// Enable all avatars in the ACP
-	private function enable_all_avatars()
-	{
-		$this->add_lang('acp/board');
-
-		$crawler = self::request('GET', 'adm/index.php?i=board&mode=avatar&sid=' . $this->sid);
-		// Check the default entries we should have
-		$this->assertContains($this->lang('ALLOW_REMOTE'), $crawler->text());
-		$this->assertContains($this->lang('ALLOW_AVATARS'), $crawler->text());
-		$this->assertContains($this->lang('ALLOW_LOCAL'), $crawler->text());
-
-		// Now start setting the needed settings
-		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
-		$form['config[allow_avatar_local]']->select(1);
-		$form['config[allow_avatar_remote]']->select(1);
-		$form['config[allow_avatar_remote_upload]']->select(1);
-		$crawler = self::submit($form);
-		$this->assertContains($this->lang('CONFIG_UPDATED'), $crawler->text());
-	}
-
-	public function group_avatar_min_max_data()
-	{
-		return array(
-			array('uploadurl', 'foo', 'TOO_SHORT'),
-			array('uploadurl', 'foobar', 'AVATAR_URL_INVALID'),
-			array('uploadurl', str_repeat('f', 256), 'TOO_LONG'),
-			array('remotelink', 'foo', 'TOO_SHORT'),
-			array('remotelink', 'foobar', 'AVATAR_URL_INVALID'),
-			array('remotelink', str_repeat('f', 256), 'TOO_LONG'),
-		);
-	}
-
-	/**
-	* @dataProvider group_avatar_min_max_data
-	*/
-	public function test_group_avatar_min_max($form_name, $input, $expected)
-	{
-		$this->login();
-		$this->admin_login();
-		$this->add_lang(array('ucp', 'acp/groups'));
-		$this->enable_all_avatars();
-
-		$crawler = self::request('GET', $this->get_url() . '&g=5&sid=' . $this->sid);
-		$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
-		$form[$form_name]->setValue($input);
-		$crawler = self::submit($form);
-		$this->assertContains($this->lang($expected), $crawler->text());
-	}
 }
diff --git a/tests/mock/sql_insert_buffer.php b/tests/mock/sql_insert_buffer.php
new file mode 100644
index 0000000000..ba09aa8d7f
--- /dev/null
+++ b/tests/mock/sql_insert_buffer.php
@@ -0,0 +1,21 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+class phpbb_mock_sql_insert_buffer extends phpbb_db_sql_insert_buffer
+{
+	public function flush()
+	{
+		return (sizeof($this->buffer)) ? true : false;
+	}
+
+	public function get_buffer()
+	{
+		return $this->buffer;
+	}
+}
diff --git a/tests/notification/convert_test.php b/tests/notification/convert_test.php
new file mode 100644
index 0000000000..4d00fa0a1e
--- /dev/null
+++ b/tests/notification/convert_test.php
@@ -0,0 +1,110 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+require_once dirname(__FILE__) . '/../../phpBB/includes/db/db_tools.php';
+require_once dirname(__FILE__) . '/../mock/sql_insert_buffer.php';
+
+class phpbb_notification_convert_test extends phpbb_database_test_case
+{
+	protected $notifications, $db, $container, $user, $config, $auth, $cache;
+
+	public function getDataSet()
+	{
+		return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/convert.xml');
+	}
+
+	protected function setUp()
+	{
+		parent::setUp();
+
+		global $phpbb_root_path, $phpEx;
+
+		$this->db = $this->new_dbal();
+
+		$this->migration = new phpbb_db_migration_data_310_notification_options_reconvert(
+			new phpbb_config(array()),
+			$this->db,
+			new phpbb_db_tools($this->db),
+			$phpbb_root_path,
+			$phpEx,
+			'phpbb_'
+		);
+	}
+
+	public function test_convert()
+	{
+		$buffer = new phpbb_mock_sql_insert_buffer($this->db, 'phpbb_user_notifications');
+		$this->migration->perform_conversion($buffer, 'phpbb_user_notifications');
+
+		$expected = array_merge(
+			$this->create_expected('post', 1, 'email'),
+			$this->create_expected('topic', 1, 'email'),
+
+			$this->create_expected('post', 2, 'email'),
+			$this->create_expected('topic', 2, 'email'),
+			$this->create_expected('pm', 2, 'email'),
+
+			$this->create_expected('post', 3, 'jabber'),
+			$this->create_expected('topic', 3, 'jabber'),
+
+			$this->create_expected('post', 4, 'jabber'),
+			$this->create_expected('topic', 4, 'jabber'),
+			$this->create_expected('pm', 4, 'jabber'),
+
+			$this->create_expected('post', 5, 'both'),
+			$this->create_expected('topic', 5, 'both'),
+
+			$this->create_expected('post', 6, 'both'),
+			$this->create_expected('topic', 6, 'both'),
+			$this->create_expected('pm', 6, 'both')
+		);
+
+		$this->assertEquals($expected, $buffer->get_buffer());
+	}
+
+	protected function create_expected($type, $user_id, $method = '')
+	{
+		$return = array();
+
+		if ($method !== '')
+		{
+			$return[] = array(
+				'item_type'		=> $type,
+				'item_id'		=> 0,
+				'user_id'		=> $user_id,
+				'method'		=> '',
+				'notify'		=> 1,
+			);
+		}
+
+		if ($method === 'email' || $method === 'both')
+		{
+			$return[] = array(
+				'item_type'		=> $type,
+				'item_id'		=> 0,
+				'user_id'		=> $user_id,
+				'method'		=> 'email',
+				'notify'		=> 1,
+			);
+		}
+
+		if ($method === 'jabber' || $method === 'both')
+		{
+			$return[] = array(
+				'item_type'		=> $type,
+				'item_id'		=> 0,
+				'user_id'		=> $user_id,
+				'method'		=> 'jabber',
+				'notify'		=> 1,
+			);
+		}
+
+		return $return;
+	}
+}
diff --git a/tests/notification/fixtures/convert.xml b/tests/notification/fixtures/convert.xml
new file mode 100644
index 0000000000..3f0a065cc4
--- /dev/null
+++ b/tests/notification/fixtures/convert.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<dataset>
+	<table name="phpbb_users">
+		<column>user_id</column>
+		<column>username</column>
+		<column>username_clean</column>
+		<column>user_notify_type</column>
+		<column>user_notify_pm</column>
+		<column>user_permissions</column>
+		<column>user_sig</column>
+		<column>user_occ</column>
+		<column>user_interests</column>
+		<row>
+			<value>1</value>
+			<value>1</value>
+			<value>1</value>
+			<value>0</value>
+			<value>0</value>
+			<value></value>
+			<value></value>
+			<value></value>
+			<value></value>
+		</row>
+		<row>
+			<value>2</value>
+			<value>2</value>
+			<value>2</value>
+			<value>0</value>
+			<value>1</value>
+			<value></value>
+			<value></value>
+			<value></value>
+			<value></value>
+		</row>
+		<row>
+			<value>3</value>
+			<value>3</value>
+			<value>3</value>
+			<value>1</value>
+			<value>0</value>
+			<value></value>
+			<value></value>
+			<value></value>
+			<value></value>
+		</row>
+		<row>
+			<value>4</value>
+			<value>4</value>
+			<value>4</value>
+			<value>1</value>
+			<value>1</value>
+			<value></value>
+			<value></value>
+			<value></value>
+			<value></value>
+		</row>
+		<row>
+			<value>5</value>
+			<value>5</value>
+			<value>5</value>
+			<value>2</value>
+			<value>0</value>
+			<value></value>
+			<value></value>
+			<value></value>
+			<value></value>
+		</row>
+		<row>
+			<value>6</value>
+			<value>6</value>
+			<value>6</value>
+			<value>2</value>
+			<value>1</value>
+			<value></value>
+			<value></value>
+			<value></value>
+			<value></value>
+		</row>
+	</table>
+</dataset>
diff --git a/tests/template/includephp_test.php b/tests/template/includephp_test.php
index a3dc9bd5c5..ff7b890d11 100644
--- a/tests/template/includephp_test.php
+++ b/tests/template/includephp_test.php
@@ -39,7 +39,7 @@ class phpbb_template_includephp_test extends phpbb_template_template_test_case
 		$this->assertTrue(phpbb_is_absolute($path_to_php));
 		$template_text = "Path is absolute.\n<!-- INCLUDEPHP $path_to_php -->";
 
-		$cache_dir = dirname($phpbb_root_path . 'cache') . '/';
+		$cache_dir = $phpbb_root_path . 'cache/';
 		$fp = fopen($cache_dir . 'includephp_absolute.html', 'w');
 		fputs($fp, $template_text);
 		fclose($fp);
diff --git a/tests/template/template_parser_test.php b/tests/template/template_parser_test.php
new file mode 100644
index 0000000000..c200770adf
--- /dev/null
+++ b/tests/template/template_parser_test.php
@@ -0,0 +1,29 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
+require_once dirname(__FILE__) . '/template_test_case.php';
+
+class phpbb_template_template_parser_test extends phpbb_template_template_test_case
+{
+	public function test_set_filenames()
+	{
+		$this->template->set_filenames(array(
+			'basic'	=> 'basic.html',
+		));
+
+		$this->assertEquals("passpasspass<!-- DUMMY var -->", str_replace(array("\n", "\r", "\t"), '', $this->template->assign_display('basic')));
+
+		$this->template->set_filenames(array(
+			'basic'	=> 'if.html',
+		));
+
+		$this->assertEquals("03!false", str_replace(array("\n", "\r", "\t"), '', $this->template->assign_display('basic')));
+	}
+}
diff --git a/tests/template/template_test.php b/tests/template/template_test.php
index fedfeba33a..802f0c19ba 100644
--- a/tests/template/template_test.php
+++ b/tests/template/template_test.php
@@ -403,7 +403,7 @@ class phpbb_template_template_test extends phpbb_template_template_test_case
 
 		$template_text = '<!-- PHP -->echo "test";<!-- ENDPHP -->';
 
-		$cache_dir = dirname($phpbb_root_path . 'cache') . '/';
+		$cache_dir = $phpbb_root_path . 'cache/';
 		$fp = fopen($cache_dir . 'php.html', 'w');
 		fputs($fp, $template_text);
 		fclose($fp);
diff --git a/tests/template/template_test_case.php b/tests/template/template_test_case.php
index 4a7bf8d168..6d87e5ebc0 100644
--- a/tests/template/template_test_case.php
+++ b/tests/template/template_test_case.php
@@ -33,7 +33,7 @@ class phpbb_template_template_test_case extends phpbb_test_case
 		}
 		catch (Exception $exception)
 		{
-			// reset output buffering even when an error occured
+			// reset output buffering even when an error occurred
 			// PHPUnit turns trigger_error into exceptions as well
 			ob_end_clean();
 			throw $exception;
diff --git a/tests/test_framework/phpbb_test_case_helpers.php b/tests/test_framework/phpbb_test_case_helpers.php
index 50b2bf03ec..3d9cd10f32 100644
--- a/tests/test_framework/phpbb_test_case_helpers.php
+++ b/tests/test_framework/phpbb_test_case_helpers.php
@@ -94,6 +94,9 @@ class phpbb_test_case_helpers
 
 	public function makedirs($path)
 	{
+		// PHP bug #55124 (fixed in 5.4.0)
+		$path = str_replace('/./', '/', $path);
+
 		mkdir($path, 0777, true);
 	}
author	David King <imkingdavid@gmail.com>	2013-07-13 11:33:49 -0400
committer	David King <imkingdavid@gmail.com>	2013-07-13 11:33:49 -0400
commit	2bc918d3f9282de887cc09f830ff35073865366e (patch)
tree	af266a7b312ae4e4f9fdddb952d2f53e5d240c06 /tests
parent	068d35065278bf52e85fcc96b629d25712f19c26 (diff)
parent	fd10d97cb1e6c43b88b923bab1015cafe03d379c (diff)
download	forums-2bc918d3f9282de887cc09f830ff35073865366e.tar forums-2bc918d3f9282de887cc09f830ff35073865366e.tar.gz forums-2bc918d3f9282de887cc09f830ff35073865366e.tar.bz2 forums-2bc918d3f9282de887cc09f830ff35073865366e.tar.xz forums-2bc918d3f9282de887cc09f830ff35073865366e.zip