From 59b26e53acd8e7d0234aaf529a30f903450ff341 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Thu, 9 Mar 2017 18:07:20 +0200 Subject: [PATCH] Working on adding check-data to Travis --- .travis.yml | 3 ++- app/Console/Commands/CreateTestData.php | 25 ++++++++++++++++++++----- 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index edd37f92899c..7a11b7f9f889 100644 --- a/.travis.yml +++ b/.travis.yml @@ -67,7 +67,7 @@ before_script: - sleep 5 # Make sure the app is up-to-date - curl -L http://ninja.dev:8000/update - #- php artisan ninja:create-test-data 25 + - php artisan ninja:create-test-data 10 true script: #- php ./vendor/codeception/codeception/codecept run --debug acceptance APICest.php @@ -91,6 +91,7 @@ after_script: - php artisan ninja:check-data --no-interaction - cat .env - mysql -u root -e 'select * from accounts;' ninja + - mysql -u root -e 'select * from users;' ninja - mysql -u root -e 'select * from account_gateways;' ninja - mysql -u root -e 'select * from clients;' ninja - mysql -u root -e 'select * from invoices;' ninja diff --git a/app/Console/Commands/CreateTestData.php b/app/Console/Commands/CreateTestData.php index 7e339643e182..1606e5eec5ec 100644 --- a/app/Console/Commands/CreateTestData.php +++ b/app/Console/Commands/CreateTestData.php @@ -2,6 +2,7 @@ namespace App\Console\Commands; +use App\Ninja\Repositories\AccountRepository; use App\Ninja\Repositories\ClientRepository; use App\Ninja\Repositories\ExpenseRepository; use App\Ninja\Repositories\InvoiceRepository; @@ -25,7 +26,7 @@ class CreateTestData extends Command /** * @var string */ - protected $signature = 'ninja:create-test-data {count=1}'; + protected $signature = 'ninja:create-test-data {count=1} {create_account=false}'; /** * @var @@ -40,13 +41,15 @@ class CreateTestData extends Command * @param PaymentRepository $paymentRepo * @param VendorRepository $vendorRepo * @param ExpenseRepository $expenseRepo + * @param AccountRepository $accountRepo */ public function __construct( ClientRepository $clientRepo, InvoiceRepository $invoiceRepo, PaymentRepository $paymentRepo, VendorRepository $vendorRepo, - ExpenseRepository $expenseRepo) + ExpenseRepository $expenseRepo, + AccountRepository $accountRepo) { parent::__construct(); @@ -57,6 +60,7 @@ class CreateTestData extends Command $this->paymentRepo = $paymentRepo; $this->vendorRepo = $vendorRepo; $this->expenseRepo = $expenseRepo; + $this->accountRepo = $accountRepo; } /** @@ -69,10 +73,21 @@ class CreateTestData extends Command } $this->info(date('Y-m-d').' Running CreateTestData...'); - - Auth::loginUsingId(1); $this->count = $this->argument('count'); + if (filter_var($this->argument('create_account'), FILTER_VALIDATE_BOOLEAN)) { + $this->info('Creating new account...'); + $account = $this->accountRepo->create( + $this->faker->firstName, + $this->faker->lastName, + $this->faker->safeEmail + ); + Auth::login($account->users[0]); + } else { + $this->info('Using first account...'); + Auth::loginUsingId(1); + } + $this->createClients(); $this->createVendors(); @@ -182,7 +197,7 @@ class CreateTestData extends Command 'vendor_id' => $vendor->id, 'amount' => $this->faker->randomFloat(2, 1, 10), 'expense_date' => null, - 'public_notes' => null, + 'public_notes' => '', ]; $expense = $this->expenseRepo->save($data);