lucas.mathieu/cachet-docker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #3363 from TakeMeNL/bugfix/3288

Browse Source 
Resolve #3288
This commit is contained in:
James Brooks
2018-12-17 17:27:04 +00:00
committed by GitHub
parent a7789dc1a6 5f1dfc6249
commit cddeac0066
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Api/ComponentController.php
View File

@@ -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)
));

7
tests/Api/ComponentTest.php
View File

@@ -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,
]);
}