mirror of
https://github.com/elyby/accounts.git
synced 2024-11-27 01:02:06 +05:30
Merge branch 'develop'
This commit is contained in:
commit
c07a3cb057
@ -3,6 +3,7 @@ namespace api\models;
|
||||
|
||||
use common\helpers\Error as E;
|
||||
use api\models\base\ApiForm;
|
||||
use common\models\Account;
|
||||
use Yii;
|
||||
use yii\base\ErrorException;
|
||||
use yii\base\InvalidConfigException;
|
||||
@ -58,11 +59,13 @@ class FeedbackForm extends ApiForm {
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return \common\models\Account|null $account
|
||||
*/
|
||||
protected function getAccount() {
|
||||
return Yii::$app->user->identity;
|
||||
protected function getAccount(): ?Account {
|
||||
$identity = Yii::$app->user->identity;
|
||||
if ($identity === null) {
|
||||
return null;
|
||||
}
|
||||
|
||||
return $identity->getAccount();
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -1,6 +1,6 @@
|
||||
<?php
|
||||
return [
|
||||
'version' => '1.1.20',
|
||||
'version' => '1.1.21',
|
||||
'vendorPath' => dirname(__DIR__, 2) . '/vendor',
|
||||
'components' => [
|
||||
'cache' => [
|
||||
|
37
tests/codeception/api/functional/FeedbackCest.php
Normal file
37
tests/codeception/api/functional/FeedbackCest.php
Normal file
@ -0,0 +1,37 @@
|
||||
<?php
|
||||
namespace tests\codeception\api\functional;
|
||||
|
||||
use tests\codeception\api\FunctionalTester;
|
||||
|
||||
class FeedbackCest {
|
||||
|
||||
public function testFeedbackWithoutAuth(FunctionalTester $I) {
|
||||
$I->sendPOST('/feedback', [
|
||||
'subject' => 'Test',
|
||||
'email' => 'email@ely.by',
|
||||
'type' => 0,
|
||||
'message' => 'Hello world',
|
||||
]);
|
||||
$I->canSeeResponseCodeIs(200);
|
||||
$I->canSeeResponseIsJson();
|
||||
$I->canSeeResponseContainsJson([
|
||||
'success' => true,
|
||||
]);
|
||||
}
|
||||
|
||||
public function testFeedbackWithAuth(FunctionalTester $I) {
|
||||
$I->amAuthenticated();
|
||||
$I->sendPOST('/feedback', [
|
||||
'subject' => 'Test',
|
||||
'email' => 'email@ely.by',
|
||||
'type' => 0,
|
||||
'message' => 'Hello world',
|
||||
]);
|
||||
$I->canSeeResponseCodeIs(200);
|
||||
$I->canSeeResponseIsJson();
|
||||
$I->canSeeResponseContainsJson([
|
||||
'success' => true,
|
||||
]);
|
||||
}
|
||||
|
||||
}
|
Loading…
Reference in New Issue
Block a user