Fix tests

This commit is contained in:
James Cole 2021-03-21 08:13:19 +01:00
parent 657726e667
commit cbf3118b8a
No known key found for this signature in database
GPG Key ID: B5669F9493CDE38D
26 changed files with 168 additions and 247 deletions

View File

@ -36,8 +36,9 @@
</coverage>
<testsuites>
<testsuite name="Api">
<directory suffix="Test.php">./tests/Api/Models/TransactionCurrency</directory>
<!--
-->
<directory suffix="Test.php">./tests/Api</directory>
<directory suffix="Test.php">./tests/Api/Models/Account</directory>
<directory suffix="Test.php">./tests/Api/Models/Attachment</directory>
@ -53,9 +54,12 @@
<directory suffix="Test.php">./tests/Api/Models/RuleGroup</directory>
<directory suffix="Test.php">./tests/Api/Models/Tag</directory>
<directory suffix="Test.php">./tests/Api/Models/Transaction</directory>
<directory suffix="Test.php">./tests/Api/Models/TransactionCurrency</directory>
<directory suffix="Test.php">./tests/Api/Models/TransactionLink</directory>
<directory suffix="Test.php">./tests/Api/Models/TransactionLinkType</directory>
<directory suffix="Test.php">./tests/Api/Webhook</directory>
<directory suffix="Test.php">./tests/Api/Models/TransactionCurrency</directory>
-->
</testsuite>
</testsuites>
<php>

View File

@ -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);
}
}

View File

@ -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();
}
}

View File

@ -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();
}

View File

@ -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;
/**
@ -109,7 +107,6 @@ class StoreControllerTest extends TestCase
$configuration->addOptionalFieldSet('auto-code', $fieldSet);
return $configuration->generateAll();
}

View File

@ -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;
/**
@ -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;

View File

@ -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;
/**

View File

@ -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;
/**

View File

@ -22,7 +22,6 @@
namespace Tests\Api\Models\PiggyBank;
use Faker\Factory;
use Laravel\Passport\Passport;
use Log;
use Tests\Objects\Field;

View File

@ -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);

View File

@ -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;
/**

View File

@ -22,7 +22,6 @@
namespace Tests\Api\Models\Recurrence;
use Faker\Factory;
use Laravel\Passport\Passport;
use Log;
use Tests\Objects\Field;

View File

@ -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;
/**

View File

@ -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;
/**

View File

@ -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;
/**

View File

@ -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;
/**

View File

@ -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;
/**

View File

@ -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;
/**

View File

@ -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;
/**

View File

@ -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;
/**

View File

@ -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);
}
}

View File

@ -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();
}

View File

@ -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']);
}
}