From 5f1dfc624934a92f5cf1c6829955bcf64aa3e9df Mon Sep 17 00:00:00 2001 From: TakeMeNL Date: Sun, 16 Dec 2018 21:51:00 +0100 Subject: [PATCH] Resolve #3288 If Binput::get('enabled') is not defined this will return NULL which resulted in a false. Updated tests --- app/Http/Controllers/Api/ComponentController.php | 2 +- tests/Api/ComponentTest.php | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/Api/ComponentController.php b/app/Http/Controllers/Api/ComponentController.php index 7d1b800e..609eeba6 100644 --- a/app/Http/Controllers/Api/ComponentController.php +++ b/app/Http/Controllers/Api/ComponentController.php @@ -124,7 +124,7 @@ class ComponentController extends AbstractApiController Binput::get('link'), Binput::get('order'), Binput::get('group_id'), - (bool) Binput::get('enabled'), + Binput::get('enabled', $component->enabled), Binput::get('meta', null), (bool) Binput::get('silent', false) )); diff --git a/tests/Api/ComponentTest.php b/tests/Api/ComponentTest.php index a63f8102..84f722fc 100644 --- a/tests/Api/ComponentTest.php +++ b/tests/Api/ComponentTest.php @@ -174,7 +174,7 @@ class ComponentTest extends AbstractApiTestCase ]); $response->assertStatus(200); - $response->assertJsonFragment(['name' => 'Foo']); + $response->assertJsonFragment(['name' => 'Foo', 'enabled' => $component->enabled]); } public function test_can_update_component_without_status_change() @@ -190,7 +190,7 @@ class ComponentTest extends AbstractApiTestCase ]); $response->assertStatus(200); - $response->assertJsonFragment(['name' => 'Foo']); + $response->assertJsonFragment(['name' => 'Foo', 'enabled' => $component->enabled]); } public function test_can_update_component_with_status_change() @@ -211,7 +211,7 @@ class ComponentTest extends AbstractApiTestCase ]); $response->assertStatus(200); - $response->assertJsonFragment(['name' => 'Foo', 'status' => 2]); + $response->assertJsonFragment(['name' => 'Foo', 'status' => 2, 'enabled' => $component->enabled]); } public function test_can_update_component_with_meta_data() @@ -238,6 +238,7 @@ class ComponentTest extends AbstractApiTestCase 'uuid' => '172ff3fb-41f7-49d3-8bcd-f57b53627fa0', 'foo' => 'bar', ], + 'enabled' => $component->enabled, ]); }