diff --git a/phpunit.xml b/phpunit.xml index 0a4cb707e6..a93c2b9b3f 100644 --- a/phpunit.xml +++ b/phpunit.xml @@ -36,8 +36,9 @@ + ./tests/Api/Models/TransactionCurrency + ./tests/Api ./tests/Api/Models/Account ./tests/Api/Models/Attachment @@ -53,9 +54,12 @@ ./tests/Api/Models/RuleGroup ./tests/Api/Models/Tag ./tests/Api/Models/Transaction - ./tests/Api/Models/TransactionCurrency ./tests/Api/Models/TransactionLink ./tests/Api/Models/TransactionLinkType + ./tests/Api/Webhook + ./tests/Api/Models/TransactionCurrency + --> + diff --git a/tests/Api/Models/Attachment/StoreControllerTest.php b/tests/Api/Models/Attachment/StoreControllerTest.php index c1e0773a8c..1d5f499a2e 100644 --- a/tests/Api/Models/Attachment/StoreControllerTest.php +++ b/tests/Api/Models/Attachment/StoreControllerTest.php @@ -57,27 +57,6 @@ class StoreControllerTest extends TestCase Log::info(sprintf('Now in %s.', get_class($this))); } - /** - * @param array $submission - * - * emptyDataProvider / storeDataProvider - * - * @dataProvider emptyDataProvider - */ - public function testStore(array $submission): void - { - if ([] === $submission) { - $this->markTestSkipped('Empty provider.'); - } - Log::debug('testStoreUpdated()'); - Log::debug('submission :', $submission['submission']); - Log::debug('expected :', $submission['expected']); - Log::debug('ignore :', $submission['ignore']); - // run account store with a minimal data set: - $address = route('api.v1.attachments.store'); - $this->assertPOST($address, $submission); - } - /** * @return array */ @@ -102,6 +81,28 @@ class StoreControllerTest extends TestCase $fieldSet = new FieldSet; $fieldSet->addField(Field::createBasic('notes', 'uuid')); $configuration->addOptionalFieldSet('notes', $fieldSet); + return $configuration->generateAll(); } + + /** + * @param array $submission + * + * emptyDataProvider / storeDataProvider + * + * @dataProvider emptyDataProvider + */ + public function testStore(array $submission): void + { + if ([] === $submission) { + $this->markTestSkipped('Empty provider.'); + } + Log::debug('testStoreUpdated()'); + Log::debug('submission :', $submission['submission']); + Log::debug('expected :', $submission['expected']); + Log::debug('ignore :', $submission['ignore']); + // run account store with a minimal data set: + $address = route('api.v1.attachments.store'); + $this->assertPOST($address, $submission); + } } \ No newline at end of file diff --git a/tests/Api/Models/Attachment/UpdateControllerTest.php b/tests/Api/Models/Attachment/UpdateControllerTest.php index 29a2ec6a57..33c900a5f7 100644 --- a/tests/Api/Models/Attachment/UpdateControllerTest.php +++ b/tests/Api/Models/Attachment/UpdateControllerTest.php @@ -22,7 +22,6 @@ namespace Tests\Api\Models\Attachment; -use Faker\Factory; use Laravel\Passport\Passport; use Log; use Tests\Objects\Field; @@ -97,6 +96,7 @@ class UpdateControllerTest extends TestCase $fieldSet->addField(Field::createBasic('attachable_type', 'static-journal-type')); $fieldSet->addField(Field::createBasic('attachable_id', 'random-journal-id')); $configuration->addOptionalFieldSet('attachable_type', $fieldSet); + return $configuration->generateAll(); } } \ No newline at end of file diff --git a/tests/Api/Models/AvailableBudget/UpdateControllerTest.php b/tests/Api/Models/AvailableBudget/UpdateControllerTest.php index a349c2898b..19ae06ce36 100644 --- a/tests/Api/Models/AvailableBudget/UpdateControllerTest.php +++ b/tests/Api/Models/AvailableBudget/UpdateControllerTest.php @@ -84,7 +84,7 @@ class UpdateControllerTest extends TestCase $field = new Field; $field->fieldTitle = 'currency_id'; $field->fieldType = 'random-currency-id'; - $field->ignorableFields = ['currency_code','currency_symbol']; + $field->ignorableFields = ['currency_code', 'currency_symbol']; $field->title = 'currency_id'; $fieldSet->addField($field); $configuration->addOptionalFieldSet('currency_id', $fieldSet); @@ -94,7 +94,7 @@ class UpdateControllerTest extends TestCase $field = new Field; $field->fieldTitle = 'currency_code'; $field->fieldType = 'random-currency-code'; - $field->ignorableFields = ['currency_id','currency_symbol']; + $field->ignorableFields = ['currency_id', 'currency_symbol']; $field->title = 'currency_code'; $fieldSet->addField($field); $configuration->addOptionalFieldSet('currency_id', $fieldSet); @@ -119,6 +119,7 @@ class UpdateControllerTest extends TestCase $fieldSet->addField(Field::createBasic('start', 'random-date-two-year')); $fieldSet->addField(Field::createBasic('end', 'random-date-one-year')); $configuration->addOptionalFieldSet('both', $fieldSet); + return $configuration->generateAll(); } diff --git a/tests/Api/Models/Bill/UpdateControllerTest.php b/tests/Api/Models/Bill/UpdateControllerTest.php index cf408962a6..bf8ed766fb 100644 --- a/tests/Api/Models/Bill/UpdateControllerTest.php +++ b/tests/Api/Models/Bill/UpdateControllerTest.php @@ -146,7 +146,7 @@ class UpdateControllerTest extends TestCase $field = new Field; $field->fieldTitle = 'currency_id'; $field->fieldType = 'random-currency-id'; - $field->ignorableFields = ['currency_code','currency_symbol']; + $field->ignorableFields = ['currency_code', 'currency_symbol']; $field->title = 'currency_id'; $fieldSet->addField($field); $configuration->addOptionalFieldSet('currency_id', $fieldSet); @@ -156,7 +156,7 @@ class UpdateControllerTest extends TestCase $field = new Field; $field->fieldTitle = 'currency_code'; $field->fieldType = 'random-currency-code'; - $field->ignorableFields = ['currency_id','currency_symbol']; + $field->ignorableFields = ['currency_id', 'currency_symbol']; $field->title = 'currency_code'; $fieldSet->addField($field); $configuration->addOptionalFieldSet('currency_code', $fieldSet); diff --git a/tests/Api/Models/Budget/StoreControllerTest.php b/tests/Api/Models/Budget/StoreControllerTest.php index 3616a4e1e8..c386f2b554 100644 --- a/tests/Api/Models/Budget/StoreControllerTest.php +++ b/tests/Api/Models/Budget/StoreControllerTest.php @@ -22,7 +22,6 @@ namespace Tests\Api\Models\Budget; -use Faker\Factory; use Laravel\Passport\Passport; use Log; use Tests\Objects\Field; @@ -30,7 +29,6 @@ use Tests\Objects\FieldSet; use Tests\Objects\TestConfiguration; use Tests\TestCase; use Tests\Traits\CollectsValues; - use Tests\Traits\TestHelpers; /** @@ -79,7 +77,7 @@ class StoreControllerTest extends TestCase $fieldSet->addField(Field::createBasic('active', 'boolean')); $configuration->addOptionalFieldSet('active', $fieldSet); - $fieldSet = new FieldSet; + $fieldSet = new FieldSet; $field = new Field; $field->fieldTitle = 'auto_budget_currency_id'; @@ -109,7 +107,6 @@ class StoreControllerTest extends TestCase $configuration->addOptionalFieldSet('auto-code', $fieldSet); - return $configuration->generateAll(); } diff --git a/tests/Api/Models/Budget/UpdateControllerTest.php b/tests/Api/Models/Budget/UpdateControllerTest.php index ea2f333b55..c27b067de1 100644 --- a/tests/Api/Models/Budget/UpdateControllerTest.php +++ b/tests/Api/Models/Budget/UpdateControllerTest.php @@ -122,7 +122,7 @@ class UpdateControllerTest extends TestCase $field = new Field; $field->fieldTitle = 'auto_budget_type'; $field->fieldType = 'static-auto-none'; - $field->ignorableFields = ['auto_budget_currency_code', 'auto_budget_currency_id', 'c','auto_budget_period','auto_budget_amount']; + $field->ignorableFields = ['auto_budget_currency_code', 'auto_budget_currency_id', 'c', 'auto_budget_period', 'auto_budget_amount']; $field->expectedReturn = function ($value) { return null; }; diff --git a/tests/Api/Models/BudgetLimit/StoreControllerTest.php b/tests/Api/Models/BudgetLimit/StoreControllerTest.php index 1b1119ec98..17c051f987 100644 --- a/tests/Api/Models/BudgetLimit/StoreControllerTest.php +++ b/tests/Api/Models/BudgetLimit/StoreControllerTest.php @@ -22,7 +22,6 @@ namespace Tests\Api\Models\BudgetLimit; -use Faker\Factory; use Laravel\Passport\Passport; use Log; use Tests\Objects\Field; @@ -30,7 +29,6 @@ use Tests\Objects\FieldSet; use Tests\Objects\TestConfiguration; use Tests\TestCase; use Tests\Traits\CollectsValues; - use Tests\Traits\TestHelpers; /** @@ -76,7 +74,7 @@ class StoreControllerTest extends TestCase $configuration->addMandatoryFieldSet($defaultSet); // optional tests - $fieldSet = new FieldSet; + $fieldSet = new FieldSet; $field = new Field; $field->fieldTitle = 'currency_id'; $field->fieldType = 'random-currency-id'; @@ -85,7 +83,7 @@ class StoreControllerTest extends TestCase $fieldSet->addField($field); $configuration->addOptionalFieldSet('currency_id', $fieldSet); - $fieldSet = new FieldSet; + $fieldSet = new FieldSet; $field = new Field; $field->fieldTitle = 'currency_code'; $field->fieldType = 'random-currency-code'; @@ -96,12 +94,16 @@ class StoreControllerTest extends TestCase $fieldSet = new FieldSet; $fieldSet->parameters = [1]; - $fieldSet->addField(Field::createBasic('start', 'random-date-two-year')); + $field = Field::createBasic('start', 'random-date-two-year'); + $field->ignorableFields = ['spent']; + $fieldSet->addField($field); $configuration->addOptionalFieldSet('start', $fieldSet); $fieldSet = new FieldSet; $fieldSet->parameters = [1]; - $fieldSet->addField(Field::createBasic('end', 'random-date-one-year')); + $field = Field::createBasic('end', 'random-date-one-year'); + $field->ignorableFields = ['spent']; + $fieldSet->addField($field); $configuration->addOptionalFieldSet('end', $fieldSet); $fieldSet = new FieldSet; diff --git a/tests/Api/Models/Category/StoreControllerTest.php b/tests/Api/Models/Category/StoreControllerTest.php index efa4fbf55b..11954bd49c 100644 --- a/tests/Api/Models/Category/StoreControllerTest.php +++ b/tests/Api/Models/Category/StoreControllerTest.php @@ -22,7 +22,6 @@ namespace Tests\Api\Models\Category; -use Faker\Factory; use Laravel\Passport\Passport; use Log; use Tests\Objects\Field; @@ -30,7 +29,6 @@ use Tests\Objects\FieldSet; use Tests\Objects\TestConfiguration; use Tests\TestCase; use Tests\Traits\CollectsValues; - use Tests\Traits\TestHelpers; /** diff --git a/tests/Api/Models/ObjectGroup/UpdateControllerTest.php b/tests/Api/Models/ObjectGroup/UpdateControllerTest.php index ffe31e0455..61aaa45640 100644 --- a/tests/Api/Models/ObjectGroup/UpdateControllerTest.php +++ b/tests/Api/Models/ObjectGroup/UpdateControllerTest.php @@ -22,7 +22,6 @@ namespace Tests\Api\Models\ObjectGroup; -use Faker\Factory; use Laravel\Passport\Passport; use Log; use Tests\Objects\Field; @@ -30,7 +29,6 @@ use Tests\Objects\FieldSet; use Tests\Objects\TestConfiguration; use Tests\TestCase; use Tests\Traits\CollectsValues; - use Tests\Traits\TestHelpers; /** diff --git a/tests/Api/Models/PiggyBank/StoreControllerTest.php b/tests/Api/Models/PiggyBank/StoreControllerTest.php index 0d0397b323..9711d5d244 100644 --- a/tests/Api/Models/PiggyBank/StoreControllerTest.php +++ b/tests/Api/Models/PiggyBank/StoreControllerTest.php @@ -22,7 +22,6 @@ namespace Tests\Api\Models\PiggyBank; -use Faker\Factory; use Laravel\Passport\Passport; use Log; use Tests\Objects\Field; @@ -95,8 +94,8 @@ class StoreControllerTest extends TestCase $fieldSet->addField(Field::createBasic('order', 'order')); $configuration->addOptionalFieldSet('order', $fieldSet); - $fieldSet = new FieldSet; - $fieldSet->parameters = [1]; + $fieldSet = new FieldSet; + $fieldSet->parameters = [1]; $field = new Field; $field->fieldTitle = 'object_group_id'; $field->fieldType = 'random-og-id'; @@ -105,8 +104,8 @@ class StoreControllerTest extends TestCase $fieldSet->addField($field); $configuration->addOptionalFieldSet('object_group_id', $fieldSet); - $fieldSet = new FieldSet; - $fieldSet->parameters = [1]; + $fieldSet = new FieldSet; + $fieldSet->parameters = [1]; $field = new Field; $field->fieldTitle = 'object_group_title'; $field->fieldType = 'uuid'; diff --git a/tests/Api/Models/PiggyBank/UpdateControllerTest.php b/tests/Api/Models/PiggyBank/UpdateControllerTest.php index 726d7a140c..bbde2ecf85 100644 --- a/tests/Api/Models/PiggyBank/UpdateControllerTest.php +++ b/tests/Api/Models/PiggyBank/UpdateControllerTest.php @@ -83,7 +83,7 @@ class UpdateControllerTest extends TestCase $fieldSet = new FieldSet; $fieldSet->parameters = [1]; $field = Field::createBasic('account_id', 'random-piggy-account'); - $field->ignorableFields = ['account_name']; + $field->ignorableFields = ['account_name', 'currency_id', 'currency_code']; $fieldSet->addField($field); $configuration->addOptionalFieldSet('account_id', $fieldSet); @@ -97,7 +97,7 @@ class UpdateControllerTest extends TestCase $fieldSet = new FieldSet; $fieldSet->parameters = [1]; $field = Field::createBasic('current_amount', 'random-amount-min'); - $field->ignorableFields = ['percentage', 'left_to_save','save_per_month']; + $field->ignorableFields = ['percentage', 'left_to_save', 'save_per_month']; $fieldSet->addField($field); $configuration->addOptionalFieldSet('current_amount', $fieldSet); diff --git a/tests/Api/Models/Recurrence/StoreControllerTest.php b/tests/Api/Models/Recurrence/StoreControllerTest.php index 464fbc683d..000d0c24ca 100644 --- a/tests/Api/Models/Recurrence/StoreControllerTest.php +++ b/tests/Api/Models/Recurrence/StoreControllerTest.php @@ -22,7 +22,6 @@ namespace Tests\Api\Models\Recurrence; -use Faker\Factory; use Laravel\Passport\Passport; use Log; use Tests\Objects\Field; @@ -30,7 +29,6 @@ use Tests\Objects\FieldSet; use Tests\Objects\TestConfiguration; use Tests\TestCase; use Tests\Traits\CollectsValues; - use Tests\Traits\TestHelpers; /** @@ -126,44 +124,44 @@ class StoreControllerTest extends TestCase $configuration->addMandatoryFieldSet($defaultSet); // add optional set - $fieldSet = new FieldSet; + $fieldSet = new FieldSet; $fieldSet->addField(Field::createBasic('description', 'uuid')); $configuration->addOptionalFieldSet('description', $fieldSet); - $fieldSet = new FieldSet; + $fieldSet = new FieldSet; $fieldSet->addField(Field::createBasic('apply_rules', 'boolean')); $configuration->addOptionalFieldSet('apply_rules', $fieldSet); - $fieldSet = new FieldSet; + $fieldSet = new FieldSet; $fieldSet->addField(Field::createBasic('notes', 'uuid')); $configuration->addOptionalFieldSet('notes', $fieldSet); - $fieldSet = new FieldSet; + $fieldSet = new FieldSet; $fieldSet->addField(Field::createBasic('active', 'boolean')); $configuration->addOptionalFieldSet('active', $fieldSet); - $fieldSet = new FieldSet; + $fieldSet = new FieldSet; $fieldSet->addField(Field::createBasic('repetitions/0/skip', 'random-skip')); $configuration->addOptionalFieldSet('skip', $fieldSet); - $fieldSet = new FieldSet; + $fieldSet = new FieldSet; $fieldSet->addField(Field::createBasic('transactions/0/foreign_amount', 'random-amount')); $fieldSet->addField(Field::createBasic('transactions/0/foreign_currency_id', 'random-currency-id')); $configuration->addOptionalFieldSet('foreign1', $fieldSet); - $fieldSet = new FieldSet; + $fieldSet = new FieldSet; $fieldSet->addField(Field::createBasic('transactions/0/budget_id', 'random-budget-id')); $configuration->addOptionalFieldSet('budget', $fieldSet); - $fieldSet = new FieldSet; + $fieldSet = new FieldSet; $fieldSet->addField(Field::createBasic('transactions/0/category_id', 'random-category-id')); $configuration->addOptionalFieldSet('category', $fieldSet); - $fieldSet = new FieldSet; + $fieldSet = new FieldSet; $fieldSet->addField(Field::createBasic('transactions/0/tags', 'random-tags')); $configuration->addOptionalFieldSet('tags', $fieldSet); - $fieldSet = new FieldSet; + $fieldSet = new FieldSet; $fieldSet->addField(Field::createBasic('transactions/0/piggy_bank_id', 'random-piggy-id')); $configuration->addOptionalFieldSet('piggy', $fieldSet); diff --git a/tests/Api/Models/Recurrence/UpdateControllerTest.php b/tests/Api/Models/Recurrence/UpdateControllerTest.php index 40732cdc65..db880f80c8 100644 --- a/tests/Api/Models/Recurrence/UpdateControllerTest.php +++ b/tests/Api/Models/Recurrence/UpdateControllerTest.php @@ -22,7 +22,6 @@ namespace Tests\Api\Models\Recurrence; -use Faker\Factory; use Laravel\Passport\Passport; use Log; use Tests\Objects\Field; diff --git a/tests/Api/Models/Rule/StoreControllerTest.php b/tests/Api/Models/Rule/StoreControllerTest.php index 88d9f58c59..7d78b2ba6f 100644 --- a/tests/Api/Models/Rule/StoreControllerTest.php +++ b/tests/Api/Models/Rule/StoreControllerTest.php @@ -22,7 +22,6 @@ namespace Tests\Api\Models\Rule; -use Faker\Factory; use Laravel\Passport\Passport; use Log; use Tests\Objects\Field; @@ -30,7 +29,6 @@ use Tests\Objects\FieldSet; use Tests\Objects\TestConfiguration; use Tests\TestCase; use Tests\Traits\CollectsValues; - use Tests\Traits\TestHelpers; /** @@ -91,31 +89,31 @@ class StoreControllerTest extends TestCase $configuration->addMandatoryFieldSet($defaultSet); // add optional set - $fieldSet = new FieldSet; + $fieldSet = new FieldSet; $fieldSet->addField(Field::createBasic('order', 'low-order')); $configuration->addOptionalFieldSet('order', $fieldSet); - $fieldSet = new FieldSet; + $fieldSet = new FieldSet; $fieldSet->addField(Field::createBasic('active', 'boolean')); $configuration->addOptionalFieldSet('active', $fieldSet); - $fieldSet = new FieldSet; + $fieldSet = new FieldSet; $fieldSet->addField(Field::createBasic('strict', 'boolean')); $configuration->addOptionalFieldSet('strict', $fieldSet); - $fieldSet = new FieldSet; + $fieldSet = new FieldSet; $fieldSet->addField(Field::createBasic('stop_processing', 'boolean')); $configuration->addOptionalFieldSet('stop_processing', $fieldSet); - $fieldSet = new FieldSet; + $fieldSet = new FieldSet; $fieldSet->addField(Field::createBasic('triggers/0/stop_processing', 'boolean')); $configuration->addOptionalFieldSet('stop_processingX', $fieldSet); - $fieldSet = new FieldSet; + $fieldSet = new FieldSet; $fieldSet->addField(Field::createBasic('triggers/0/active', 'boolean')); $configuration->addOptionalFieldSet('activeX', $fieldSet); - $fieldSet = new FieldSet; + $fieldSet = new FieldSet; $fieldSet->addField(Field::createBasic('actions/0/active', 'boolean')); $configuration->addOptionalFieldSet('activeXX', $fieldSet); diff --git a/tests/Api/Models/RuleGroup/StoreControllerTest.php b/tests/Api/Models/RuleGroup/StoreControllerTest.php index 0175a865f8..b7cdd263dc 100644 --- a/tests/Api/Models/RuleGroup/StoreControllerTest.php +++ b/tests/Api/Models/RuleGroup/StoreControllerTest.php @@ -22,7 +22,6 @@ namespace Tests\Api\Models\RuleGroup; -use Faker\Factory; use Laravel\Passport\Passport; use Log; use Tests\Objects\Field; @@ -30,7 +29,6 @@ use Tests\Objects\FieldSet; use Tests\Objects\TestConfiguration; use Tests\TestCase; use Tests\Traits\CollectsValues; - use Tests\Traits\TestHelpers; /** @@ -74,18 +72,18 @@ class StoreControllerTest extends TestCase $configuration->addMandatoryFieldSet($defaultSet); // optionals - $fieldSet = new FieldSet; - $field = Field::createBasic('description', 'uuid'); + $fieldSet = new FieldSet; + $field = Field::createBasic('description', 'uuid'); $fieldSet->addField($field); $configuration->addOptionalFieldSet('description', $fieldSet); - $fieldSet = new FieldSet; - $field = Field::createBasic('order', 'low-order'); + $fieldSet = new FieldSet; + $field = Field::createBasic('order', 'low-order'); $fieldSet->addField($field); $configuration->addOptionalFieldSet('order', $fieldSet); - $fieldSet = new FieldSet; - $field = Field::createBasic('active', 'boolean'); + $fieldSet = new FieldSet; + $field = Field::createBasic('active', 'boolean'); $fieldSet->addField($field); $configuration->addOptionalFieldSet('active', $fieldSet); diff --git a/tests/Api/Models/RuleGroup/UpdateControllerTest.php b/tests/Api/Models/RuleGroup/UpdateControllerTest.php index f8df066add..341c59cbf6 100644 --- a/tests/Api/Models/RuleGroup/UpdateControllerTest.php +++ b/tests/Api/Models/RuleGroup/UpdateControllerTest.php @@ -22,7 +22,6 @@ namespace Tests\Api\Models\RuleGroup; -use Faker\Factory; use Laravel\Passport\Passport; use Log; use Tests\Objects\Field; @@ -30,7 +29,6 @@ use Tests\Objects\FieldSet; use Tests\Objects\TestConfiguration; use Tests\TestCase; use Tests\Traits\CollectsValues; - use Tests\Traits\TestHelpers; /** diff --git a/tests/Api/Models/Tag/StoreControllerTest.php b/tests/Api/Models/Tag/StoreControllerTest.php index e8da126767..ae2bd100e5 100644 --- a/tests/Api/Models/Tag/StoreControllerTest.php +++ b/tests/Api/Models/Tag/StoreControllerTest.php @@ -22,7 +22,6 @@ namespace Tests\Api\Models\Tag; -use Faker\Factory; use Laravel\Passport\Passport; use Log; use Tests\Objects\Field; @@ -30,7 +29,6 @@ use Tests\Objects\FieldSet; use Tests\Objects\TestConfiguration; use Tests\TestCase; use Tests\Traits\CollectsValues; - use Tests\Traits\TestHelpers; /** @@ -74,17 +72,17 @@ class StoreControllerTest extends TestCase $configuration->addMandatoryFieldSet($defaultSet); // optionals - $fieldSet = new FieldSet; - $field = Field::createBasic('date', 'random-past-date'); + $fieldSet = new FieldSet; + $field = Field::createBasic('date', 'random-past-date'); $fieldSet->addField($field); $configuration->addOptionalFieldSet('date', $fieldSet); - $fieldSet = new FieldSet; - $field = Field::createBasic('description', 'uuid'); + $fieldSet = new FieldSet; + $field = Field::createBasic('description', 'uuid'); $fieldSet->addField($field); $configuration->addOptionalFieldSet('description', $fieldSet); - $fieldSet = new FieldSet; + $fieldSet = new FieldSet; $fieldSet->addField(Field::createBasic('longitude', 'longitude')); $fieldSet->addField(Field::createBasic('latitude', 'latitude')); $fieldSet->addField(Field::createBasic('zoom_level', 'random-zoom_level')); diff --git a/tests/Api/Models/Tag/UpdateControllerTest.php b/tests/Api/Models/Tag/UpdateControllerTest.php index 7f215c70ab..b78cfb4439 100644 --- a/tests/Api/Models/Tag/UpdateControllerTest.php +++ b/tests/Api/Models/Tag/UpdateControllerTest.php @@ -22,7 +22,6 @@ namespace Tests\Api\Models\Tag; -use Faker\Factory; use Laravel\Passport\Passport; use Log; use Tests\Objects\Field; @@ -30,7 +29,6 @@ use Tests\Objects\FieldSet; use Tests\Objects\TestConfiguration; use Tests\TestCase; use Tests\Traits\CollectsValues; - use Tests\Traits\TestHelpers; /** diff --git a/tests/Api/Models/TransactionCurrency/StoreControllerTest.php b/tests/Api/Models/TransactionCurrency/StoreControllerTest.php index ac6101f1c5..0920fe8d94 100644 --- a/tests/Api/Models/TransactionCurrency/StoreControllerTest.php +++ b/tests/Api/Models/TransactionCurrency/StoreControllerTest.php @@ -81,18 +81,18 @@ class StoreControllerTest extends TestCase $configuration->addMandatoryFieldSet($defaultSet); // optionals - $fieldSet = new FieldSet; - $field = Field::createBasic('enabled', 'boolean'); + $fieldSet = new FieldSet; + $field = Field::createBasic('enabled', 'boolean'); $fieldSet->addField($field); $configuration->addOptionalFieldSet('enabled', $fieldSet); - $fieldSet = new FieldSet; - $field = Field::createBasic('default', 'boolean'); + $fieldSet = new FieldSet; + $field = Field::createBasic('default', 'boolean'); $fieldSet->addField($field); $configuration->addOptionalFieldSet('default', $fieldSet); - $fieldSet = new FieldSet; - $field = Field::createBasic('decimal_places', 'currency-dp'); + $fieldSet = new FieldSet; + $field = Field::createBasic('decimal_places', 'currency-dp'); $fieldSet->addField($field); $configuration->addOptionalFieldSet('decimal_places', $fieldSet); diff --git a/tests/Api/Models/TransactionLink/StoreControllerTest.php b/tests/Api/Models/TransactionLink/StoreControllerTest.php index 320a41da9d..df69c20a8f 100644 --- a/tests/Api/Models/TransactionLink/StoreControllerTest.php +++ b/tests/Api/Models/TransactionLink/StoreControllerTest.php @@ -22,7 +22,6 @@ namespace Tests\Api\Models\TransactionLink; -use Faker\Factory; use Laravel\Passport\Passport; use Log; use Tests\Objects\Field; @@ -30,7 +29,6 @@ use Tests\Objects\FieldSet; use Tests\Objects\TestConfiguration; use Tests\TestCase; use Tests\Traits\CollectsValues; - use Tests\Traits\TestHelpers; /** @@ -83,7 +81,7 @@ class StoreControllerTest extends TestCase $configuration->addMandatoryFieldSet($defaultSet); // optionals - $fieldSet = new FieldSet; + $fieldSet = new FieldSet; $fieldSet->addField(Field::createBasic('notes', 'uuid')); $configuration->addOptionalFieldSet('notes', $fieldSet); diff --git a/tests/Api/Models/TransactionLinkType/StoreControllerTest.php b/tests/Api/Models/TransactionLinkType/StoreControllerTest.php index acbd63345b..5625d3a23d 100644 --- a/tests/Api/Models/TransactionLinkType/StoreControllerTest.php +++ b/tests/Api/Models/TransactionLinkType/StoreControllerTest.php @@ -22,7 +22,6 @@ namespace Tests\Api\Models\TransactionLinkType; -use Faker\Factory; use Laravel\Passport\Passport; use Log; use Tests\Objects\Field; @@ -30,7 +29,6 @@ use Tests\Objects\FieldSet; use Tests\Objects\TestConfiguration; use Tests\TestCase; use Tests\Traits\CollectsValues; - use Tests\Traits\TestHelpers; /** diff --git a/tests/Api/Models/TransactionLinkType/UpdateControllerTest.php b/tests/Api/Models/TransactionLinkType/UpdateControllerTest.php index 60ae19a6be..db05c7e4f6 100644 --- a/tests/Api/Models/TransactionLinkType/UpdateControllerTest.php +++ b/tests/Api/Models/TransactionLinkType/UpdateControllerTest.php @@ -22,7 +22,6 @@ namespace Tests\Api\Models\TransactionLinkType; -use Faker\Factory; use Laravel\Passport\Passport; use Log; use Tests\Objects\Field; @@ -30,7 +29,6 @@ use Tests\Objects\FieldSet; use Tests\Objects\TestConfiguration; use Tests\TestCase; use Tests\Traits\CollectsValues; - use Tests\Traits\TestHelpers; /** diff --git a/tests/Api/Webhook/StoreControllerTest.php b/tests/Api/Webhook/StoreControllerTest.php index 32bb1ffbfe..cfbdf53b22 100644 --- a/tests/Api/Webhook/StoreControllerTest.php +++ b/tests/Api/Webhook/StoreControllerTest.php @@ -22,12 +22,13 @@ namespace Tests\Api\Webhook; -use Faker\Factory; use Laravel\Passport\Passport; use Log; +use Tests\Objects\Field; +use Tests\Objects\FieldSet; +use Tests\Objects\TestConfiguration; use Tests\TestCase; use Tests\Traits\CollectsValues; - use Tests\Traits\TestHelpers; /** @@ -61,80 +62,26 @@ class StoreControllerTest extends TestCase */ public function storeDataProvider(): array { - $minimalSets = $this->minimalSets(); - $optionalSets = $this->optionalSets(); - $regenConfig = [ - 'title' => function () { - $faker = Factory::create(); + // some test configs: + $configuration = new TestConfiguration; - return $faker->uuid; - }, - 'url' => function () { - $faker = Factory::create(); + // default test set: + $defaultSet = new FieldSet(); + $defaultSet->title = 'default_object'; + $defaultSet->addField(Field::createBasic('title', 'uuid')); + $defaultSet->addField(Field::createBasic('url', 'secure-url')); + $defaultSet->addField(Field::createBasic('trigger', 'webhook-trigger')); + $defaultSet->addField(Field::createBasic('response', 'webhook-response')); + $defaultSet->addField(Field::createBasic('delivery', 'webhook-delivery')); + $configuration->addMandatoryFieldSet($defaultSet); - return str_replace(['http://'], 'https://', $faker->url); - }, - 'trigger' => function () { - $faker = Factory::create(); + $fieldSet = new FieldSet; + $field = Field::createBasic('active', 'boolean'); + $fieldSet->addField($field); + $configuration->addOptionalFieldSet('active', $fieldSet); - return $faker->randomElement(['TRIGGER_STORE_TRANSACTION', 'TRIGGER_UPDATE_TRANSACTION', 'TRIGGER_DESTROY_TRANSACTION']); - }, - 'response' => function () { - $faker = Factory::create(); - return $faker->randomElement(['RESPONSE_TRANSACTIONS', 'RESPONSE_ACCOUNTS', 'RESPONSE_NONE']); - }, - 'delivery' => function () { - $faker = Factory::create(); - - return $faker->randomElement(['DELIVERY_JSON']); - }, - ]; - - return $this->genericDataProvider($minimalSets, $optionalSets, $regenConfig); - } - - /** - * @return array - */ - private function minimalSets(): array - { - $faker = Factory::create(); - // - title - // - trigger - // - response - // - delivery - // - url - - return [ - 'default_webhook' => [ - 'parameters' => [], - 'fields' => [ - 'title' => $faker->uuid, - 'trigger' => $faker->randomElement(['TRIGGER_STORE_TRANSACTION', 'TRIGGER_UPDATE_TRANSACTION', 'TRIGGER_DESTROY_TRANSACTION']), - 'response' => $faker->randomElement(['RESPONSE_TRANSACTIONS', 'RESPONSE_ACCOUNTS', 'RESPONSE_NONE']), - 'delivery' => $faker->randomElement(['DELIVERY_JSON']), - 'url' => str_replace(['http://'], 'https://', $faker->url), - ], - ], - - ]; - } - - /** - * @return \array[][] - */ - private function optionalSets(): array - { - $faker = Factory::create(); - - return [ - 'active' => [ - 'fields' => [ - 'active' => $faker->boolean, - ], - ], - ]; + return $configuration->generateAll(); } /** @@ -147,10 +94,15 @@ class StoreControllerTest extends TestCase public function testStore(array $submission): void { if ([] === $submission) { - $this->markTestSkipped('Empty data provider'); + $this->markTestSkipped('Empty provider.'); } - $route = 'api.v1.webhooks.store'; - $this->storeAndCompare($route, $submission); + Log::debug('testStoreUpdated()'); + Log::debug('submission :', $submission['submission']); + Log::debug('expected :', $submission['expected']); + Log::debug('ignore :', $submission['ignore']); + // run account store with a minimal data set: + $address = route('api.v1.webhooks.store'); + $this->assertPOST($address, $submission); } } \ No newline at end of file diff --git a/tests/Api/Webhook/UpdateControllerTest.php b/tests/Api/Webhook/UpdateControllerTest.php index c59f83c015..94a423fb70 100644 --- a/tests/Api/Webhook/UpdateControllerTest.php +++ b/tests/Api/Webhook/UpdateControllerTest.php @@ -22,12 +22,13 @@ namespace Tests\Api\Webhook; -use Faker\Factory; use Laravel\Passport\Passport; use Log; +use Tests\Objects\Field; +use Tests\Objects\FieldSet; +use Tests\Objects\TestConfiguration; use Tests\TestCase; use Tests\Traits\CollectsValues; - use Tests\Traits\TestHelpers; /** @@ -53,13 +54,17 @@ class UpdateControllerTest extends TestCase */ public function testUpdate(array $submission): void { - $ignore = [ - 'created_at', - 'updated_at', - ]; - $route = route('api.v1.webhooks.update', [$submission['id']]); + if ([] === $submission) { + $this->markTestSkipped('Empty provider.'); + } + Log::debug('testStoreUpdated()'); + Log::debug('submission :', $submission['submission']); + Log::debug('expected :', $submission['expected']); + Log::debug('ignore :', $submission['ignore']); + Log::debug('parameters :', $submission['parameters']); - $this->updateAndCompare($route, $submission, $ignore); + $route = route('api.v1.webhooks.update', $submission['parameters']); + $this->assertPUT($route, $submission); } @@ -68,70 +73,45 @@ class UpdateControllerTest extends TestCase */ public function updateDataProvider(): array { - $submissions = []; - $all = $this->updateDataSet(); - foreach ($all as $name => $data) { - $submissions[] = [$data]; - } + $configuration = new TestConfiguration; - return $submissions; - } + $fieldSet = new FieldSet; + $fieldSet->parameters = [1]; + $field = Field::createBasic('active', 'boolean'); + $fieldSet->addField($field); + $configuration->addOptionalFieldSet('active', $fieldSet); + $fieldSet = new FieldSet; + $fieldSet->parameters = [1]; + $field = Field::createBasic('title', 'uuid'); + $fieldSet->addField($field); + $configuration->addOptionalFieldSet('title', $fieldSet); - /** - * @return array - */ - public function updateDataSet(): array - { - $faker = Factory::create(); - $set = [ - 'active' => [ - 'id' => 1, - 'fields' => [ - 'active' => ['test_value' => $faker->boolean], - ], - 'extra_ignore' => [], - ], - 'title' => [ - 'id' => 1, - 'fields' => [ - 'title' => ['test_value' => $faker->uuid], - ], - 'extra_ignore' => [], - ], - 'trigger' => [ - 'id' => 1, - 'fields' => [ - 'trigger' => ['test_value' => $faker->randomElement( - ['TRIGGER_STORE_TRANSACTION', 'TRIGGER_UPDATE_TRANSACTION', 'TRIGGER_DESTROY_TRANSACTION'] - )], - ], - 'extra_ignore' => [], - ], - 'response' => [ - 'id' => 1, - 'fields' => [ - 'response' => ['test_value' => $faker->randomElement(['RESPONSE_TRANSACTIONS', 'RESPONSE_ACCOUNTS', 'RESPONSE_NONE'])], - ], - 'extra_ignore' => [], - ], - 'delivery' => [ - 'id' => 1, - 'fields' => [ - 'delivery' => ['test_value' => $faker->randomElement(['DELIVERY_JSON'])], - ], - 'extra_ignore' => [], - ], - 'url' => [ - 'id' => 1, - 'fields' => [ - 'url' => ['test_value' => str_replace(['http://'], 'https://', $faker->url)], - ], - 'extra_ignore' => [], - ], - ]; + $fieldSet = new FieldSet; + $fieldSet->parameters = [1]; + $field = Field::createBasic('trigger', 'webhook-trigger'); + $fieldSet->addField($field); + $configuration->addOptionalFieldSet('trigger', $fieldSet); - return $set; + $fieldSet = new FieldSet; + $fieldSet->parameters = [1]; + $field = Field::createBasic('response', 'webhook-response'); + $fieldSet->addField($field); + $configuration->addOptionalFieldSet('response', $fieldSet); + + $fieldSet = new FieldSet; + $fieldSet->parameters = [1]; + $field = Field::createBasic('delivery', 'webhook-delivery'); + $fieldSet->addField($field); + $configuration->addOptionalFieldSet('delivery', $fieldSet); + + $fieldSet = new FieldSet; + $fieldSet->parameters = [1]; + $field = Field::createBasic('url', 'secure-url'); + $fieldSet->addField($field); + $configuration->addOptionalFieldSet('url', $fieldSet); + + return $configuration->generateAll(); } diff --git a/tests/Objects/TestConfiguration.php b/tests/Objects/TestConfiguration.php index 11588fcd23..740486edbb 100644 --- a/tests/Objects/TestConfiguration.php +++ b/tests/Objects/TestConfiguration.php @@ -522,6 +522,14 @@ class TestConfiguration return $faker->randomAscii . $faker->randomAscii; case 'currency-dp': return $faker->numberBetween(0, 11); + case 'secure-url': + return str_replace(['http://'], 'https://', $faker->url); + case 'webhook-trigger': + return $faker->randomElement(['TRIGGER_STORE_TRANSACTION', 'TRIGGER_UPDATE_TRANSACTION', 'TRIGGER_DESTROY_TRANSACTION']); + case 'webhook-response': + return $faker->randomElement(['RESPONSE_TRANSACTIONS', 'RESPONSE_ACCOUNTS', 'RESPONSE_NONE']); + case 'webhook-delivery': + return $faker->randomElement(['DELIVERY_JSON']); } }