Improve code quality and fix test coverage.

This commit is contained in:
James Cole
2018-04-28 10:27:33 +02:00
parent 7b39828980
commit e126427809
75 changed files with 430 additions and 369 deletions

View File

@@ -26,6 +26,7 @@ namespace Tests\Unit\Factory;
use Carbon\Carbon;
use FireflyIII\Factory\AccountFactory;
use FireflyIII\Models\AccountMeta;
use FireflyIII\Models\AccountType;
use Tests\TestCase;
@@ -65,7 +66,12 @@ class AccountFactoryTest extends TestCase
$this->assertEquals('', $account->iban);
$this->assertTrue($account->active);
$this->assertEquals('0', $account->virtual_balance);
$this->assertEquals('defaultAsset', $account->getMeta('accountRole'));
// get the role:
/** @var AccountMeta $meta */
$meta = $account->accountMeta()->where('name','accountRole')->first();
$this->assertNotNull($meta);
$this->assertEquals('defaultAsset', $meta->data);
}
/**
@@ -99,7 +105,12 @@ class AccountFactoryTest extends TestCase
$this->assertEquals('', $account->iban);
$this->assertTrue($account->active);
$this->assertEquals('0', $account->virtual_balance);
$this->assertEquals('defaultAsset', $account->getMeta('accountRole'));
// get the role:
/** @var AccountMeta $meta */
$meta = $account->accountMeta()->where('name','accountRole')->first();
$this->assertNotNull($meta);
$this->assertEquals('defaultAsset', $meta->data);
}
/**
@@ -134,8 +145,18 @@ class AccountFactoryTest extends TestCase
$this->assertEquals('', $account->iban);
$this->assertTrue($account->active);
$this->assertEquals('0', $account->virtual_balance);
$this->assertEquals('ccAsset', $account->getMeta('accountRole'));
$this->assertEquals('2018-01-01', $account->getMeta('ccMonthlyPaymentDate'));
// get the role:
/** @var AccountMeta $meta */
$meta = $account->accountMeta()->where('name','accountRole')->first();
$this->assertNotNull($meta);
$this->assertEquals('ccAsset', $meta->data);
// get the date:
/** @var AccountMeta $meta */
$meta = $account->accountMeta()->where('name','ccMonthlyPaymentDate')->first();
$this->assertNotNull($meta);
$this->assertEquals('2018-01-01', $meta->data);
}
/**
@@ -170,7 +191,11 @@ class AccountFactoryTest extends TestCase
$this->assertEquals('', $account->iban);
$this->assertTrue($account->active);
$this->assertEquals('0', $account->virtual_balance);
$this->assertEquals('', $account->getMeta('accountRole'));
// get the role:
/** @var AccountMeta $meta */
$meta = $account->accountMeta()->where('name','accountRole')->first();
$this->assertNull($meta);
}
/**
@@ -205,7 +230,11 @@ class AccountFactoryTest extends TestCase
$this->assertEquals('', $account->iban);
$this->assertTrue($account->active);
$this->assertEquals('0', $account->virtual_balance);
$this->assertEquals('', $account->getMeta('accountRole'));
// get the role:
/** @var AccountMeta $meta */
$meta = $account->accountMeta()->where('name','accountRole')->first();
$this->assertNull($meta);
}
/**
@@ -242,7 +271,12 @@ class AccountFactoryTest extends TestCase
$this->assertEquals('', $account->iban);
$this->assertTrue($account->active);
$this->assertEquals('0', $account->virtual_balance);
$this->assertEquals('defaultAsset', $account->getMeta('accountRole'));
// get the role:
/** @var AccountMeta $meta */
$meta = $account->accountMeta()->where('name','accountRole')->first();
$this->assertNotNull($meta);
$this->assertEquals('defaultAsset', $meta->data);
// find opening balance:
$this->assertEquals(1, $account->transactions()->count());
@@ -283,7 +317,12 @@ class AccountFactoryTest extends TestCase
$this->assertEquals('', $account->iban);
$this->assertTrue($account->active);
$this->assertEquals('0', $account->virtual_balance);
$this->assertEquals('defaultAsset', $account->getMeta('accountRole'));
// get the role:
/** @var AccountMeta $meta */
$meta = $account->accountMeta()->where('name','accountRole')->first();
$this->assertNotNull($meta);
$this->assertEquals('defaultAsset', $meta->data);
// find opening balance:
$this->assertEquals(0, $account->transactions()->count());
@@ -320,7 +359,12 @@ class AccountFactoryTest extends TestCase
$this->assertEquals('NL18RABO0326747238', $account->iban);
$this->assertTrue($account->active);
$this->assertEquals('0', $account->virtual_balance);
$this->assertEquals('defaultAsset', $account->getMeta('accountRole'));
// get the role:
/** @var AccountMeta $meta */
$meta = $account->accountMeta()->where('name','accountRole')->first();
$this->assertNotNull($meta);
$this->assertEquals('defaultAsset', $meta->data);
}
/**
@@ -354,7 +398,12 @@ class AccountFactoryTest extends TestCase
$this->assertEquals('', $account->iban);
$this->assertTrue($account->active);
$this->assertEquals('0', $account->virtual_balance);
$this->assertEquals('defaultAsset', $account->getMeta('accountRole'));
// get the role:
/** @var AccountMeta $meta */
$meta = $account->accountMeta()->where('name','accountRole')->first();
$this->assertNotNull($meta);
$this->assertEquals('defaultAsset', $meta->data);
}
/**
@@ -391,7 +440,12 @@ class AccountFactoryTest extends TestCase
$this->assertEquals('', $account->iban);
$this->assertTrue($account->active);
$this->assertEquals('0', $account->virtual_balance);
$this->assertEquals('defaultAsset', $account->getMeta('accountRole'));
// get the role:
/** @var AccountMeta $meta */
$meta = $account->accountMeta()->where('name','accountRole')->first();
$this->assertNotNull($meta);
$this->assertEquals('defaultAsset', $meta->data);
// find opening balance:
$this->assertEquals(1, $account->transactions()->count());
@@ -430,7 +484,13 @@ class AccountFactoryTest extends TestCase
$this->assertEquals('', $account->iban);
$this->assertTrue($account->active);
$this->assertEquals('0', $account->virtual_balance);
$this->assertEquals('defaultAsset', $account->getMeta('accountRole'));
// get the role:
/** @var AccountMeta $meta */
$meta = $account->accountMeta()->where('name','accountRole')->first();
$this->assertNotNull($meta);
$this->assertEquals('defaultAsset', $meta->data);
$note = $account->notes()->first();
$this->assertEquals('Hello!', $note->text);
}

