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

Merge branch 'develop' into feature/api-v1

Browse source
This commit is contained in:
Dane Everitt 2018-01-21 17:06:31 -06:00
commit 407120a854
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
13 changed files with 75 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

4
tests/Unit/Http/Controllers/Server/Files/FileActionsControllerTest.php
View file

@ -100,7 +100,7 @@ class FileActionsControllerTest extends ControllerTestCase
$this->repository->shouldReceive('setServer')->with($server)->once()->andReturnSelf()
->shouldReceive('setToken')->with('abc123')->once()->andReturnSelf()
->shouldReceive('getContent')->with($file)->once()->andReturn((object) ['test']);
->shouldReceive('getContent')->with($file)->once()->andReturn('test');
$response = $controller->view($this->request, '1234', $file);
$this->assertIsViewResponse($response);
@ -111,7 +111,7 @@ class FileActionsControllerTest extends ControllerTestCase
$this->assertViewHasKey('directory', $response);
$this->assertViewKeyEquals('file', $file, $response);
$this->assertViewKeyEquals('stat', 'fileStatsObject', $response);
$this->assertViewKeyEquals('contents', (object) ['test'], $response);
$this->assertViewKeyEquals('contents', 'test', $response);
$this->assertViewKeyEquals('directory', $expected, $response);
}