Leisuretimedock/blessing-skin-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove deprecated assertArraySubset

Browse Source
This commit is contained in:
Pig Fang 2019-08-07 15:46:34 +08:00
parent 7443766f4c
commit bbdd75ad44
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tests/SkinlibControllerTest.php
View File

@ -97,7 +97,7 @@ class SkinlibControllerTest extends TestCase
// Sort by `tid` // Sort by `tid`
$ordered = $skins->sortByDesc('tid')->map(function ($skin) { $ordered = $skins->sortByDesc('tid')->map(function ($skin) {
return $skin->tid; return $skin->tid;
})->values(); })->values()->all();
$items = $this->getJson('/skinlib/data?sort=tid') $items = $this->getJson('/skinlib/data?sort=tid')
->assertJson(['data' => [ ->assertJson(['data' => [
'current_uid' => 0, 'current_uid' => 0,
@ -107,7 +107,7 @@ class SkinlibControllerTest extends TestCase
$items = array_map(function ($item) { $items = array_map(function ($item) {
return $item['tid']; return $item['tid'];
}, $items); }, $items);
$this->assertArraySubset($ordered, $items); $this->assertEquals($ordered, $items);
// Search // Search
$keyword = Str::limit($skins->random()->name, 1, ''); $keyword = Str::limit($skins->random()->name, 1, '');
@ -135,7 +135,8 @@ class SkinlibControllerTest extends TestCase
->map(function ($skin) { ->map(function ($skin) {
return $skin->tid; return $skin->tid;
}) })
->values(); ->values()
->all();
$items = $this->getJson('/skinlib/data?sort=size&keyword='.$keyword) $items = $this->getJson('/skinlib/data?sort=size&keyword='.$keyword)
->assertJson(['data' => [ ->assertJson(['data' => [
'current_uid' => 0, 'current_uid' => 0,
@ -145,8 +146,8 @@ class SkinlibControllerTest extends TestCase
$items = array_map(function ($item) { $items = array_map(function ($item) {
return $item['tid']; return $item['tid'];
}, $items); }, $items);
$this->assertCount($filtered->count(), $items); $this->assertCount(count($filtered), $items);
$this->assertArraySubset($filtered, $items); $this->assertEquals($filtered, $items);
// Pagination // Pagination
$steves = factory(Texture::class) $steves = factory(Texture::class)