Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-05-31 07:04:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for tests

Browse Source
This commit is contained in:
David Bomba 2021-02-04 21:45:11 +11:00
parent 677090914d
commit e06403edba
3 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.env.ci
View File

@ -9,9 +9,13 @@ DB_CONNECTION=db-ninja-01
DB_DATABASE1=ninja DB_DATABASE1=ninja
DB_USERNAME1=root DB_USERNAME1=root
DB_PASSWORD1=ninja DB_PASSWORD1=ninja
DB_HOST1=127.0.0.1
DB_PORT1=32768
DB_PORT=32768
DB_DATABASE=ninja DB_DATABASE=ninja
DB_USERNAME=root DB_USERNAME=root
DB_PASSWORD=ninja DB_PASSWORD=ninja
DB_HOST=127.0.0.1
NINJA_ENVIRONMENT=hosted NINJA_ENVIRONMENT=hosted
COMPOSER_AUTH='{"github-oauth": {"github.com": "${{ secrets.GITHUB_TOKEN }}"}}' COMPOSER_AUTH='{"github-oauth": {"github.com": "${{ secrets.GITHUB_TOKEN }}"}}'
TRAVIS=true TRAVIS=true

23
.github/workflows/phpunit.yml vendored
View File

@ -18,12 +18,13 @@ jobs:
env: env:
DB_DATABASE1: ninja DB_DATABASE1: ninja
DB_USERNAME1: ninja DB_USERNAME1: root
DB_PASSWORD1: ninja DB_PASSWORD1: ninja
DB_HOST1: '127.0.0.1'
DB_DATABASE: ninja DB_DATABASE: ninja
DB_USERNAME: ninja DB_USERNAME: root
DB_PASSWORD: ninja DB_PASSWORD: ninja
DB_PORT: 32574 DB_HOST: '127.0.0.1'
BROADCAST_DRIVER: log BROADCAST_DRIVER: log
CACHE_DRIVER: file CACHE_DRIVER: file
QUEUE_CONNECTION: sync QUEUE_CONNECTION: sync
@ -38,7 +39,7 @@ jobs:
mariadb: mariadb:
image: mariadb:latest image: mariadb:latest
ports: ports:
- 32574:3306 - 3306
env: env:
MYSQL_ALLOW_EMPTY_PASSWORD: yes MYSQL_ALLOW_EMPTY_PASSWORD: yes
MYSQL_USER: ninja MYSQL_USER: ninja
@ -48,11 +49,9 @@ jobs:
options: --health-cmd="mysqladmin ping" --health-interval=5s --health-timeout=2s --health-retries=3 options: --health-cmd="mysqladmin ping" --health-interval=5s --health-timeout=2s --health-retries=3
steps: steps:
- name: Start mysql service - name: Start mysql service
run: | run: |
sudo /etc/init.d/mysql start sudo /etc/init.d/mysql start
- name: Verify MariaDB connection - name: Verify MariaDB connection
env: env:
DB_PORT: ${{ job.services.mariadb.ports[3306] }} DB_PORT: ${{ job.services.mariadb.ports[3306] }}
@ -62,11 +61,6 @@ jobs:
while ! mysqladmin ping -h"127.0.0.1" -P"$DB_PORT" --silent; do while ! mysqladmin ping -h"127.0.0.1" -P"$DB_PORT" --silent; do
sleep 1 sleep 1
done done
- name: Verify MySQL connection from container
run: |
mysql -h"localhost" --port 32574 -uninja -pninja -e "SHOW DATABASES"
- name: Setup PHP - name: Setup PHP
uses: shivammathur/setup-php@v2 uses: shivammathur/setup-php@v2
with: with:
@ -88,10 +82,13 @@ jobs:
- name: Prepare Laravel Application - name: Prepare Laravel Application
run: | run: |
php artisan key:generate php artisan key:generate
php artisan optimize
php artisan cache:clear php artisan cache:clear
php artisan config:cache php artisan config:cache
php artisan optimize - name: Create DB and schemas
run: |
mkdir -p database
touch database/database.sqlite
- name: Migrate Database - name: Migrate Database
run: | run: |
php artisan migrate:fresh --seed --force && php artisan db:seed --force php artisan migrate:fresh --seed --force && php artisan db:seed --force

5
app/Jobs/Util/Import.php
View File

@ -897,8 +897,9 @@ class Import implements ShouldQueue
if ($this->tryTransformingId('invoices', $invoice['invoice_id'])) { if ($this->tryTransformingId('invoices', $invoice['invoice_id'])) {
$modified['invoices'][$key]['invoice_id'] = $this->transformId('invoices', $invoice['invoice_id']); $modified['invoices'][$key]['invoice_id'] = $this->transformId('invoices', $invoice['invoice_id']);
} else { } else {
$modified['credits'][$key]['credit_id'] = $this->transformId('credits', $invoice['invoice_id']); nlog($modified['invoices']);
$modified['credits'][$key]['amount'] = $modified['invoices'][$key]['amount']; // $modified['credits'][$key]['credit_id'] = $this->transformId('credits', $invoice['invoice_id']);
// $modified['credits'][$key]['amount'] = $modified['invoices'][$key]['amount'];
} }
} }
} }