Route fixes and fix tests.

app/Http/Controllers/Account/IndexController.php

@@ -121,7 +121,4 @@ class IndexController extends Controller
     }
 
 
-
-
-
 }

app/Http/Controllers/Auth/RegisterController.php

@@ -28,10 +28,8 @@ use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Support\Http\Controllers\RequestInformation;
 use FireflyIII\User;
 use Illuminate\Auth\Events\Registered;
-use Illuminate\Contracts\Validation\Validator as ValidatorContract;
 use Illuminate\Foundation\Auth\RegistersUsers;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Validator;
 
 /**
  * Class RegisterController

app/Http/Controllers/Controller.php

@@ -29,7 +29,6 @@ use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 use Illuminate\Foundation\Bus\DispatchesJobs;
 use Illuminate\Foundation\Validation\ValidatesRequests;
 use Illuminate\Routing\Controller as BaseController;
-use Log;
 use Route;
 
 /**

app/Http/Controllers/DebugController.php

@@ -245,5 +245,4 @@ class DebugController extends Controller
     }
 
 
-
 }

app/Http/Controllers/HelpController.php

@@ -22,10 +22,8 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Controllers;
 
-use FireflyIII\Helpers\Help\HelpInterface;
 use FireflyIII\Support\Http\Controllers\RequestInformation;
 use Illuminate\Http\JsonResponse;
-use Log;
 
 /**
  * Class HelpController.

app/Http/Controllers/Popup/ReportController.php

@@ -22,19 +22,15 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Controllers\Popup;
 
-use Carbon\Carbon;
 use FireflyIII\Helpers\Collection\BalanceLine;
 use FireflyIII\Helpers\Report\PopupReportInterface;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
 use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
-use FireflyIII\Support\Binder\AccountList;
 use FireflyIII\Support\Http\Controllers\RequestInformation;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
-use Illuminate\Routing\Route;
-use InvalidArgumentException;
 use Log;
 use Throwable;
 

app/Http/Controllers/ProfileController.php

@@ -56,6 +56,7 @@ use phpseclib\Crypt\RSA;
 class ProfileController extends Controller
 {
     use RequestInformation;
+
     /**
      * ProfileController constructor.
      */

app/Http/Controllers/Transaction/SplitController.php

@@ -25,21 +25,15 @@ namespace FireflyIII\Http\Controllers\Transaction;
 use FireflyIII\Events\UpdatedTransactionJournal;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Helpers\Attachments\AttachmentHelperInterface;
-use FireflyIII\Helpers\Collector\JournalCollectorInterface;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Http\Requests\SplitJournalFormRequest;
-use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionJournal;
-use FireflyIII\Models\TransactionType;
 use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
 use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
 use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
 use FireflyIII\Support\Http\Controllers\ModelInformation;
 use FireflyIII\Support\Http\Controllers\RequestInformation;
-use FireflyIII\Transformers\TransactionTransformer;
 use Illuminate\Http\Request;
