mirror_php/Cachet
1
0
Fork 0
mirror of https://github.com/CachetHQ/Cachet.git synced 2025-01-17 05:28:18 +01:00
Code Issues Projects Releases Wiki Activity

Fix tests

Browse Source
This commit is contained in:
James Brooks 2018-06-27 14:39:49 +01:00
parent 55002bb4b4
commit 1ac884805d
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/Models/MetricPoint.php
View File

@ -92,13 +92,17 @@ class MetricPoint extends Model implements HasPresenter
/**
* Round the created at value into intervals of 30 seconds.
*
* @param string $value
* @param string $createdAt
*
* @return void
* @return string|void
*/
public function setCreatedAtAttribute($value)
public function setCreatedAtAttribute($createdAt)
{
$timestamp = $value->format('U');
if (!$createdAt) return;
$createdAt = Carbon::parse($createdAt);
$timestamp = $createdAt->format('U');
$timestamp = 30 * round($timestamp / 30);
return Carbon::createFromFormat('U', $timestamp)->toDateTimeString();

3
tests/Api/MetricPointTest.php
View File

@ -78,11 +78,12 @@ class MetricPointTest extends AbstractApiTestCase
$postData['timestamp'] = $timestamp;
$response = $this->json('POST', "/api/v1/metrics/{$metric->id}/points", $postData);
$response->dump();
$response->assertStatus(200);
$response->assertJsonFragment([
'value' => $metricPoint->value,
'created_at' => date('Y-m-d H:i:s', 1434369116),
'created_at' => date('Y-m-d H:i:00', 1434369116),
]);
}