adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-02-07 12:36:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Using $_mergeParent to unskip tests in test suites.

Browse source
This commit is contained in:
mark_story 2010-12-15 23:49:54 -05:00
parent 6206fefcee
commit 339cb41ea2
1 changed files with 22 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
cake/tests/cases/libs/controller/controller_merge_vars.test.php
View file

@ -21,33 +21,29 @@
*/ */
App::import('Core', 'Controller'); App::import('Core', 'Controller');
if (!class_exists('AppController')) {
/** /**
* Test case AppController * Test case AppController
* *
* @package cake * @package cake
* @subpackage cake.tests.cases.libs.controller * @subpackage cake.tests.cases.libs.controller
*/ */
class AppController extends Controller { class MergeVarsAppController extends Controller {
/** /**
* components * components
* *
* @var array * @var array
*/ */
public $components = array('MergeVar' => array('flag', 'otherFlag', 'redirect' => false)); public $components = array('MergeVar' => array('flag', 'otherFlag', 'redirect' => false));
/** /**
* helpers * helpers
* *
* @var array * @var array
*/ */
public $helpers = array('MergeVar' => array('format' => 'html', 'terse')); public $helpers = array('MergeVar' => array('format' => 'html', 'terse'));
}
} elseif (!defined('APP_CONTROLLER_EXISTS')) {
define('APP_CONTROLLER_EXISTS', true);
} }
/** /**
* MergeVar Component * MergeVar Component
* *
@ -62,7 +58,7 @@ class MergeVarComponent extends Object {
* *
* @package cake.tests.cases.libs.controller * @package cake.tests.cases.libs.controller
*/ */
class MergeVariablesController extends AppController { class MergeVariablesController extends MergeVarsAppController {
/** /**
* name * name
@ -77,6 +73,13 @@ class MergeVariablesController extends AppController {
* @var arrays * @var arrays
*/ */
public $uses = array(); public $uses = array();
/**
* parent for mergeVars
*
* @var string
*/
protected $_mergeParent = 'MergeVarsAppController';
} }
/** /**
@ -84,7 +87,7 @@ class MergeVariablesController extends AppController {
* *
* @package cake.tests.cases.libs.controller * @package cake.tests.cases.libs.controller
*/ */
class MergeVarPluginAppController extends AppController { class MergeVarPluginAppController extends MergeVarsAppController {
/** /**
* components * components
@ -99,6 +102,13 @@ class MergeVarPluginAppController extends AppController {
* @var array * @var array
*/ */
public $helpers = array('Javascript'); public $helpers = array('Javascript');
/**
* parent for mergeVars
*
* @var string
*/
protected $_mergeParent = 'MergeVarsAppController';
} }
/** /**
@ -130,14 +140,6 @@ class MergePostsController extends MergeVarPluginAppController {
* @package cake.tests.cases.libs.controller * @package cake.tests.cases.libs.controller
*/ */
class ControllerMergeVarsTest extends CakeTestCase { class ControllerMergeVarsTest extends CakeTestCase {
/**
* end test
*
* @return void
*/
function endTest() {
ClassRegistry::flush();
}
/** /**
* test that component settings are not duplicated when merging component settings * test that component settings are not duplicated when merging component settings
@ -145,8 +147,6 @@ class ControllerMergeVarsTest extends CakeTestCase {
* @return void * @return void
*/ */
function testComponentParamMergingNoDuplication() { function testComponentParamMergingNoDuplication() {
$this->skipIf(defined('APP_CONTROLLER_EXISTS'), "APP_CONTROLLER_EXISTS cannot run {$this->name}");
$Controller = new MergeVariablesController(); $Controller = new MergeVariablesController();
$Controller->constructClasses(); $Controller->constructClasses();
@ -160,8 +160,6 @@ class ControllerMergeVarsTest extends CakeTestCase {
* @return void * @return void
*/ */
function testComponentMergingWithRedeclarations() { function testComponentMergingWithRedeclarations() {
$this->skipIf(defined('APP_CONTROLLER_EXISTS'), "APP_CONTROLLER_EXISTS cannot run {$this->name}");
$Controller = new MergeVariablesController(); $Controller = new MergeVariablesController();
$Controller->components['MergeVar'] = array('remote', 'redirect' => true); $Controller->components['MergeVar'] = array('remote', 'redirect' => true);
$Controller->constructClasses(); $Controller->constructClasses();
@ -176,8 +174,6 @@ class ControllerMergeVarsTest extends CakeTestCase {
* @return void * @return void
*/ */
function testHelperSettingMergingNoDuplication() { function testHelperSettingMergingNoDuplication() {
$this->skipIf(defined('APP_CONTROLLER_EXISTS'), "APP_CONTROLLER_EXISTS cannot run {$this->name}");
$Controller = new MergeVariablesController(); $Controller = new MergeVariablesController();
$Controller->constructClasses(); $Controller->constructClasses();
@ -192,9 +188,7 @@ class ControllerMergeVarsTest extends CakeTestCase {
* @return void * @return void
*/ */
function testHelperOrderPrecedence() { function testHelperOrderPrecedence() {
$this->skipIf(defined('APP_CONTROLLER_EXISTS'), "APP_CONTROLLER_EXISTS cannot run {$this->name}"); $Controller = new MergeVariablesController();
$Controller =& new MergeVariablesController();
$Controller->helpers = array('Custom', 'Foo' => array('something')); $Controller->helpers = array('Custom', 'Foo' => array('something'));
$Controller->constructClasses(); $Controller->constructClasses();
@ -212,8 +206,6 @@ class ControllerMergeVarsTest extends CakeTestCase {
* @return void * @return void
*/ */
function testMergeVarsWithPlugin() { function testMergeVarsWithPlugin() {
$this->skipIf(defined('APP_CONTROLLER_EXISTS'), "APP_CONTROLLER_EXISTS cannot run {$this->name}");
$Controller = new MergePostsController(); $Controller = new MergePostsController();
$Controller->components = array('Email' => array('ports' => 'open')); $Controller->components = array('Email' => array('ports' => 'open'));
$Controller->plugin = 'MergeVarPlugin'; $Controller->plugin = 'MergeVarPlugin';
@ -251,9 +243,7 @@ class ControllerMergeVarsTest extends CakeTestCase {
* @return void * @return void
*/ */
function testMergeVarsNotGreedy() { function testMergeVarsNotGreedy() {
$this->skipIf(defined('APP_CONTROLLER_EXISTS'), "APP_CONTROLLER_EXISTS cannot run {$this->name}"); $Controller = new Controller();
$Controller =& new Controller();
$Controller->components = array(); $Controller->components = array();
$Controller->uses = array(); $Controller->uses = array();
$Controller->constructClasses(); $Controller->constructClasses();