-use Illuminate\Support\Collection;
-use Symfony\Component\HttpFoundation\ParameterBag;
 use View;
 
 /**
@@ -178,7 +172,6 @@ class SplitController extends Controller
     }
 
 
-
     /**
      * Get info from old input.
      *

app/Support/Http/Controllers/RequestInformation.php

@@ -39,13 +39,13 @@ use FireflyIII\User;
 use Hash;
 use Illuminate\Contracts\Validation\Validator as ValidatorContract;
 use Illuminate\Http\Request;
+use Illuminate\Routing\Route;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Validator;
 use InvalidArgumentException;
 use Log;
-use Route;
 use Symfony\Component\HttpFoundation\ParameterBag;
-
+use Route as RouteFacade;
 /**
  * Trait RequestInformation
  *
@@ -193,7 +193,7 @@ trait RequestInformation
      */
     protected function getPageName(): string // get request info
     {
-        return str_replace('.', '_', Route::currentRouteName());
+        return str_replace('.', '_', RouteFacade::currentRouteName());
     }
 
     /**
@@ -203,7 +203,7 @@ trait RequestInformation
      */
     protected function getSpecificPageName(): string // get request info
     {
-        return null === Route::current()->parameter('what') ? '' : '_' . Route::current()->parameter('what');
+        return null === RouteFacade::current()->parameter('what') ? '' : '_' . RouteFacade::current()->parameter('what');
     }
 
     /**

tests/Feature/Controllers/Account/ShowControllerTest.php

@@ -166,7 +166,6 @@ class ShowControllerTest extends TestCase
 
     /**
      * @covers                   \FireflyIII\Http\Controllers\Account\ShowController
-     * @expectedExceptionMessage Expected a transaction
      */
     public function testShowBrokenInitial(): void
     {
@@ -180,7 +179,9 @@ class ShowControllerTest extends TestCase
         $this->be($this->user());
         $account  = $this->user()->accounts()->where('account_type_id', 6)->orderBy('id', 'ASC')->whereNull('deleted_at')->first();
         $response = $this->get(route('accounts.show', [$account->id]));
-        $response->assertStatus(500);
+        $response->assertStatus(302);
+        $response->assertRedirect(route('index'));
+        $response->assertSessionHas('error');
     }
 
     /**

tests/Feature/Controllers/Budget/IndexControllerTest.php

@@ -220,18 +220,10 @@ class IndexControllerTest extends TestCase
         $accountRepos->shouldReceive('getAccountsByType')->andReturn(new Collection);
 
         $repository->shouldReceive('cleanupBudgets');
-        $repository->shouldReceive('getActiveBudgets')->andReturn(new Collection([$budget]));
-        $repository->shouldReceive('getInactiveBudgets')->andReturn(new Collection);
-        $repository->shouldReceive('getAvailableBudget')->andReturn('100.123');
-        $repository->shouldReceive('spentInPeriod')->andReturn('-1');
-        $repository->shouldReceive('getBudgetLimits')->andReturn(new Collection([$budgetLimit]));
-        $repository->shouldReceive('collectBudgetInformation')->andReturn($budgetInfo);
 
         $this->be($this->user());
         $this->changeDateRange($this->user(), $range);
         $response = $this->get(route('budgets.index', ['Hello-there']));
-        $response->assertStatus(200);
+        $response->assertStatus(404);
-        // has bread crumb
-        $response->assertSee('<ol class="breadcrumb">');
     }
 }

tests/Feature/Controllers/ExportControllerTest.php

@@ -61,6 +61,8 @@ class ExportControllerTest extends TestCase
         $repository   = $this->mock(ExportJobRepositoryInterface::class);
         $journalRepos = $this->mock(JournalRepositoryInterface::class);
         $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal);
+        $repository->shouldReceive('changeStatus')->once();
+
 
         $repository->shouldReceive('exists')->once()->andReturn(true);
         $repository->shouldReceive('getContent')->once()->andReturn('Some content beep boop');

tests/Feature/Controllers/Rule/CreateControllerTest.php

@@ -100,7 +100,7 @@ class CreateControllerTest extends TestCase
 
         $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal);
         $repository->shouldReceive('store')->andReturn(new Rule);
-        $repository->shouldReceive('find')->withArgs([0])->andReturn(new Rule)->once();
+        //$repository->shouldReceive('find')->withArgs([0])->andReturn(new Rule)->once();
 
         $this->session(['rules.create.uri' => 'http://localhost']);
         $data = [

tests/Feature/Controllers/Rule/EditControllerTest.php

@@ -106,7 +106,6 @@ class EditControllerTest extends TestCase
         $journalRepos = $this->mock(JournalRepositoryInterface::class);
         $rule         = Rule::find(1);
         $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal);
-        $repository->shouldReceive('find')->withArgs([1])->andReturn($rule)->once();
         $repository->shouldReceive('update');
 
         $data = [

tests/Feature/Controllers/Transaction/SingleControllerTest.php

@@ -229,6 +229,7 @@ class SingleControllerTest extends TestCase
         $attRepos      = $this->mock(AttachmentHelperInterface::class);
         $currencyRepos = $this->mock(CurrencyRepositoryInterface::class);
         $journalRepos  = $this->mock(JournalRepositoryInterface::class);
+        $journalRepos->shouldReceive('setUser')->once();
         $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal);
         $account = $this->user()->accounts()->first();
 
@@ -272,6 +273,7 @@ class SingleControllerTest extends TestCase
         $currencyRepos = $this->mock(CurrencyRepositoryInterface::class);
         $journalRepos  = $this->mock(JournalRepositoryInterface::class);
         $journalRepos->shouldReceive('firstNull')->andReturn(new TransactionJournal);
+        $journalRepos->shouldReceive('setUser')->once();
 
         $budgetRepos->shouldReceive('getBudgets')->andReturn(new Collection)->once();
 
@@ -318,6 +320,7 @@ class SingleControllerTest extends TestCase
         $currencyRepos = $this->mock(CurrencyRepositoryInterface::class);
         $journalRepos  = $this->mock(JournalRepositoryInterface::class);
         $journalRepos->shouldReceive('firstNull')->andReturn(new TransactionJournal);
+        $journalRepos->shouldReceive('setUser')->once();
 
 
         $budgetRepos->shouldReceive('getBudgets')->andReturn(new Collection)->once();
@@ -390,6 +393,7 @@ class SingleControllerTest extends TestCase
         $currencyRepos = $this->mock(CurrencyRepositoryInterface::class);
         $journalRepos  = $this->mock(JournalRepositoryInterface::class);
         $journalRepos->shouldReceive('firstNull')->andReturn(new TransactionJournal);
+        $journalRepos->shouldReceive('setUser')->once();
 
         $this->be($this->user());
         $withdrawal = TransactionJournal::where('transaction_type_id', 1)
@@ -439,6 +443,7 @@ class SingleControllerTest extends TestCase
         $currencyRepos = $this->mock(CurrencyRepositoryInterface::class);
         $journalRepos  = $this->mock(JournalRepositoryInterface::class);
         $journalRepos->shouldReceive('firstNull')->andReturn(new TransactionJournal);
+        $journalRepos->shouldReceive('setUser')->once();
 
 
         $budgetRepos->shouldReceive('getBudgets')->andReturn(new Collection)->once();
@@ -487,6 +492,7 @@ class SingleControllerTest extends TestCase
         $currencyRepos = $this->mock(CurrencyRepositoryInterface::class);
         $journalRepos  = $this->mock(JournalRepositoryInterface::class);
         $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal);
+        $journalRepos->shouldReceive('setUser')->once();
 
         $account = $this->user()->accounts()->first();
         $budgetRepos->shouldReceive('getBudgets')->andReturn(new Collection)->once();
@@ -528,6 +534,7 @@ class SingleControllerTest extends TestCase
         $currencyRepos = $this->mock(CurrencyRepositoryInterface::class);
         $journalRepos  = $this->mock(JournalRepositoryInterface::class);
         $journalRepos->shouldReceive('firstNull')->andReturn(new TransactionJournal);
+        $journalRepos->shouldReceive('setUser')->once();
 
         $budgetRepos->shouldReceive('getBudgets')->andReturn(new Collection)->once();