kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-05-04 05:06:37 +00:00
Code Issues Projects Releases Wiki Activity

Remove all references to reminders.

Browse Source
This commit is contained in:
James Cole
2015-06-22 21:31:12 +02:00
parent d00786c43f
commit a465cb2191
47 changed files with 45 additions and 1500 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/controllers/PiggyBankControllerTest.php
View File

@@ -363,7 +363,6 @@ class PiggyBankControllerTest extends TestCase
'account_id' => $piggyBank->account_id,
'targetamount' => 100,
'targetdate' => '',
'reminder' => 'month',
'_token' => 'replaceMe'
];
@@ -388,7 +387,6 @@ class PiggyBankControllerTest extends TestCase
'account_id' => $piggyBank->account_id,
'targetamount' => 100,
'targetdate' => '',
'reminder' => 'month',
'create_another' => 1,
'_token' => 'replaceMe'
];
@@ -414,7 +412,6 @@ class PiggyBankControllerTest extends TestCase
'account_id' => $piggyBank->account_id,
'targetamount' => 200,
'targetdate' => '',
'reminder' => 'month',
'_token' => 'replaceMe'
];
@@ -440,7 +437,6 @@ class PiggyBankControllerTest extends TestCase
'targetamount' => 200,
'targetdate' => '',
'return_to_edit' => 1,
'reminder' => 'month',
'_token' => 'replaceMe'
];

6
tests/controllers/TransactionControllerTest.php
View File

