mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2025-02-25 18:45:27 -06:00
Cover endOfPeriod method of the Navigation class
The custom frequency requires a timezone configuration, forcing it to run in the integration test scope. Running the integration tests requires a database connection in the build process. It enables other case tests. The API Tests cause interference in other tests, requiring isolating them.
This commit is contained in:
parent
b6aa76477e
commit
dd2f8d4404
60
.github/workflows/sonarcloud.yml
vendored
60
.github/workflows/sonarcloud.yml
vendored
@ -1,14 +1,37 @@
|
|||||||
name: Sonarcloud
|
name: Sonarcloud
|
||||||
on:
|
on:
|
||||||
pull_request:
|
pull_request:
|
||||||
push:
|
push:
|
||||||
branches:
|
branches:
|
||||||
- main
|
- main
|
||||||
- develop
|
- develop
|
||||||
|
env:
|
||||||
|
DB_CONNECTION: mysql
|
||||||
|
DB_HOST: "127.0.0.1"
|
||||||
|
DB_DATABASE: firefly
|
||||||
|
DB_USER: firefly
|
||||||
|
DB_PASSWORD: secret_firefly_password
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
sonarcloud:
|
sonarcloud:
|
||||||
name: SonarCloud
|
name: SonarCloud
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
services:
|
||||||
|
mariadb:
|
||||||
|
image: mariadb:latest
|
||||||
|
ports:
|
||||||
|
- 3306:3306
|
||||||
|
env:
|
||||||
|
MYSQL_ROOT_PASSWORD: yes
|
||||||
|
MYSQL_USER: ${{ env.DB_USER }}
|
||||||
|
MYSQL_PASSWORD: ${{ env.DB_PASSWORD }}
|
||||||
|
MYSQL_DATABASE: ${{ env.DB_DATABASE }}
|
||||||
|
options: >-
|
||||||
|
--health-cmd="healthcheck.sh --connect --innodb_initialized"
|
||||||
|
--health-interval=10s
|
||||||
|
--health-timeout=5s
|
||||||
|
--health-retries=3
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v3
|
||||||
with:
|
with:
|
||||||
@ -24,16 +47,49 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
php-version: '8.2'
|
php-version: '8.2'
|
||||||
coverage: xdebug
|
coverage: xdebug
|
||||||
|
extensions: >-
|
||||||
|
bcmath
|
||||||
|
curl
|
||||||
|
fileinfo
|
||||||
|
iconv
|
||||||
|
intl
|
||||||
|
json
|
||||||
|
mbstring
|
||||||
|
openssl
|
||||||
|
pdo
|
||||||
|
session
|
||||||
|
simplexml
|
||||||
|
sodium
|
||||||
|
tokenizer
|
||||||
|
xml
|
||||||
|
xmlwriter
|
||||||
|
|
||||||
- name: Install Composer dependencies
|
- name: Install Composer dependencies
|
||||||
run: composer install --prefer-dist --no-interaction --no-progress --no-scripts
|
run: composer install --prefer-dist --no-interaction --no-progress --no-scripts
|
||||||
|
|
||||||
|
- name: Verify Database connection
|
||||||
|
env:
|
||||||
|
PORT: ${{ job.services.mariadb.ports[3306] }}
|
||||||
|
run: |
|
||||||
|
while ! mysqladmin ping -h"${{env.DB_HOST}}" -P"${PORT}" --silent; do
|
||||||
|
sleep 1
|
||||||
|
done
|
||||||
|
|
||||||
- name: Copy environment file
|
- name: Copy environment file
|
||||||
run: cp .env.example .env
|
run: sed 's@DB_HOST=.*@DB_HOST=${{env.DB_HOST}}@g' .env.example > .env
|
||||||
|
|
||||||
- name: Generate app key
|
- name: Generate app key
|
||||||
run: php artisan key:generate
|
run: php artisan key:generate
|
||||||
|
|
||||||
|
- name: "Create the database"
|
||||||
|
run: php artisan firefly-iii:create-database
|
||||||
|
|
||||||
|
- name: "Upgrades the database to the latest version"
|
||||||
|
run: php artisan firefly-iii:upgrade-database
|
||||||
|
|
||||||
|
- name: "Integrity Database Report"
|
||||||
|
run: php artisan firefly-iii:report-integrity
|
||||||
|
|
||||||
- name: "Run tests with coverage"
|
- name: "Run tests with coverage"
|
||||||
run: composer coverage
|
run: composer coverage
|
||||||
|
|
||||||
|
@ -83,6 +83,7 @@ class CreateDatabase extends Command
|
|||||||
$pdo = new PDO($dsn, env('DB_USERNAME'), env('DB_PASSWORD'), $options);
|
$pdo = new PDO($dsn, env('DB_USERNAME'), env('DB_PASSWORD'), $options);
|
||||||
} catch (PDOException $e) {
|
} catch (PDOException $e) {
|
||||||
$this->friendlyError(sprintf('Error when connecting to DB: %s', $e->getMessage()));
|
$this->friendlyError(sprintf('Error when connecting to DB: %s', $e->getMessage()));
|
||||||
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
// only continue when no error.
|
// only continue when no error.
|
||||||
|
@ -176,7 +176,7 @@
|
|||||||
"@php vendor/bin/phpunit -c phpunit.xml --testsuite integration --no-coverage"
|
"@php vendor/bin/phpunit -c phpunit.xml --testsuite integration --no-coverage"
|
||||||
],
|
],
|
||||||
"coverage": [
|
"coverage": [
|
||||||
"@php vendor/bin/phpunit -c phpunit.xml --testsuite unit"
|
"@php vendor/bin/phpunit -c phpunit.xml"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"config": {
|
"config": {
|
||||||
|
@ -33,6 +33,7 @@
|
|||||||
stopOnFailure="true">
|
stopOnFailure="true">
|
||||||
<php>
|
<php>
|
||||||
<env name="APP_ENV" value="testing"/>
|
<env name="APP_ENV" value="testing"/>
|
||||||
|
<env name="DB_HOST" value="127.0.0.1"/>
|
||||||
<env name="CACHE_DRIVER" value="array"/>
|
<env name="CACHE_DRIVER" value="array"/>
|
||||||
<env name="SESSION_DRIVER" value="array"/>
|
<env name="SESSION_DRIVER" value="array"/>
|
||||||
<env name="QUEUE_DRIVER" value="sync"/>
|
<env name="QUEUE_DRIVER" value="sync"/>
|
||||||
|
@ -23,8 +23,6 @@ declare(strict_types=1);
|
|||||||
|
|
||||||
namespace Tests\integration\Api\Autocomplete;
|
namespace Tests\integration\Api\Autocomplete;
|
||||||
|
|
||||||
use Laravel\Passport\Passport;
|
|
||||||
use Log;
|
|
||||||
use Tests\integration\TestCase;
|
use Tests\integration\TestCase;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -32,33 +30,16 @@ use Tests\integration\TestCase;
|
|||||||
*/
|
*/
|
||||||
class AccountControllerTest extends TestCase
|
class AccountControllerTest extends TestCase
|
||||||
{
|
{
|
||||||
/**
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
public function setUp(): void
|
|
||||||
{
|
|
||||||
parent::setUp();
|
|
||||||
Passport::actingAs($this->user());
|
|
||||||
Log::info(sprintf('Now in %s.', get_class($this)));
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @covers \FireflyIII\Api\V1\Controllers\Autocomplete\AccountController
|
* @covers \FireflyIII\Api\V1\Controllers\Autocomplete\AccountController
|
||||||
|
* @runInSeparateProcess
|
||||||
*/
|
*/
|
||||||
public function testAccounts(): void
|
public function testGivenAnUnauthenticatedRequestWhenCallingTheAccountsEndpointThenReturns401HttpCode(): void
|
||||||
{
|
{
|
||||||
// test API
|
// test API
|
||||||
$response = $this->get(route('api.v1.autocomplete.accounts'), ['Accept' => 'application/json']);
|
$response = $this->get(route('api.v1.autocomplete.accounts'), ['Accept' => 'application/json']);
|
||||||
$response->assertStatus(200);
|
$response->assertStatus(401);
|
||||||
$response->assertHeader('Content-Type', 'application/json');
|
$response->assertHeader('Content-Type', 'application/json');
|
||||||
$response->assertSee('Checking Account');
|
$response->assertContent('{"message":"Unauthenticated","exception":"AuthenticationException"}');
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
public function testBasic(): void
|
|
||||||
{
|
|
||||||
$this->assertTrue(true);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -0,0 +1,25 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace Tests\integration\Support;
|
||||||
|
|
||||||
|
use Carbon\Carbon;
|
||||||
|
use FireflyIII\Support\Navigation;
|
||||||
|
use Tests\integration\TestCase;
|
||||||
|
|
||||||
|
class NavigationCustomEndOfPeriodTest extends TestCase
|
||||||
|
{
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @runInSeparateProcess
|
||||||
|
* @preserveGlobalState disabled
|
||||||
|
*/
|
||||||
|
public function testGivenADateAndCustomFrequencyWhenCalculateTheDateThenReturnsTheEndOfMonthSuccessful()
|
||||||
|
{
|
||||||
|
$from = Carbon::parse('2023-08-05');
|
||||||
|
$expected = Carbon::parse('2023-09-04');
|
||||||
|
$navigation = new Navigation();
|
||||||
|
|
||||||
|
$period = $navigation->endOfPeriod($from, 'custom');
|
||||||
|
$this->assertEquals($expected->toDateString(), $period->toDateString());
|
||||||
|
}
|
||||||
|
}
|
107
tests/unit/Support/NavigationEndOfPeriodTest.php
Normal file
107
tests/unit/Support/NavigationEndOfPeriodTest.php
Normal file
@ -0,0 +1,107 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Copyright (c) 2023 Antonio Spinelli <https://github.com/tonicospinelli>
|
||||||
|
*
|
||||||
|
* This file is part of Firefly III (https://github.com/firefly-iii).
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU Affero General Public License as
|
||||||
|
* published by the Free Software Foundation, either version 3 of the
|
||||||
|
* License, or (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU Affero General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Affero General Public License
|
||||||
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace Tests\unit\Support;
|
||||||
|
|
||||||
|
use Carbon\Carbon;
|
||||||
|
use FireflyIII\Support\Navigation;
|
||||||
|
use Illuminate\Support\Facades\Log;
|
||||||
|
use PHPUnit\Framework\TestCase;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @group unit-test
|
||||||
|
* @group support
|
||||||
|
* @group navigation
|
||||||
|
*/
|
||||||
|
class NavigationEndOfPeriodTest extends TestCase
|
||||||
|
{
|
||||||
|
private Navigation $navigation;
|
||||||
|
|
||||||
|
public function __construct(string $name)
|
||||||
|
{
|
||||||
|
parent::__construct($name);
|
||||||
|
$this->navigation = new Navigation();
|
||||||
|
}
|
||||||
|
|
||||||
|
public static function provideDates(): array
|
||||||
|
{
|
||||||
|
return [
|
||||||
|
'1D' => ['frequency' => '1D', 'from' => Carbon::now(), 'expected' => Carbon::now()->endOfDay()],
|
||||||
|
'daily' => ['frequency' => 'daily', 'from' => Carbon::now(), 'expected' => Carbon::now()->endOfDay()],
|
||||||
|
'1W' => ['frequency' => '1W', 'from' => Carbon::now(), 'expected' => Carbon::now()->addWeek()->subDay()->endOfDay()],
|
||||||
|
'week' => ['frequency' => 'week', 'from' => Carbon::now(), 'expected' => Carbon::now()->addWeek()->subDay()->endOfDay()],
|
||||||
|
'weekly' => ['frequency' => 'weekly', 'from' => Carbon::now(), 'expected' => Carbon::now()->addWeek()->subDay()->endOfDay()],
|
||||||
|
'month' => ['frequency' => 'month', 'from' => Carbon::now(), 'expected' => Carbon::now()->addMonth()->subDay()->endOfDay()],
|
||||||
|
'1M' => ['frequency' => '1M', 'from' => Carbon::now(), 'expected' => Carbon::now()->addMonth()->subDay()->endOfDay()],
|
||||||
|
'monthly' => ['frequency' => 'monthly', 'from' => Carbon::now(), 'expected' => Carbon::now()->addMonth()->subDay()->endOfDay()],
|
||||||
|
'3M' => ['frequency' => '3M', 'from' => Carbon::now(), 'expected' => Carbon::now()->addQuarterNoOverflow()->subDay()->endOfDay()],
|
||||||
|
'quarter' => ['frequency' => 'quarter', 'from' => Carbon::now(), 'expected' => Carbon::now()->addQuarterNoOverflow()->subDay()->endOfDay()],
|
||||||
|
'quarterly' => ['frequency' => 'quarterly', 'from' => Carbon::now(), 'expected' => Carbon::now()->addQuarterNoOverflow()->subDay()->endOfDay()],
|
||||||
|
'year' => ['frequency' => 'year', 'from' => Carbon::now(), 'expected' => Carbon::now()->addYearNoOverflow()->subDay()->endOfDay()],
|
||||||
|
'yearly' => ['frequency' => 'yearly', 'from' => Carbon::now(), 'expected' => Carbon::now()->addYearNoOverflow()->subDay()->endOfDay()],
|
||||||
|
'1Y' => ['frequency' => '1Y', 'from' => Carbon::now(), 'expected' => Carbon::now()->addYearNoOverflow()->subDay()->endOfDay()],
|
||||||
|
'half-year' => ['frequency' => 'half-year', 'from' => Carbon::parse('2023-05-20'), 'expected' => Carbon::parse('2023-11-19')->endOfDay()],
|
||||||
|
'6M' => ['frequency' => '6M', 'from' => Carbon::parse('2023-08-20'), 'expected' => Carbon::parse('2024-02-19')],
|
||||||
|
'last7' => ['frequency' => 'last7', 'from' => Carbon::now(), 'expected' => Carbon::now()->addDays(7)->endOfDay()],
|
||||||
|
'last30' => ['frequency' => 'last30', 'from' => Carbon::now(), 'expected' => Carbon::now()->addDays(30)->endOfDay()],
|
||||||
|
'last90' => ['frequency' => 'last90', 'from' => Carbon::now(), 'expected' => Carbon::now()->addDays(90)->endOfDay()],
|
||||||
|
'last365' => ['frequency' => 'last365', 'from' => Carbon::now(), 'expected' => Carbon::now()->addDays(365)->endOfDay()],
|
||||||
|
'MTD' => ['frequency' => 'MTD', 'from' => Carbon::now(), 'expected' => Carbon::now()->startOfMonth()->startOfDay()],
|
||||||
|
'QTD' => ['frequency' => 'QTD', 'from' => Carbon::now(), 'expected' => Carbon::now()->firstOfQuarter()->startOfDay()],
|
||||||
|
'YTD' => ['frequency' => 'YTD', 'from' => Carbon::now(), 'expected' => Carbon::now()->startOfYear()->startOfDay()],
|
||||||
|
'week 2023-08-05 to 2023-08-11' => ['frequency' => '1W', 'from' => Carbon::parse('2023-08-05'), 'expected' => Carbon::parse('2023-08-11')->endOfDay()],
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @dataProvider provideDates
|
||||||
|
*/
|
||||||
|
public function testGivenADateAndFrequencyWhenCalculateTheDateThenReturnsTheExpectedDateSuccessful(string $frequency, Carbon $from, Carbon $expected)
|
||||||
|
{
|
||||||
|
$period = $this->navigation->endOfPeriod($from, $frequency);
|
||||||
|
$this->assertEquals($expected->toDateString(), $period->toDateString());
|
||||||
|
}
|
||||||
|
|
||||||
|
public static function provideUnknownFrequencies(): array
|
||||||
|
{
|
||||||
|
return [
|
||||||
|
'1day' => ['frequency' => '1day', 'from' => Carbon::now(), 'expected' => Carbon::now()],
|
||||||
|
'unknown' => ['frequency' => 'unknown', 'from' => Carbon::now(), 'expected' => Carbon::now()->startOfDay()],
|
||||||
|
'empty' => ['frequency' => '', 'from' => Carbon::now(), 'expected' => Carbon::now()->startOfDay()],
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @dataProvider provideUnknownFrequencies
|
||||||
|
*/
|
||||||
|
public function testGivenADateAndUnknownFrequencyWhenCalculateTheDateThenReturnsTheSameDateSuccessful(string $frequency, Carbon $from, Carbon $expected)
|
||||||
|
{
|
||||||
|
Log::spy();
|
||||||
|
|
||||||
|
$period = $this->navigation->endOfPeriod($from, $frequency);
|
||||||
|
$this->assertEquals($expected->toDateString(), $period->toDateString());
|
||||||
|
$expectedMessage = sprintf('Cannot do endOfPeriod for $repeat_freq "%s"', $frequency);
|
||||||
|
|
||||||
|
Log::shouldHaveReceived('error', [$expectedMessage]);
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user