sonot
/
PteroTheme
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

closes #991

This commit is contained in:
Dane Everitt 2018-02-27 19:43:47 -06:00
parent fa997b9e0d
commit a765e0dbb6
No known key found for this signature in database
GPG Key ID: EEA66103B3D71F53
3 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -3,6 +3,10 @@ This file is a running track of new features and fixes to each version of the pa
This project follows [Semantic Versioning](http://semver.org) guidelines. This project follows [Semantic Versioning](http://semver.org) guidelines.
## v0.7.4 (Derelict Dermodactylus)
### Fixed
* Fixes a bug when reinstalling a server that would not mark the server as installing, resulting in some UI issues.
## v0.7.3 (Derelict Dermodactylus) ## v0.7.3 (Derelict Dermodactylus)
### Fixed ### Fixed
* Fixes server creation API endpoint not passing the provided `external_id` to the creation service. * Fixes server creation API endpoint not passing the provided `external_id` to the creation service.

2
app/Services/Servers/ReinstallServerService.php
View File

@ -66,7 +66,7 @@ class ReinstallServerService
$this->database->beginTransaction(); $this->database->beginTransaction();
$this->repository->withoutFreshModel()->update($server->id, [ $this->repository->withoutFreshModel()->update($server->id, [
'installed' => 0, 'installed' => 0,
]); ], true, true);
try { try {
$this->daemonServerRepository->setServer($server)->reinstall(); $this->daemonServerRepository->setServer($server)->reinstall();

20
tests/Unit/Services/Servers/ReinstallServerServiceTest.php
View File

@ -81,10 +81,9 @@ class ReinstallServerServiceTest extends TestCase
$this->repository->shouldNotReceive('find'); $this->repository->shouldNotReceive('find');
$this->database->shouldReceive('beginTransaction')->withNoArgs()->once()->andReturnNull(); $this->database->shouldReceive('beginTransaction')->withNoArgs()->once()->andReturnNull();
$this->repository->shouldReceive('withoutFreshModel')->withNoArgs()->once()->andReturnSelf() $this->repository->shouldReceive('withoutFreshModel->update')->with($this->server->id, [
->shouldReceive('update')->with($this->server->id, [
'installed' => 0, 'installed' => 0,
])->once()->andReturnNull(); ], true, true)->once()->andReturnNull();
$this->daemonServerRepository->shouldReceive('setServer')->with($this->server)->once()->andReturnSelf() $this->daemonServerRepository->shouldReceive('setServer')->with($this->server)->once()->andReturnSelf()
->shouldReceive('reinstall')->withNoArgs()->once()->andReturn(new Response); ->shouldReceive('reinstall')->withNoArgs()->once()->andReturn(new Response);
@ -101,10 +100,9 @@ class ReinstallServerServiceTest extends TestCase
$this->repository->shouldReceive('find')->with($this->server->id)->once()->andReturn($this->server); $this->repository->shouldReceive('find')->with($this->server->id)->once()->andReturn($this->server);
$this->database->shouldReceive('beginTransaction')->withNoArgs()->once()->andReturnNull(); $this->database->shouldReceive('beginTransaction')->withNoArgs()->once()->andReturnNull();
$this->repository->shouldReceive('withoutFreshModel')->withNoArgs()->once()->andReturnSelf() $this->repository->shouldReceive('withoutFreshModel->update')->with($this->server->id, [
->shouldReceive('update')->with($this->server->id, [
'installed' => 0, 'installed' => 0,
])->once()->andReturnNull(); ], true, true)->once()->andReturnNull();
$this->daemonServerRepository->shouldReceive('setServer')->with($this->server)->once()->andReturnSelf() $this->daemonServerRepository->shouldReceive('setServer')->with($this->server)->once()->andReturnSelf()
->shouldReceive('reinstall')->withNoArgs()->once()->andReturn(new Response); ->shouldReceive('reinstall')->withNoArgs()->once()->andReturn(new Response);
@ -121,10 +119,9 @@ class ReinstallServerServiceTest extends TestCase
public function testExceptionThrownByGuzzleShouldBeReRenderedAsDisplayable() public function testExceptionThrownByGuzzleShouldBeReRenderedAsDisplayable()
{ {
$this->database->shouldReceive('beginTransaction')->withNoArgs()->once()->andReturnNull(); $this->database->shouldReceive('beginTransaction')->withNoArgs()->once()->andReturnNull();
$this->repository->shouldReceive('withoutFreshModel')->withNoArgs()->once()->andReturnSelf() $this->repository->shouldReceive('withoutFreshModel->update')->with($this->server->id, [
->shouldReceive('update')->with($this->server->id, [
'installed' => 0, 'installed' => 0,
])->once()->andReturnNull(); ], true, true)->once()->andReturnNull();
$this->daemonServerRepository->shouldReceive('setServer')->with($this->server)->once()->andThrow($this->exception); $this->daemonServerRepository->shouldReceive('setServer')->with($this->server)->once()->andThrow($this->exception);
@ -139,10 +136,9 @@ class ReinstallServerServiceTest extends TestCase
public function testExceptionNotThrownByGuzzleShouldNotBeTransformedToDisplayable() public function testExceptionNotThrownByGuzzleShouldNotBeTransformedToDisplayable()
{ {
$this->database->shouldReceive('beginTransaction')->withNoArgs()->once()->andReturnNull(); $this->database->shouldReceive('beginTransaction')->withNoArgs()->once()->andReturnNull();
$this->repository->shouldReceive('withoutFreshModel')->withNoArgs()->once()->andReturnSelf() $this->repository->shouldReceive('withoutFreshModel->update')->with($this->server->id, [
->shouldReceive('update')->with($this->server->id, [
'installed' => 0, 'installed' => 0,
])->once()->andReturnNull(); ], true, true)->once()->andReturnNull();
$this->daemonServerRepository->shouldReceive('setServer')->with($this->server)->once()->andThrow(new Exception()); $this->daemonServerRepository->shouldReceive('setServer')->with($this->server)->once()->andThrow(new Exception());