Skip to content

Commit

Permalink
Merge pull request #258 from Laravel-Lang/13.x
Browse files Browse the repository at this point in the history
Fixed tests
  • Loading branch information
Andrey Helldar authored Jun 17, 2022
2 parents 0f88e25 + 8ad2f75 commit c7c15b8
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 8 deletions.
4 changes: 2 additions & 2 deletions tests/Concerns/TestKeys.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@ trait TestKeys
{
use Backtrace;

protected $trans_prefix;
protected $trans_prefix = null;

protected $items = [];

protected function trans(string $key, ?string $locale = null): string
{
$key = $this->trans_prefix . $key;

return trans($key, [], $locale);
return __($key, [], $locale);
}

protected function testSame(string $expected, string $key, ?string $locale = null): void
Expand Down
2 changes: 0 additions & 2 deletions tests/InlineOff/Console/Keys/Json/BreezeJsonTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@
class BreezeJsonTest extends BaseJsonTestCase
{
protected $items = [
'A new verification link has been sent to the email address you provided during registration.' => 'Новая ссылка для подтверждения была отправлена на Ваш email-адрес, указанный при регистрации.',

'Already registered?' => 'Уже зарегистрированы?',
'Confirm' => 'Подтвердить',
'Confirm Password' => 'Подтверждение пароля',
Expand Down
2 changes: 0 additions & 2 deletions tests/InlineOn/Console/Keys/Json/BreezeJsonTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@
class BreezeJsonTest extends BaseJsonTestCase
{
protected $items = [
'A new verification link has been sent to the email address you provided during registration.' => 'Новая ссылка для подтверждения была отправлена на Ваш email-адрес, указанный при регистрации.',

'Already registered?' => 'Уже зарегистрированы?',
'Confirm' => 'Подтвердить',
'Confirm Password' => 'Подтверждение пароля',
Expand Down
3 changes: 1 addition & 2 deletions tests/TestCase.php
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,8 @@ protected function setUp(): void
{
parent::setUp();

$this->reinstallLocales();

$this->emulatePackages();
$this->reinstallLocales();
}

protected function getPackageProviders($app): array
Expand Down

0 comments on commit c7c15b8

Please sign in to comment.