From b771134688d80c4ad1be4c9ccb8adf7656f00d66 Mon Sep 17 00:00:00 2001 From: Pig Fang Date: Thu, 8 Aug 2019 15:02:21 +0800 Subject: [PATCH] Fix test --- app/Http/Controllers/AdminController.php | 2 +- tests/ModelsTest/UserTest.php | 18 ------------------ 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/app/Http/Controllers/AdminController.php b/app/Http/Controllers/AdminController.php index 29d0979e..812417a1 100644 --- a/app/Http/Controllers/AdminController.php +++ b/app/Http/Controllers/AdminController.php @@ -521,7 +521,7 @@ class AdminController extends Controller $owner = $player->user; if ( - $owner && $owner->uid !== $currentUser->uid && + $owner && $owner->uid != $currentUser->uid && $owner->permission >= $currentUser->permission ) { return json(trans('admin.players.no-permission'), 1); diff --git a/tests/ModelsTest/UserTest.php b/tests/ModelsTest/UserTest.php index 1f0d2651..8b99071b 100644 --- a/tests/ModelsTest/UserTest.php +++ b/tests/ModelsTest/UserTest.php @@ -224,24 +224,6 @@ class UserTest extends TestCase }); } - public function testRememberTokenAttribute() - { - factory(User::class)->create(); - Schema::table('users', function (Blueprint $table) { - $table->renameColumn('remember_token', 'bs_remember_token'); - }); - $user = ExtendedUser::first(); - $this->assertEquals($user->getAttribute('bs_remember_token'), $user->remember_token); - - $user->remember_token = 'abc'; - $user->save(); - $this->assertDatabaseHas('users', ['bs_remember_token' => 'abc']); - - Schema::table('users', function (Blueprint $table) { - $table->renameColumn('bs_remember_token', 'remember_token'); - }); - } - public function testGetPlayerNameAttribute() { $user = factory(User::class)->create();