tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-05-31 20:10:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix form tests

Browse Source
This commit is contained in:
Johannes Meyer 2014-09-29 12:56:36 +02:00
parent 243dd19281
commit 07d25e8bed
3 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
test/php/application/forms/Config/Authentication/DbBackendFormTest.php
View File

@ -9,6 +9,7 @@ namespace Tests\Icinga\Form\Config\Authentication;
require_once realpath(dirname(__FILE__) . '/../../../../bootstrap.php'); require_once realpath(dirname(__FILE__) . '/../../../../bootstrap.php');
use Mockery; use Mockery;
use Zend_Config;
use Icinga\Test\BaseTestCase; use Icinga\Test\BaseTestCase;
use Icinga\Form\Config\Authentication\DbBackendForm; use Icinga\Form\Config\Authentication\DbBackendForm;
@ -67,7 +68,9 @@ class DbBackendFormTest extends BaseTestCase
protected function setUpResourceFactoryMock() protected function setUpResourceFactoryMock()
{ {
Mockery::mock('alias:Icinga\Data\ResourceFactory') Mockery::mock('alias:Icinga\Data\ResourceFactory')
->shouldReceive('create') ->shouldReceive('createResource')
->andReturn(Mockery::mock('Icinga\Data\Db\DbConnection')); ->andReturn(Mockery::mock('Icinga\Data\Db\DbConnection'))
->shouldReceive('getResourceConfig')
->andReturn(new Zend_Config(array()));
} }
} }

7
test/php/application/forms/Config/Authentication/LdapBackendFormTest.php
View File

@ -9,6 +9,7 @@ namespace Tests\Icinga\Form\Config\Authentication;
require_once realpath(dirname(__FILE__) . '/../../../../bootstrap.php'); require_once realpath(dirname(__FILE__) . '/../../../../bootstrap.php');
use Mockery; use Mockery;
use Zend_Config;
use Icinga\Test\BaseTestCase; use Icinga\Test\BaseTestCase;
use Icinga\Form\Config\Authentication\LdapBackendForm; use Icinga\Form\Config\Authentication\LdapBackendForm;
use Icinga\Exception\AuthenticationException; use Icinga\Exception\AuthenticationException;
@ -66,9 +67,9 @@ class LdapBackendFormTest extends BaseTestCase
protected function setUpResourceFactoryMock() protected function setUpResourceFactoryMock()
{ {
Mockery::mock('alias:Icinga\Data\ResourceFactory') Mockery::mock('alias:Icinga\Data\ResourceFactory')
->shouldReceive('createResource')
->andReturn(Mockery::mock('Icinga\Protocol\Ldap\Connection'))
->shouldReceive('getResourceConfig') ->shouldReceive('getResourceConfig')
->andReturn(new \Zend_Config(array())) ->andReturn(new Zend_Config(array()));
->shouldReceive('create')
->andReturn(Mockery::mock('Icinga\Protocol\Ldap\Connection'));
} }
} }

14
test/php/application/forms/Config/Resource/LdapResourceFormTest.php
View File

@ -27,11 +27,14 @@ class LdapResourceFormTest extends BaseTestCase
public function testValidLdapResourceIsValid() public function testValidLdapResourceIsValid()
{ {
$this->setUpResourceFactoryMock( $this->setUpResourceFactoryMock(
Mockery::mock()->shouldReceive('connect')->getMock() Mockery::mock()->shouldReceive('testCredentials')->once()->andReturn(true)->getMock()
); );
$form = new LdapResourceForm();
$form->setTokenDisabled();
$this->assertTrue( $this->assertTrue(
LdapResourceForm::isValidResource(new LdapResourceForm()), LdapResourceForm::isValidResource($form->create()),
'ResourceForm claims that a valid ldap resource is not valid' 'ResourceForm claims that a valid ldap resource is not valid'
); );
} }
@ -43,11 +46,14 @@ class LdapResourceFormTest extends BaseTestCase
public function testInvalidLdapResourceIsNotValid() public function testInvalidLdapResourceIsNotValid()
{ {
$this->setUpResourceFactoryMock( $this->setUpResourceFactoryMock(
Mockery::mock()->shouldReceive('connect')->once()->andThrow('\Exception')->getMock() Mockery::mock()->shouldReceive('testCredentials')->once()->andThrow('\Exception')->getMock()
); );
$form = new LdapResourceForm();
$form->setTokenDisabled();
$this->assertFalse( $this->assertFalse(
LdapResourceForm::isValidResource(new LdapResourceForm()), LdapResourceForm::isValidResource($form->create()),
'ResourceForm claims that an invalid ldap resource is valid' 'ResourceForm claims that an invalid ldap resource is valid'
); );
} }