From 3143cf0838d7e259dedc378d7c69c2101fbaa32f Mon Sep 17 00:00:00 2001 From: Pig Fang Date: Fri, 13 Jul 2018 15:21:13 +0800 Subject: [PATCH] fix tests of TextureController --- tests/TextureControllerTest.php | 100 ++++++++++++++++---------------- 1 file changed, 50 insertions(+), 50 deletions(-) diff --git a/tests/TextureControllerTest.php b/tests/TextureControllerTest.php index 32fe5588..2bb974e6 100644 --- a/tests/TextureControllerTest.php +++ b/tests/TextureControllerTest.php @@ -17,28 +17,28 @@ class TextureControllerTest extends TestCase // Player is not existed $this->get('/nope.json') - ->see(trans('general.unexistent-player')) - ->assertResponseStatus(404); + ->assertSee(trans('general.unexistent-player')) + ->assertStatus(404); // Player is banned $player = factory(Player::class)->create(['tid_steve' => $steve->tid]); User::find($player->uid)->setPermission(User::BANNED); $this->get("/{$player->player_name}.json") - ->see(trans('general.player-banned')) - ->assertResponseStatus(403); + ->assertSee(trans('general.player-banned')) + ->assertStatus(403); User::find($player->uid)->setPermission(User::NORMAL); // Default API is CSL API - $this->get("/{$player->player_name}.json") - ->seeJson([ + $this->getJson("/{$player->player_name}.json") + ->assertJson([ 'username' => $player->player_name, 'skins' => [ 'default' => $steve->hash, 'slim' => null ], 'cape' => null - ])->seeHeader('Last-Modified'); + ])->assertHeader('Last-Modified'); } public function testJsonWithApi() @@ -47,19 +47,19 @@ class TextureControllerTest extends TestCase $player = factory(Player::class)->create(['tid_steve' => $steve->tid]); // CSL API - $this->get("/csl/{$player->player_name}.json") - ->seeJson([ + $this->getJson("/csl/{$player->player_name}.json") + ->assertJson([ 'username' => $player->player_name, 'skins' => [ 'default' => $steve->hash, 'slim' => null ], 'cape' => null - ])->seeHeader('Last-Modified'); + ])->assertHeader('Last-Modified'); // USM API - $this->get("/usm/{$player->player_name}.json") - ->seeJson([ + $this->getJson("/usm/{$player->player_name}.json") + ->assertJson([ 'player_name' => $player->player_name, 'model_preference' => ['default', 'slim'], 'skins' => [ @@ -67,7 +67,7 @@ class TextureControllerTest extends TestCase 'slim' => null ], 'cape' => null - ])->seeHeader('Last-Modified'); + ])->assertHeader('Last-Modified'); } public function testTexture() @@ -75,14 +75,14 @@ class TextureControllerTest extends TestCase $steve = factory(Texture::class)->create(); Storage::disk('textures')->put($steve->hash, ''); $this->get('/textures/nope') - ->see('404'); + ->assertSee('404'); $this->get('/textures/'.$steve->hash) - ->seeHeader('Content-Type', 'image/png') - ->seeHeader('Last-Modified') - ->seeHeader('Accept-Ranges', 'bytes') - ->seeHeader('Content-Length', Storage::disk('textures')->size($steve->hash)) - ->assertResponseStatus(200); + ->assertHeader('Content-Type', 'image/png') + ->assertHeader('Last-Modified') + ->assertHeader('Accept-Ranges', 'bytes') + ->assertHeader('Content-Length', Storage::disk('textures')->size($steve->hash)) + ->assertSuccessful(); } public function testTextureWithApi() @@ -91,18 +91,18 @@ class TextureControllerTest extends TestCase Storage::disk('textures')->put($steve->hash, ''); $this->get('/csl/textures/'.$steve->hash) - ->seeHeader('Content-Type', 'image/png') - ->seeHeader('Last-Modified') - ->seeHeader('Accept-Ranges', 'bytes') - ->seeHeader('Content-Length', Storage::disk('textures')->size($steve->hash)) - ->assertResponseStatus(200); + ->assertHeader('Content-Type', 'image/png') + ->assertHeader('Last-Modified') + ->assertHeader('Accept-Ranges', 'bytes') + ->assertHeader('Content-Length', Storage::disk('textures')->size($steve->hash)) + ->assertStatus(200); $this->get('/usm/textures/'.$steve->hash) - ->seeHeader('Content-Type', 'image/png') - ->seeHeader('Last-Modified') - ->seeHeader('Accept-Ranges', 'bytes') - ->seeHeader('Content-Length', Storage::disk('textures')->size($steve->hash)) - ->assertResponseStatus(200); + ->assertHeader('Content-Type', 'image/png') + ->assertHeader('Last-Modified') + ->assertHeader('Accept-Ranges', 'bytes') + ->assertHeader('Content-Length', Storage::disk('textures')->size($steve->hash)) + ->assertSuccessful(); } public function testSkin() @@ -115,19 +115,19 @@ class TextureControllerTest extends TestCase ]); $this->get("/skin/{$player->player_name}.png") - ->see(trans('general.texture-not-uploaded', ['type' => 'alex'])); + ->assertSee(trans('general.texture-not-uploaded', ['type' => 'alex'])); $player->setPreference('default'); $this->get("/skin/{$player->player_name}.png") - ->see(trans('general.texture-deleted')); + ->assertSee(trans('general.texture-deleted')); Storage::disk('textures')->put($steve->hash, ''); $this->get("/skin/{$player->player_name}.png") - ->seeHeader('Content-Type', 'image/png') - ->seeHeader('Last-Modified') - ->seeHeader('Accept-Ranges', 'bytes') - ->seeHeader('Content-Length', Storage::disk('textures')->size($steve->hash)) - ->assertResponseStatus(200); + ->assertHeader('Content-Type', 'image/png') + ->assertHeader('Last-Modified') + ->assertHeader('Accept-Ranges', 'bytes') + ->assertHeader('Content-Length', Storage::disk('textures')->size($steve->hash)) + ->assertSuccessful(); } public function testSkinWithModel() @@ -140,11 +140,11 @@ class TextureControllerTest extends TestCase ]); $this->get("/skin/alex/{$player->player_name}.png") - ->see(trans('general.texture-not-uploaded', ['type' => 'alex'])); + ->assertSee(trans('general.texture-not-uploaded', ['type' => 'alex'])); $player->setPreference('default'); $this->get("/skin/steve/{$player->player_name}.png") - ->see(trans('general.texture-deleted')); + ->assertSee(trans('general.texture-deleted')); } public function testCape() @@ -155,14 +155,14 @@ class TextureControllerTest extends TestCase ]); $this->get("/cape/{$player->player_name}.png") - ->see(trans('general.texture-deleted')); + ->assertSee(trans('general.texture-deleted')); } public function testAvatar() { $base64_email = base64_encode('a@b.c'); $this->get("/avatar/$base64_email.png") - ->seeHeader('Content-Type', 'image/png'); + ->assertHeader('Content-Type', 'image/png'); $steve = factory(Texture::class)->create(); $png = base64_decode(\App\Http\Controllers\TextureController::getDefaultSteveSkin()); @@ -177,7 +177,7 @@ class TextureControllerTest extends TestCase $this->expectsEvents(\App\Events\GetAvatarPreview::class); $this->get('/avatar/'.base64_encode($user->email).'.png') - ->seeHeader('Content-Type', 'image/png'); + ->assertHeader('Content-Type', 'image/png'); } public function testAvatarWithSize() @@ -195,7 +195,7 @@ class TextureControllerTest extends TestCase $this->expectsEvents(\App\Events\GetAvatarPreview::class); $this->get('/avatar/50/'.base64_encode($user->email).'.png') - ->seeHeader('Content-Type', 'image/png'); + ->assertHeader('Content-Type', 'image/png'); } public function testPreview() @@ -204,10 +204,10 @@ class TextureControllerTest extends TestCase $cape = factory(Texture::class, 'cape')->create(); $this->get('/preview/0.png') - ->seeHeader('Content-Type', 'image/png'); + ->assertHeader('Content-Type', 'image/png'); $this->get("/preview/{$steve->tid}.png") - ->seeHeader('Content-Type', 'image/png'); + ->assertHeader('Content-Type', 'image/png'); $png = base64_decode(\App\Http\Controllers\TextureController::getDefaultSteveSkin()); Storage::disk('textures')->put($steve->hash, $png); @@ -219,19 +219,19 @@ class TextureControllerTest extends TestCase ->andReturn(imagecreatefromstring($png)); $this->expectsEvents(\App\Events\GetSkinPreview::class); $this->get("/preview/{$steve->tid}.png") - ->seeHeader('Content-Type', 'image/png'); + ->assertHeader('Content-Type', 'image/png'); $mock->shouldReceive('generatePreviewFromCape') ->once() ->andReturn(imagecreatefromstring($png)); $this->get("/preview/{$cape->tid}.png") - ->seeHeader('Content-Type', 'image/png'); + ->assertHeader('Content-Type', 'image/png'); } public function testPreviewWithSize() { $this->get('/preview/200/0.png') - ->seeHeader('Content-Type', 'image/png'); + ->assertHeader('Content-Type', 'image/png'); } public function testRaw() @@ -241,15 +241,15 @@ class TextureControllerTest extends TestCase // Not found $this->get('/raw/0.png') - ->see(trans('skinlib.non-existent')); + ->assertSee(trans('skinlib.non-existent')); // Success $this->get("/raw/{$steve->tid}.png") - ->seeHeader('Content-Type', 'image/png'); + ->assertHeader('Content-Type', 'image/png'); // Texture is deleted Storage::disk('textures')->delete($steve->hash); $this->get("/raw/{$steve->tid}.png") - ->see(trans('general.texture-deleted')); + ->assertSee(trans('general.texture-deleted')); } }