Merge branch 'develop' into forgot_password_captcha

# Conflicts:
#	api/models/authentication/ForgotPasswordForm.php
This commit is contained in:
ErickSkrauch
2017-04-25 21:00:01 +03:00
33 changed files with 608 additions and 138 deletions

View File

@@ -4,6 +4,7 @@ modules:
- Yii2:
part: [orm, email, fixtures]
- tests\codeception\common\_support\amqp\Helper
- tests\codeception\common\_support\Mockery
config:
Yii2:
configFile: '../config/api/unit.php'

View File

@@ -1,6 +1,8 @@
<?php
namespace tests\codeception\api\unit;
use Mockery;
class TestCase extends \Codeception\Test\Unit {
/**
@@ -19,4 +21,9 @@ class TestCase extends \Codeception\Test\Unit {
return [];
}
protected function tearDown() {
parent::tearDown();
Mockery::close();
}
}