From b38ed06f6eae329afa28390168de60125f00a076 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Sat, 4 Apr 2015 21:52:56 +0200
Subject: [PATCH] New tests.

---
 tests/TestCase.php                          |  2 +-
 tests/controllers/AccountControllerTest.php | 54 +++++++++++----------
 2 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/tests/TestCase.php b/tests/TestCase.php
index c7be516d16..9ceb86ea36 100644
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -29,7 +29,7 @@ class TestCase extends Illuminate\Foundation\Testing\TestCase
      */
     public static function setUpBeforeClass()
     {
-
+        parent::setUpBeforeClass();
     }
 
     /**
diff --git a/tests/controllers/AccountControllerTest.php b/tests/controllers/AccountControllerTest.php
index 967146f737..d2a1e1bfd5 100644
--- a/tests/controllers/AccountControllerTest.php
+++ b/tests/controllers/AccountControllerTest.php
@@ -12,8 +12,8 @@ use League\FactoryMuffin\Facade as FactoryMuffin;
  */
 class AccountControllerTest extends TestCase
 {
-
-    protected $account;
+    /** @var  Account */
+    public $account;
 
     /**
      * Sets up the fixture, for example, opens a network connection.
@@ -22,10 +22,18 @@ class AccountControllerTest extends TestCase
     public function setUp()
     {
         parent::setUp();
-        $this->account = FactoryMuffin::create('FireflyIII\Models\Account');
-
+        $this->createAccount();
     }
 
+    /**
+     * This method is called before the first test of this test class is run.
+     *
+     * @since Method available since Release 3.4.0
+     */
+    public static function setUpBeforeClass()
+    {
+        parent::setUpBeforeClass();
+    }
 
     /**
      * Tears down the fixture, for example, closes a network connection.
@@ -33,21 +41,19 @@ class AccountControllerTest extends TestCase
      */
     public function tearDown()
     {
-
-        foreach (DB::table('accounts')->get() as $entry) {
-            DB::table('accounts')->delete($entry->id);
-        }
-        foreach (DB::table('account_types')->get() as $entry) {
-            DB::table('account_types')->delete($entry->id);
-        }
         parent::tearDown();
-        /*
-         * Delete some entries?
-         */
-
 
     }
 
+    public function createAccount()
+    {
+        if (is_null($this->account)) {
+            $this->account                    = FactoryMuffin::create('FireflyIII\Models\Account');
+            Log::debug('Created a new account.');
+            //$this->account->accountType->type = 'Asset account';
+            //$this->account->accountType->save();
+        }
+    }
 
     public function testCreate()
     {
@@ -75,9 +81,6 @@ class AccountControllerTest extends TestCase
 
     public function testDelete()
     {
-        // fake an account.
-        $this->account->accountType->type = 'Asset account';
-        $this->account->accountType->save();
 
         $this->be($this->account->user);
         $this->call('GET', '/accounts/delete/' . $this->account->id);
@@ -89,13 +92,15 @@ class AccountControllerTest extends TestCase
     public function testDestroy()
     {
         // fake an account.
-        $this->be($this->account->user);
-        $this->assertCount(1, DB::table('accounts')->where('id', $this->account->id)->whereNull('deleted_at')->get());
+        $account = FactoryMuffin::create('FireflyIII\Models\Account');
+
+        $this->be($account->user);
+        $this->assertCount(1, DB::table('accounts')->where('id', $account->id)->whereNull('deleted_at')->get());
 
         // post it!
-        $this->call('POST', '/accounts/destroy/' . $this->account->id, ['_token' => 'replaceme']);
+        $this->call('POST', '/accounts/destroy/' . $account->id, ['_token' => 'replaceme']);
         $this->assertSessionHas('success');
-        $this->assertCount(0, DB::table('accounts')->where('id', $this->account->id)->whereNull('deleted_at')->get());
+        $this->assertCount(0, DB::table('accounts')->where('id', $account->id)->whereNull('deleted_at')->get());
     }
 
     public function testEdit()
@@ -160,13 +165,12 @@ class AccountControllerTest extends TestCase
     public function testShow()
     {
         // an account:
-        $account = FactoryMuffin::create('FireflyIII\Models\Account');
-        $this->be($account->user);
+        $this->be($this->account->user);
 
         Amount::shouldReceive('getCurrencyCode')->once()->andReturn('A');
 
         // get edit page:
-        $this->call('GET', '/accounts/show/' . $account->id);
+        $this->call('GET', '/accounts/show/' . $this->account->id);
         $this->assertResponseOk();
     }