StarMC/Astral-nook
StarMC/Astral-nook
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' into develop

Browse source
This commit is contained in:
Dane Everitt 2019-12-28 11:49:08 -08:00
commit 51defae917
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
15 changed files with 140 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tests/Unit/Services/Databases/DatabasePasswordServiceTest.php
View file

@ -60,7 +60,7 @@ class DatabasePasswordServiceTest extends TestCase
$this->dynamic->shouldReceive('set')->with('dynamic', $model->database_host_id)->once()->andReturnNull();
$this->encrypter->expects('encrypt')->with(m::on(function ($string) {
preg_match_all('/[!@+=^-]/', $string, $matches, PREG_SET_ORDER);
preg_match_all('/[!@+=.^-]/', $string, $matches, PREG_SET_ORDER);
$this->assertTrue(count($matches) >= 2 && count($matches) <= 6, "Failed asserting that [{$string}] contains 2 to 6 special characters.");
$this->assertTrue(strlen($string) === 24, "Failed asserting that [{$string}] is 24 characters in length.");

2
tests/Unit/Services/Nests/NestDeletionServiceTest.php
View file

@ -73,7 +73,7 @@ class NestDeletionServiceTest extends TestCase
$this->service->handle(1);
} catch (PterodactylException $exception) {
$this->assertInstanceOf(HasActiveServersException::class, $exception);
$this->assertEquals(trans('exceptions.service.delete_has_servers'), $exception->getMessage());
$this->assertEquals(trans('exceptions.nest.delete_has_servers'), $exception->getMessage());
}
}