Merge branch 'develop' of https://github.com/firefly-iii/firefly-iii into develop

* 'develop' of https://github.com/firefly-iii/firefly-iii:
  remove first slash in mass transaction changes
- Fix user event handler test
- Fix 404 view
This commit is contained in:
James Cole
2018-09-23 07:39:31 +02:00
3 changed files with 19 additions and 10 deletions

View File

@@ -81,7 +81,7 @@ class UserEventHandlerTest extends TestCase
{
$repository = $this->mock(UserRepositoryInterface::class);
$user = $this->user();
$event = new Login($user, true);
$event = new Login(null, $user, true);
$listener = new UserEventHandler();
// mock stuff
@@ -99,7 +99,7 @@ class UserEventHandlerTest extends TestCase
{
$repository = $this->mock(UserRepositoryInterface::class);
$user = $this->emptyUser();
$event = new Login($user, true);
$event = new Login(null, $user, true);
$listener = new UserEventHandler();
// mock stuff
@@ -121,7 +121,7 @@ class UserEventHandlerTest extends TestCase
{
$repository = $this->mock(UserRepositoryInterface::class);
$user = $this->emptyUser();
$event = new Login($user, true);
$event = new Login(null, $user, true);
$listener = new UserEventHandler();
// mock stuff
@@ -141,7 +141,7 @@ class UserEventHandlerTest extends TestCase
{
$repository = $this->mock(UserRepositoryInterface::class);
$user = $this->user();
$event = new Login($user, true);
$event = new Login(null, $user, true);
$listener = new UserEventHandler();
// mock stuff
@@ -159,7 +159,7 @@ class UserEventHandlerTest extends TestCase
{
$repository = $this->mock(UserRepositoryInterface::class);
$user = $this->emptyUser();
$event = new Login($user, true);
$event = new Login(null, $user, true);
$listener = new UserEventHandler();
// mock stuff