mirror of
https://github.com/Icinga/icingaweb2.git
synced 2025-07-27 07:44:04 +02:00
parent
6aaff6b399
commit
6c698c1543
@ -26,7 +26,8 @@ namespace Icinga\Test {
|
|||||||
use Mockery;
|
use Mockery;
|
||||||
use Zend_Config;
|
use Zend_Config;
|
||||||
use Zend_Controller_Request_Abstract;
|
use Zend_Controller_Request_Abstract;
|
||||||
use Zend_Test_PHPUnit_ControllerTestCase;
|
use Zend_Controller_Request_HttpTestCase;
|
||||||
|
use PHPUnit_Framework_TestCase;
|
||||||
use Icinga\Application\Icinga;
|
use Icinga\Application\Icinga;
|
||||||
use Icinga\Util\DateTimeFactory;
|
use Icinga\Util\DateTimeFactory;
|
||||||
use Icinga\Data\ResourceFactory;
|
use Icinga\Data\ResourceFactory;
|
||||||
@ -37,7 +38,7 @@ namespace Icinga\Test {
|
|||||||
/**
|
/**
|
||||||
* Class BaseTestCase
|
* Class BaseTestCase
|
||||||
*/
|
*/
|
||||||
class BaseTestCase extends Zend_Test_PHPUnit_ControllerTestCase implements DbTest, FormTest
|
class BaseTestCase extends PHPUnit_Framework_TestCase implements DbTest, FormTest
|
||||||
{
|
{
|
||||||
/**
|
/**
|
||||||
* Path to application/
|
* Path to application/
|
||||||
@ -81,6 +82,13 @@ namespace Icinga\Test {
|
|||||||
*/
|
*/
|
||||||
public static $moduleDir;
|
public static $moduleDir;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Store request for form tests
|
||||||
|
*
|
||||||
|
* @var Zend_Controller_Request_HttpTestCase
|
||||||
|
*/
|
||||||
|
private $request;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Resource configuration for different database types
|
* Resource configuration for different database types
|
||||||
*
|
*
|
||||||
@ -325,6 +333,22 @@ namespace Icinga\Test {
|
|||||||
);
|
);
|
||||||
return $form;
|
return $form;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Retrieve test case request object
|
||||||
|
*
|
||||||
|
* This is a mock methods borrowed from Zend Controller Test Case to handle form tests properly (#6106)
|
||||||
|
*
|
||||||
|
* @return Zend_Controller_Request_HttpTestCase
|
||||||
|
*/
|
||||||
|
public function getRequest()
|
||||||
|
{
|
||||||
|
if (null === $this->request) {
|
||||||
|
require_once 'Zend/Controller/Request/HttpTestCase.php';
|
||||||
|
$this->request = new Zend_Controller_Request_HttpTestCase;
|
||||||
|
}
|
||||||
|
return $this->request;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
BaseTestCase::setupTimezone();
|
BaseTestCase::setupTimezone();
|
||||||
|
Loading…
x
Reference in New Issue
Block a user