diff --git a/tests/Fakes/Minecraft.php b/tests/Fakes/Minecraft.php deleted file mode 100644 index 3543f4ce..00000000 --- a/tests/Fakes/Minecraft.php +++ /dev/null @@ -1,26 +0,0 @@ -swap(\Blessing\Minecraft::class, new Fakes\Minecraft()); - } - public function testJson() { $steve = factory(Texture::class)->create(); @@ -54,7 +48,7 @@ class TextureControllerTest extends TestCase $this->get('/preview/0')->assertNotFound(); - $this->mock(\Blessing\Minecraft::class, function ($mock) { + $this->mock(Minecraft::class, function ($mock) { $mock->shouldReceive('renderSkin')->andReturn(Image::canvas(1, 1)); $mock->shouldReceive('renderCape')->andReturn(Image::canvas(1, 1)); }); @@ -115,8 +109,11 @@ class TextureControllerTest extends TestCase ->assertSuccessful() ->assertHeader('Content-Type', 'image/webp'); + $this->mock(Minecraft::class, function ($mock) { + $mock->shouldReceive('render2dAvatar')->andReturn(Image::canvas(1, 1)); + }); $texture = factory(Texture::class)->create(); - $disk->put($texture->hash, Image::canvas(1, 1)->encode('webp')); + $disk->put($texture->hash, ''); $player->tid_skin = $texture->tid; $player->save(); $image = $this->get('/avatar/player/'.$player->name) @@ -146,8 +143,11 @@ class TextureControllerTest extends TestCase ->assertSuccessful() ->assertHeader('Content-Type', 'image/webp'); + $this->mock(Minecraft::class, function ($mock) { + $mock->shouldReceive('render2dAvatar')->andReturn(Image::canvas(1, 1)); + }); $texture = factory(Texture::class)->create(); - $disk->put($texture->hash, Image::canvas(1, 1)->encode('webp')); + $disk->put($texture->hash, ''); $user->avatar = $texture->tid; $user->save(); $image = $this->get('/avatar/user/'.$user->uid) @@ -185,7 +185,11 @@ class TextureControllerTest extends TestCase $this->assertEquals(100, $image->width()); $this->assertEquals(100, $image->height()); - $disk->put($texture->hash, Image::canvas(1, 1)->encode('webp')); + $this->mock(Minecraft::class, function ($mock) { + $mock->shouldReceive('render2dAvatar')->andReturn(Image::canvas(1, 1)); + $mock->shouldReceive('render3dAvatar')->andReturn(Image::canvas(1, 1)); + }); + $disk->put($texture->hash, ''); $image = $this->get('/avatar/'.$texture->tid) ->assertSuccessful() ->assertHeader('Content-Type', 'image/webp')