Optimize test code.

This commit is contained in:
James Cole 2015-04-07 18:52:15 +02:00
parent f10f5d30bf
commit 05670cf393
4 changed files with 30 additions and 33 deletions

View File

@ -22,16 +22,6 @@ class TestCase extends Illuminate\Foundation\Testing\TestCase
return $app; return $app;
} }
/**
* 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();
}
/** /**
* Sets up the fixture, for example, opens a network connection. * Sets up the fixture, for example, opens a network connection.
* This method is called before a test is executed. * This method is called before a test is executed.
@ -44,7 +34,15 @@ class TestCase extends Illuminate\Foundation\Testing\TestCase
} }
/**
* 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();
}
/** /**
* @param string $class * @param string $class
@ -61,5 +59,4 @@ class TestCase extends Illuminate\Foundation\Testing\TestCase
} }
} }

View File

@ -174,7 +174,7 @@ class AccountControllerTest extends TestCase
// mock! // mock!
Amount::shouldReceive('getCurrencyCode')->once()->andReturn('A'); Amount::shouldReceive('getCurrencyCode')->once()->andReturn('A');
$repository = $this->mock('FireflyIII\Repositories\Account\AccountRepositoryInterface'); $repository = $this->mock('FireflyIII\Repositories\Account\AccountRepositoryInterface');
$repository->shouldReceive('getJournals')->andReturn(new LengthAwarePaginator([],0,10)); $repository->shouldReceive('getJournals')->andReturn(new LengthAwarePaginator([], 0, 10));
// get edit page: // get edit page:
$this->call('GET', '/accounts/show/' . $this->account->id); $this->call('GET', '/accounts/show/' . $this->account->id);

View File

@ -306,7 +306,7 @@ class GoogleChartControllerTest extends TestCase
// expect! // expect!
$repository->shouldReceive('incomeByPeriod')->andReturn($journals); $repository->shouldReceive('incomeByPeriod')->andReturn($journals);
$repository->shouldReceive('journalsByExpenseAccount')->andReturn($journals); $repository->shouldReceive('journalsByExpenseAccount')->andReturn($journals);
Preferences::shouldReceive('get')->withArgs(['showSharedReports',false])->once()->andReturn($preference); Preferences::shouldReceive('get')->withArgs(['showSharedReports', false])->once()->andReturn($preference);
$this->call('GET', '/chart/reports/income-expenses/2015'); $this->call('GET', '/chart/reports/income-expenses/2015');
@ -329,7 +329,7 @@ class GoogleChartControllerTest extends TestCase
// expect! // expect!
$repository->shouldReceive('incomeByPeriod')->andReturn($journals); $repository->shouldReceive('incomeByPeriod')->andReturn($journals);
$repository->shouldReceive('journalsByExpenseAccount')->andReturn($journals); $repository->shouldReceive('journalsByExpenseAccount')->andReturn($journals);
Preferences::shouldReceive('get')->withArgs(['showSharedReports',false])->once()->andReturn($preference); Preferences::shouldReceive('get')->withArgs(['showSharedReports', false])->once()->andReturn($preference);
$this->call('GET', '/chart/reports/income-expenses-sum/2015'); $this->call('GET', '/chart/reports/income-expenses-sum/2015');

View File

@ -25,23 +25,6 @@ class HomeControllerTest extends TestCase
parent::tearDown(); parent::tearDown();
} }
/**
* @covers FireflyIII\Http\Controllers\HomeController::dateRange
*/
public function testDateRangeWarning()
{
$start = '2014-03-01';
$end = '2015-03-31';
$this->be(new FireflyIII\User);
$this->call('POST', '/daterange', ['end' => $end, 'start' => $start,'_token' => 'replaceme']);
$this->assertResponseOk();
$this->assertSessionHas('start');
$this->assertSessionHas('end');
$this->assertSessionHas('warning');
}
/** /**
* @covers FireflyIII\Http\Controllers\HomeController::dateRange * @covers FireflyIII\Http\Controllers\HomeController::dateRange
*/ */
@ -52,7 +35,7 @@ class HomeControllerTest extends TestCase
$this->be(new FireflyIII\User); $this->be(new FireflyIII\User);
$this->call('POST', '/daterange', ['end' => $end, 'start' => $start,'_token' => 'replaceme']); $this->call('POST', '/daterange', ['end' => $end, 'start' => $start, '_token' => 'replaceme']);
$this->assertResponseOk(); $this->assertResponseOk();
$this->assertSessionHas('start'); $this->assertSessionHas('start');
@ -60,6 +43,23 @@ class HomeControllerTest extends TestCase
} }
/**
* @covers FireflyIII\Http\Controllers\HomeController::dateRange
*/
public function testDateRangeWarning()
{
$start = '2014-03-01';
$end = '2015-03-31';
$this->be(new FireflyIII\User);
$this->call('POST', '/daterange', ['end' => $end, 'start' => $start, '_token' => 'replaceme']);
$this->assertResponseOk();
$this->assertSessionHas('start');
$this->assertSessionHas('end');
$this->assertSessionHas('warning');
}
/** /**
* @covers FireflyIII\Http\Controllers\HomeController::index * @covers FireflyIII\Http\Controllers\HomeController::index
*/ */