View File

@@ -41,7 +41,7 @@ class RangeTest extends TestCase
public function testMiddlewareAuthenticated()
{
$repository = $this->mock(JournalRepositoryInterface::class);
$repository->shouldReceive('first')->andReturn(TransactionJournal::first());
$repository->shouldReceive('firstNull')->andReturn(TransactionJournal::first());
$this->withoutExceptionHandling();
$this->be($this->user());
$response = $this->get('/_test/range');

View File

@@ -38,7 +38,7 @@ class SandstormTest extends TestCase
/**
* @covers \FireflyIII\Http\Middleware\Sandstorm::handle
*/
public function testMiddlewareAnonEmpty()
public function testMiddlewareAnonEmpty(): void
{
putenv('SANDSTORM=1');
@@ -55,7 +55,7 @@ class SandstormTest extends TestCase
/**
* @covers \FireflyIII\Http\Middleware\Sandstorm::handle
*/
public function testMiddlewareAnonLoggedIn()
public function testMiddlewareAnonLoggedIn(): void
{
putenv('SANDSTORM=1');
@@ -70,7 +70,7 @@ class SandstormTest extends TestCase
/**
* @covers \FireflyIII\Http\Middleware\Sandstorm::handle
*/
public function testMiddlewareAnonUser()
public function testMiddlewareAnonUser(): void
{
putenv('SANDSTORM=1');
@@ -87,7 +87,7 @@ class SandstormTest extends TestCase
/**
* @covers \FireflyIII\Http\Middleware\Sandstorm::handle
*/
public function testMiddlewareLoggedIn()
public function testMiddlewareLoggedIn(): void
{
putenv('SANDSTORM=1');
@@ -102,7 +102,7 @@ class SandstormTest extends TestCase
/**
* @covers \FireflyIII\Http\Middleware\Sandstorm::handle
*/
public function testMiddlewareMultiUser()
public function testMiddlewareMultiUser(): void
{
putenv('SANDSTORM=1');
@@ -119,7 +119,7 @@ class SandstormTest extends TestCase
/**
* @covers \FireflyIII\Http\Middleware\Sandstorm::handle
*/
public function testMiddlewareNoUser()
public function testMiddlewareNoUser(): void
{
putenv('SANDSTORM=1');
@@ -139,7 +139,7 @@ class SandstormTest extends TestCase
/**
* @covers \FireflyIII\Http\Middleware\Sandstorm::handle
*/
public function testMiddlewareNotSandstorm()
public function testMiddlewareNotSandstorm(): void
{
$this->withoutExceptionHandling();
$response = $this->get('/_test/sandstorm');
@@ -149,7 +149,7 @@ class SandstormTest extends TestCase
/**
* @covers \FireflyIII\Http\Middleware\Sandstorm::handle
*/
public function testMiddlewareOneUser()
public function testMiddlewareOneUser(): void
{
putenv('SANDSTORM=1');
@@ -167,7 +167,7 @@ class SandstormTest extends TestCase
/**
* Set up test
*/
protected function setUp()
protected function setUp(): void
{
parent::setUp();