diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index dd730122a..cc04db829 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -297,6 +297,10 @@ jobs: --health-interval=5s --health-timeout=2s --health-retries=3 + login-server: + image: gradido/login_server:latest + ports: + - 1201:1201 steps: - name: Debug service run: echo "$(docker ps)" @@ -320,7 +324,7 @@ jobs: ########################################################################## - name: community server | Unit tests run: | - docker run --network container:$(docker container ls | grep mariadb | awk '{ print $1 }') -v ~/coverage:/var/www/cakephp/webroot/coverage gradido/community_server:test + docker run --network container:$(docker container ls | grep mariadb | awk '{ print $1 }') --network container:$(docker container ls | grep login | awk '{ print $1 }') -v ~/coverage:/var/www/cakephp/webroot/coverage gradido/community_server:test cp -r ~/coverage ./coverage ########################################################################## # COVERAGE CHECK BACKEND COMMUNITY-SERVER #################################### diff --git a/community_server/tests/Fixture/TransactionCreationsFixture.php b/community_server/tests/Fixture/TransactionCreationsFixture.php index 1833385b4..c85ac3123 100644 --- a/community_server/tests/Fixture/TransactionCreationsFixture.php +++ b/community_server/tests/Fixture/TransactionCreationsFixture.php @@ -19,7 +19,7 @@ class TransactionCreationsFixture extends BaseTestFixture 'transaction_id' => ['type' => 'integer', 'length' => 10, 'unsigned' => true, 'null' => false, 'default' => null, 'comment' => '', 'precision' => null, 'autoIncrement' => null], 'state_user_id' => ['type' => 'integer', 'length' => 10, 'unsigned' => true, 'null' => false, 'default' => null, 'comment' => '', 'precision' => null, 'autoIncrement' => null], 'amount' => ['type' => 'biginteger', 'length' => 20, 'unsigned' => false, 'null' => false, 'default' => null, 'comment' => '', 'precision' => null, 'autoIncrement' => null], - 'ident_hash' => ['type' => 'binary', 'length' => 32, 'null' => false, 'default' => null, 'comment' => '', 'precision' => null], + 'ident_hash' => ['type' => 'binary', 'length' => 32, 'null' => false, 'default' => '0000000000000000000000000000000000000000000000000000000000000000', 'comment' => '', 'precision' => null], 'target_date' => ['type' => 'timestamp', 'length' => null, 'null' => true, 'default' => null, 'comment' => '', 'precision' => null], '_constraints' => [ 'primary' => ['type' => 'primary', 'columns' => ['id'], 'length' => []], diff --git a/community_server/tests/TestCase/Controller/AppRequestControllerTest.php b/community_server/tests/TestCase/Controller/AppRequestControllerTest.php index fcf5ad5aa..ba9fe2f4a 100644 --- a/community_server/tests/TestCase/Controller/AppRequestControllerTest.php +++ b/community_server/tests/TestCase/Controller/AppRequestControllerTest.php @@ -265,7 +265,7 @@ class AppRequestControllerTest extends TestCase } if(is_array($expected)) { - $dynamic_fields = ['timeUsed', 'decay_date', 'decay']; + $dynamic_fields = ['timeUsed', 'decay_date', 'decay', 'gdtSum']; // copy timeUsed because this value will be variy always foreach($dynamic_fields as $field) { if(isset($expected[$field]) && isset($json->$field)) {