mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 22:10:45 +02:00
Code Issues Releases Wiki Activity

Merge branch 'develop-ascraeus' into develop

Browse Source
This commit is contained in:
Joas Schilling
2014-11-17 23:33:04 +01:00
parent c09c95599b 4f96688bf7
commit cddb768772
15 changed files with 24 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/functional/acp_groups_test.php
View File

@@ -11,12 +11,12 @@
*
*/
require_once dirname(__FILE__) . '/common_groups_test.php';
require_once dirname(__FILE__) . '/common_groups_test_case.php';
/**
* @group functional
*/
class phpbb_functional_acp_groups_test extends phpbb_functional_common_groups_test
class phpbb_functional_acp_groups_test extends phpbb_functional_common_groups_test_case
{
protected $form_data;

4
tests/functional/avatar_acp_groups_test.php
View File

@@ -11,12 +11,12 @@
*
*/
require_once dirname(__FILE__) . '/common_avatar_test.php';
require_once dirname(__FILE__) . '/common_avatar_test_case.php';
/**
* @group functional
*/
class phpbb_functional_avatar_acp_groups_test extends phpbb_functional_common_avatar_test
class phpbb_functional_avatar_acp_groups_test extends phpbb_functional_common_avatar_test_case
{
public function get_url()
{

4
tests/functional/avatar_acp_users_test.php
View File

@@ -11,12 +11,12 @@
*
*/
require_once dirname(__FILE__) . '/common_avatar_test.php';
require_once dirname(__FILE__) . '/common_avatar_test_case.php';
/**
* @group functional
*/
class phpbb_functional_avatar_acp_users_test extends phpbb_functional_common_avatar_test
class phpbb_functional_avatar_acp_users_test extends phpbb_functional_common_avatar_test_case
{
public function get_url()
{

4
tests/functional/avatar_ucp_groups_test.php
View File

@@ -10,12 +10,12 @@
* the docs/CREDITS.txt file.
*
*/
require_once dirname(__FILE__) . '/common_avatar_test.php';
require_once dirname(__FILE__) . '/common_avatar_test_case.php';
/**
* @group functional
*/
class phpbb_functional_avatar_ucp_groups_test extends phpbb_functional_common_avatar_test
class phpbb_functional_avatar_ucp_groups_test extends phpbb_functional_common_avatar_test_case
{
public function get_url()
{

4
tests/functional/avatar_ucp_users_test.php
View File

@@ -11,12 +11,12 @@
*
*/
require_once dirname(__FILE__) . '/common_avatar_test.php';
require_once dirname(__FILE__) . '/common_avatar_test_case.php';
/**
* @group functional
*/
class phpbb_functional_avatar_ucp_users_test extends phpbb_functional_common_avatar_test
class phpbb_functional_avatar_ucp_users_test extends phpbb_functional_common_avatar_test_case
{
public function get_url()
{

2
tests/functional/common_avatar_test.php → tests/functional/common_avatar_test_case.php
View File

@@ -14,7 +14,7 @@
/**
* @group functional
*/
abstract class phpbb_functional_common_avatar_test extends phpbb_functional_test_case
abstract class phpbb_functional_common_avatar_test_case extends phpbb_functional_test_case
{
private $path;
private $form_content;

2
tests/functional/common_groups_test.php → tests/functional/common_groups_test_case.php
View File

@@ -14,7 +14,7 @@
/**
* @group functional
*/
abstract class phpbb_functional_common_groups_test extends phpbb_functional_test_case
abstract class phpbb_functional_common_groups_test_case extends phpbb_functional_test_case
{
abstract protected function get_url();

4
tests/functional/ucp_groups_test.php
View File

@@ -11,12 +11,12 @@
*
*/
require_once dirname(__FILE__) . '/common_groups_test.php';
require_once dirname(__FILE__) . '/common_groups_test_case.php';
/**
* @group functional
*/
class phpbb_functional_ucp_groups_test extends phpbb_functional_common_groups_test
class phpbb_functional_ucp_groups_test extends phpbb_functional_common_groups_test_case
{
protected $db;