feat: refactor how activities are managed and displayed (#2299)

This commit is contained in:
Regis Freyd
2019-12-16 20:42:02 -05:00
committed by GitHub
parent 44fa4871a4
commit 161ffcdc1f
64 changed files with 2114 additions and 1718 deletions
+15 -27
View File
@@ -12,32 +12,17 @@ class ActivityTest extends TestCase
{
use DatabaseTransactions;
public function testGetDescriptionReturnsNullIfUndefined()
{
$activity = new Activity;
$this->assertNull($activity->getDescription());
}
public function testGetDescriptionReturnsDescription()
{
$activity = new Activity;
$activity->description = 'This is a test';
$this->assertEquals(
'This is a test',
$activity->getDescription()
);
}
public function testGetDateItHappenedReturnsCarbonObject()
public function test_it_returns_the_happened_at()
{
$activity = factory(Activity::class)->make();
$this->assertInstanceOf(Carbon::class, $activity->date_it_happened);
$this->assertInstanceOf(
Carbon::class,
$activity->happened_at
);
}
public function testGetTitleReturnsAString()
public function test_it_returns_a_title()
{
$type = factory(ActivityType::class)->create();
@@ -45,7 +30,10 @@ class ActivityTest extends TestCase
'activity_type_id' => $type->id,
]);
$this->assertEquals($type->key, $activity->getTitle());
$this->assertEquals(
$type->key,
$activity->getTitle()
);
}
public function test_get_info_for_journal_entry()
@@ -58,11 +46,11 @@ class ActivityTest extends TestCase
'activity_type' => (! is_null($activity->type) ? $activity->type->name : null),
'summary' => $activity->summary,
'description' => $activity->description,
'day' => $activity->date_it_happened->day,
'day_name' => $activity->date_it_happened->format('D'),
'month' => $activity->date_it_happened->month,
'month_name' => strtoupper($activity->date_it_happened->format('M')),
'year' => $activity->date_it_happened->year,
'day' => $activity->happened_at->day,
'day_name' => $activity->happened_at->format('D'),
'month' => $activity->happened_at->month,
'month_name' => strtoupper($activity->happened_at->format('M')),
'year' => $activity->happened_at->year,
'attendees' => $activity->getContactsForAPI(),
];