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

Tests for RemoteRequestController

Browse source
This commit is contained in:
Dane Everitt 2017-09-04 14:34:38 -05:00
parent 54554465f2
commit b12f6f1156
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
3 changed files with 197 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

23
app/Http/Controllers/Server/Files/RemoteRequestController.php
View file

@ -110,14 +110,11 @@ class RemoteRequestController extends Controller
->getDirectory($requestDirectory);
} catch (RequestException $exception) {
$this->writer->warning($exception);
$response = $exception->getResponse();
if (! is_null($exception->getResponse())) {
return response()->json(
['error' => $exception->getResponse()->getBody()], $exception->getResponse()->getStatusCode()
);
} else {
return response()->json(['error' => trans('server.files.exceptions.list_directory')], 500);
}
return response()->json(['error' => trans('exceptions.daemon_connection_failed', [
'code' => is_null($response) ? 'E_CONN_REFUSED' : $response->getStatusCode(),
])], 500);
}
return view('server.files.list', [
@ -151,16 +148,12 @@ class RemoteRequestController extends Controller
return response('', 204);
} catch (RequestException $exception) {
$response = $exception->getResponse();
$this->writer->warning($exception);
$response = $exception->getResponse();
if (! is_null($response)) {
return response()->json(['error' => $response->getBody()], $response->getStatusCode());
} else {
return response()->json(['error' => trans('exceptions.daemon_connection_failed', [
'code' => is_null($response) ? 'E_CONN_REFUSED' : $response->getStatusCode(),
])], 500);
}
return response()->json(['error' => trans('exceptions.daemon_connection_failed', [
'code' => is_null($response) ? 'E_CONN_REFUSED' : $response->getStatusCode(),
])], 500);
}
}
}