@@ -270,7 +270,6 @@ class TransactionControllerTest extends TestCase
$this->be($account->user);
$data = [
'reminder_id' => '',
'what' => 'withdrawal',
'description' => 'Bla bla bla',
'account_id' => $account->id,
@@ -291,7 +290,6 @@ class TransactionControllerTest extends TestCase
// fake!
$repository->shouldReceive('store')->andReturn($journal);
$repository->shouldReceive('deactivateReminder')->andReturnNull();
$this->call('POST', '/transactions/store/withdrawal', $data);
@@ -317,7 +315,6 @@ class TransactionControllerTest extends TestCase
$this->be($account->user);
$data = [
'reminder_id' => '',
'what' => 'withdrawal',
'description' => 'Bla bla bla',
'account_id' => $account->id,
@@ -337,7 +334,6 @@ class TransactionControllerTest extends TestCase
// fake!
$repository->shouldReceive('store')->andReturn($journal);
$repository->shouldReceive('deactivateReminder')->andReturnNull();
$this->call('POST', '/transactions/store/withdrawal', $data);
@@ -377,7 +373,6 @@ class TransactionControllerTest extends TestCase
$piggy->save();
$data = [
'reminder_id' => '',
'what' => 'transfer',
'description' => 'Bla bla bla',
'account_from_id' => $account->id,
@@ -398,7 +393,6 @@ class TransactionControllerTest extends TestCase
// fake!
$repository->shouldReceive('store')->andReturn($journal);
$repository->shouldReceive('deactivateReminder')->andReturnNull();
$this->call('POST', '/transactions/store/withdrawal', $data);

24
tests/factories/all.php
View File

@@ -124,28 +124,6 @@ FactoryMuffin::define(
]
);
FactoryMuffin::define(
'FireflyIII\Models\Reminder',
[
'user_id' => 'factory|FireflyIII\User',
'startdate' => 'date',
'enddate' => 'date',
'active' => 'boolean',
'notnow' => 'boolean',
'remindersable_id' => 'factory|FireflyIII\Models\Piggybank',
'remindersable_type' => 'FireflyIII\Models\Piggybank',
'metadata' => function () {
return [
'perReminder' => 100,
'rangesCount' => 0,
'ranges' => [],
'leftToSave' => 100,
];
},
'encrypted' => 1,
]
);
FactoryMuffin::define(
'FireflyIII\Models\Category',
@@ -259,8 +237,6 @@ FactoryMuffin::define(
},
'startdate' => 'date',
'targetdate' => 'date',
'reminder_skip' => 0,
'remind_me' => 0,
'order' => 0,
]
);

218
tests/helpers/ReminderHelperTest.php
View File

@@ -1,218 +0,0 @@
<?php
use Carbon\Carbon;
use FireflyIII\Helpers\Reminders\ReminderHelper;
use FireflyIII\Models\PiggyBankRepetition;
use FireflyIII\Models\Transaction;
use League\FactoryMuffin\Facade as FactoryMuffin;
/**
* Class ReminderHelperTest
*
* @SuppressWarnings(PHPMD.TooManyMethods)
*/
class ReminderHelperTest extends TestCase
{
/**
* @var ReminderHelper
*/
protected $object;
/**
* Sets up the fixture, for example, opens a network connection.
* This method is called before a test is executed.
*/
public function setUp()
{
parent::setUp();
FactoryMuffin::create('FireflyIII\User');
$this->object = new ReminderHelper;
}
/**
* Tears down the fixture, for example, closes a network connection.
* This method is called after a test is executed.
*/
public function tearDown()
{
parent::tearDown();
}
/**
* @covers FireflyIII\Helpers\Reminders\ReminderHelper::createReminder
*/
public function testCreateReminder()
{
$account = FactoryMuffin::create('FireflyIII\Models\Account');
$piggyBank = FactoryMuffin::create('FireflyIII\Models\PiggyBank');
$piggyBank->account_id = $account->id;
$start = Carbon::now()->startOfMonth();
$end = Carbon::now()->endOfMonth()->startOfDay();
$piggyBank->save();
$this->be($account->user);
$result = $this->object->createReminder($piggyBank, $start, $end);
$this->assertEquals($piggyBank->targetamount, $result->metadata->leftToSave);
}
/**
* @covers FireflyIII\Helpers\Reminders\ReminderHelper::createReminder
*/
public function testCreateReminderHaveAlready()
{
$account = FactoryMuffin::create('FireflyIII\Models\Account');
$piggyBank = FactoryMuffin::create('FireflyIII\Models\PiggyBank');
$reminder = FactoryMuffin::create('FireflyIII\Models\Reminder');
$piggyBank->account_id = $account->id;
$start = Carbon::now()->startOfMonth();
$end = Carbon::now()->endOfMonth()->startOfDay();
$reminder->remindersable_id = $piggyBank->id;
$reminder->startdate = $start;
$reminder->enddate = $end;
$reminder->user_id = $account->user_id;
$reminder->save();
$piggyBank->save();
$this->be($account->user);
$result = $this->object->createReminder($piggyBank, $start, $end);
$this->assertEquals($reminder->id, $result->id);
}
/**
* @covers FireflyIII\Helpers\Reminders\ReminderHelper::createReminder
*/
public function testCreateReminderNoTarget()
{
$account = FactoryMuffin::create('FireflyIII\Models\Account');
$piggyBank = FactoryMuffin::create('FireflyIII\Models\PiggyBank');
$piggyBank->targetdate = null;
$piggyBank->account_id = $account->id;
$start = Carbon::now()->startOfMonth();
$end = Carbon::now()->endOfMonth()->startOfDay();
$piggyBank->save();
$this->be($account->user);
$result = $this->object->createReminder($piggyBank, $start, $end);
$this->assertEquals(0, $result->metadata->leftToSave);
}
/**
* @covers FireflyIII\Helpers\Reminders\ReminderHelper::createReminders
*/
public function testCreateReminders()
{
$account = FactoryMuffin::create('FireflyIII\Models\Account');
$piggyBank = FactoryMuffin::create('FireflyIII\Models\PiggyBank');
$piggyBank->account_id = $account->id;
$piggyBank->startdate = new Carbon('2015-01-01');
$piggyBank->targetdate = new Carbon('2015-12-31');
$piggyBank->reminder = 'monthly';
$piggyBank->remind_me = true;
$piggyBank->save();
$this->be($account->user);
$this->object->createReminders($piggyBank, new Carbon('2015-05-05'));
$this->assertCount(1, $piggyBank->reminders()->get());
}
/**
* @covers FireflyIII\Helpers\Reminders\ReminderHelper::getReminderRanges
*/
public function testGetReminderRangesNull()
{
$piggyBank = FactoryMuffin::create('FireflyIII\Models\PiggyBank');
$result = $this->object->getReminderRanges($piggyBank);
$this->assertEquals([], $result);
}
/**
* @covers FireflyIII\Helpers\Reminders\ReminderHelper::getReminderRanges
*/
public function testGetReminderRangesWithTargetDate()
{
/** @var \FireflyIII\Models\PiggyBank $piggyBank */
$piggyBank = FactoryMuffin::create('FireflyIII\Models\PiggyBank');
$piggyBank->startdate = new Carbon('2015-01-01');
$piggyBank->targetdate = new Carbon('2015-12-31');
$piggyBank->reminder = 'monthly';
$piggyBank->remind_me = true;
$piggyBank->save();
$result = $this->object->getReminderRanges($piggyBank, new Carbon('2015-04-01'));
// date is ignored, result should be 12:
$this->assertCount(12, $result);
}
/**
* @covers FireflyIII\Helpers\Reminders\ReminderHelper::getReminderRanges
*/
public function testGetReminderRangesWithoutTargetDate()
{
/** @var \FireflyIII\Models\PiggyBank $piggyBank */
$piggyBank = FactoryMuffin::create('FireflyIII\Models\PiggyBank');
$piggyBank->startdate = new Carbon('2015-01-01');
$piggyBank->targetdate = null;
$piggyBank->reminder = 'monthly';
$piggyBank->remind_me = true;
$piggyBank->save();
$result = $this->object->getReminderRanges($piggyBank, new Carbon('2015-12-31'));
// date is a year later, result should be 12:
$this->assertCount(12, $result);
}
/**
* @covers FireflyIII\Helpers\Reminders\ReminderHelper::getReminderText
*/
public function testGetReminderTextDate()
{
$piggyBank = FactoryMuffin::create('FireflyIII\Models\PiggyBank');
$reminder = FactoryMuffin::create('FireflyIII\Models\Reminder');
$piggyBank->targetdate = new Carbon;
$this->be($piggyBank->account->user);
$reminder->remindersable_id = $piggyBank->id;
Amount::shouldReceive('format')->andReturn('xx');
$result = $this->object->getReminderText($reminder);
$strpos = strpos($result, 'to fill this piggy bank on ');
$this->assertTrue(!($strpos === false));
}
/**
* @covers FireflyIII\Helpers\Reminders\ReminderHelper::getReminderText
*/
public function testGetReminderTextNoPiggy()
{
$reminder = FactoryMuffin::create('FireflyIII\Models\Reminder');
$reminder->remindersable_id = 2;
$this->assertEquals('Piggy bank no longer exists.', $this->object->getReminderText($reminder));
}
/**
* @covers FireflyIII\Helpers\Reminders\ReminderHelper::getReminderText
*/
public function testGetReminderTextNullDate()
{
$piggyBank = FactoryMuffin::create('FireflyIII\Models\PiggyBank');
$reminder = FactoryMuffin::create('FireflyIII\Models\Reminder');
$piggyBank->targetdate = null;
$piggyBank->save();
$reminder->remindersable_id = $piggyBank->id;
$reminder->save();
Amount::shouldReceive('format')->andReturn('xx');
$result = $this->object->getReminderText($reminder);
$strpos = strpos($result, 'Add money to this piggy bank to reach your target of');
$this->assertTrue(!($strpos === false));
}
}

16
tests/repositories/JournalRepositoryTest.php
View File

@@ -1,6 +1,5 @@
<?php
use Carbon\Carbon;
use FireflyIII\Models\Reminder;
use FireflyIII\Models\Transaction;
use FireflyIII\Models\TransactionJournal;
use FireflyIII\Repositories\Journal\JournalRepository;
@@ -37,21 +36,6 @@ class JournalRepositoryTest extends TestCase
parent::tearDown();
}
/**
* @covers FireflyIII\Repositories\Journal\JournalRepository::deactivateReminder
*/
public function testDeactivateReminder()
{
$reminder = FactoryMuffin::create('FireflyIII\Models\Reminder');
$reminder->active = 1;
$reminder->save();
$this->be($reminder->user);
$this->object->deactivateReminder($reminder->id);
$this->assertEquals(1, Reminder::where('id', $reminder->id)->where('active', 0)->count());
}
/**
* @covers FireflyIII\Repositories\Journal\JournalRepository::delete
* @covers FireflyIII\Providers\EventServiceProvider::boot

14
tests/repositories/PiggyBankRepositoryTest.php
View File

@@ -1,7 +1,6 @@
<?php
use Carbon\Carbon;
use FireflyIII\Models\PiggyBank;
use FireflyIII\Models\Reminder;
use FireflyIII\Repositories\PiggyBank\PiggyBankRepository;
use League\FactoryMuffin\Facade as FactoryMuffin;
@@ -55,17 +54,10 @@ class PiggyBankRepositoryTest extends TestCase
public function testDestroy()
{
$piggyBank = FactoryMuffin::create('FireflyIII\Models\PiggyBank');
$reminder = FactoryMuffin::create('FireflyIII\Models\Reminder');
// attach reminders to the piggy bank:
$reminder->remindersable_id = $piggyBank->id;
$reminder->remindersable_type = 'FireflyIII\Models\PiggyBank';
$reminder->save();
$this->object->destroy($piggyBank);
$this->assertCount(0, PiggyBank::where('id', $piggyBank->id)->whereNull('deleted_at')->get());
$this->assertCount(0, Reminder::where('id', $reminder->id)->whereNull('deleted_at')->get());
}
@@ -142,11 +134,9 @@ class PiggyBankRepositoryTest extends TestCase
$account = FactoryMuffin::create('FireflyIII\Models\Account');
$data = [
'remind_me' => 1,
'account_id' => $account->id,
'name' => 'Some piggy',
'targetamount' => 100,
'reminder_skip' => 0,
'order' => 1,
];
@@ -166,12 +156,10 @@ class PiggyBankRepositoryTest extends TestCase
$account = FactoryMuffin::create('FireflyIII\Models\Account');
$data = [
'remind_me' => 1,
'account_id' => $account->id,
'name' => 'Some piggy',
'targetamount' => 100,
'create_another' => 1,
'reminder_skip' => 0,
'order' => 1,
];
@@ -193,9 +181,7 @@ class PiggyBankRepositoryTest extends TestCase
'account_id' => $piggyBank->account_id,
'targetamount' => 101,
'targetdate' => new Carbon,
'reminder' => null,
'startdate' => new Carbon,
'remind_me' => '1'
];
$new = $this->object->update($piggyBank, $data);

152
tests/repositories/ReminderRepositoryTest.php
View File

@@ -1,152 +0,0 @@
<?php
use Carbon\Carbon;
use FireflyIII\Repositories\Reminder\ReminderRepository;
use League\FactoryMuffin\Facade as FactoryMuffin;
/**
* Generated by PHPUnit_SkeletonGenerator on 2015-05-05 at 19:19:32.
*/
class ReminderRepositoryTest extends TestCase
{
/**
* @var ReminderRepository
*/
protected $object;
/**
* Sets up the fixture, for example, opens a network connection.
* This method is called before a test is executed.
*/
public function setUp()
{
parent::setUp();
$helper = $this->mock('FireflyIII\Helpers\Reminders\ReminderHelperInterface');
$helper->shouldReceive('getReminderText')->andReturn('Hello!');
$this->object = new ReminderRepository;
}
/**
* Tears down the fixture, for example, closes a network connection.
* This method is called after a test is executed.
*/
public function tearDown()
{
parent::tearDown();
}
/**
* @covers FireflyIII\Repositories\Reminder\ReminderRepository::getActiveReminders
*/
public function testGetActiveReminders()
{
$yesterday = Carbon::now()->subDay();
$tomorrow = Carbon::now()->addDay();
$user = FactoryMuffin::create('FireflyIII\User');
for ($i = 0; $i < 3; $i++) {
$reminder = FactoryMuffin::create('FireflyIII\Models\Reminder');
$reminder->active = 1;
$reminder->notnow = 0;
$reminder->startdate = $yesterday;
$reminder->enddate = $tomorrow;
$reminder->user_id = $user->id;
$reminder->save();
}
$reminder = FactoryMuffin::create('FireflyIII\Models\Reminder');
$reminder->active = 0;
$reminder->notnow = 0;
$reminder->startdate = $yesterday;
$reminder->enddate = $tomorrow;
$reminder->user_id = $user->id;
$reminder->save();
$this->be($user);
$set = $this->object->getActiveReminders();
$this->assertCount(3, $set);
}
/**
* @covers FireflyIII\Repositories\Reminder\ReminderRepository::getDismissedReminders
*/
public function testGetDismissedReminders()
{
$user = FactoryMuffin::create('FireflyIII\User');
for ($i = 0; $i < 3; $i++) {
$reminder = FactoryMuffin::create('FireflyIII\Models\Reminder');
$reminder->notnow = 1;
$reminder->user_id = $user->id;
$reminder->save();
}
$reminder = FactoryMuffin::create('FireflyIII\Models\Reminder');
$reminder->notnow = 0;
$reminder->user_id = $user->id;
$reminder->save();
$this->be($user);
$set = $this->object->getDismissedReminders();
$this->assertCount(3, $set);
}
/**
* @covers FireflyIII\Repositories\Reminder\ReminderRepository::getExpiredReminders
*/
public function testGetExpiredReminders()
{
$yesterday = Carbon::now()->subDay();
$tomorrow = Carbon::now()->addDay();
$user = FactoryMuffin::create('FireflyIII\User');
for ($i = 0; $i < 3; $i++) {
$reminder = FactoryMuffin::create('FireflyIII\Models\Reminder');
$reminder->active = 1;
$reminder->notnow = 0;
$reminder->startdate = $tomorrow;
$reminder->enddate = $yesterday;
$reminder->user_id = $user->id;
$reminder->save();
}
$reminder = FactoryMuffin::create('FireflyIII\Models\Reminder');
$reminder->active = 0;
$reminder->notnow = 0;
$reminder->startdate = $tomorrow;
$reminder->enddate = $yesterday;
$reminder->user_id = $user->id;
$reminder->save();
$this->be($user);
$set = $this->object->getExpiredReminders();
$this->assertCount(3, $set);
}
/**
* @covers FireflyIII\Repositories\Reminder\ReminderRepository::getInactiveReminders
*/
public function testGetInactiveReminders()
{
$user = FactoryMuffin::create('FireflyIII\User');
for ($i = 0; $i < 3; $i++) {
$reminder = FactoryMuffin::create('FireflyIII\Models\Reminder');
$reminder->active = 0;
$reminder->user_id = $user->id;
$reminder->save();
}
$reminder = FactoryMuffin::create('FireflyIII\Models\Reminder');
$reminder->active = 1;
$reminder->user_id = $user->id;
$reminder->save();
$this->be($user);
$set = $this->object->getInactiveReminders();
$this->assertCount(3, $set);
}
}