Merge branch 'master' of ssh://172.20.0.1/var/git/espo/backend

This commit is contained in:
yuri
2017-12-14 16:58:29 +02:00
3 changed files with 10 additions and 2 deletions
+7
View File
@@ -113,6 +113,8 @@ abstract class BaseTestCase extends \PHPUnit_Framework_TestCase
protected function setUp()
{
$this->beforeSetUp();
$params = array(
'dataFile' => $this->dataFile,
'pathToFiles' => $this->pathToFiles,
@@ -140,6 +142,11 @@ abstract class BaseTestCase extends \PHPUnit_Framework_TestCase
return $this->espoTester->createUser($userData, $role, $isPortal);
}
protected function beforeSetUp()
{
}
protected function beforeStartApplication()
{
+1
View File
@@ -158,6 +158,7 @@ class Tester
{
$this->install();
$this->loadData();
$this->getApplication(true)->runRebuild();
}
public function terminate()
@@ -40,11 +40,11 @@ class CreateTest extends \tests\integration\Core\BaseTestCase
{
$service = $this->getContainer()->get('serviceFactory')->create('Account');
$entity = $service->createEntity(array(
$entity = $service->createEntity((object) [
'name' => 'Test Account',
'emailAddress' => 'test@tester.com',
'phoneNumber' => '123-456-789',
));
]);
$this->assertInstanceOf('\\Espo\\ORM\\Entity', $entity);
$this->assertTrue(!empty($entity->id));