From dcc5faa9115dc024bf3fcf80e4de38fe2581ec59 Mon Sep 17 00:00:00 2001 From: Thomas Kuschan Date: Tue, 30 Jul 2024 17:52:53 +0200 Subject: [PATCH 1/4] Fix case for integration test path and add PHP CS Fixer cache file to gitignore --- .gitignore | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 5ea1bac5..04f05e15 100644 --- a/.gitignore +++ b/.gitignore @@ -3,14 +3,17 @@ composer.phar # ignore testdata with credentials -/tests/integration/testdata.ini -/tests/integration/integration.ini +/tests/Integration/testdata.ini +/tests/Integration/integration.ini # ignore ide configuration .idea/ # ignore phpunit-cache .phpunit.result.cache +# ignore php-cs-fixer cache +.php-cs-fixer.cache + # ignore log-files *.log From 9a8088f4885e234acd311f47f012f366b4d1788d Mon Sep 17 00:00:00 2001 From: DumbergerL Date: Wed, 31 Jul 2024 08:33:14 +0200 Subject: [PATCH 2/4] add pr #213 to changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 160ddba6..d7ceef9c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,6 +23,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/). - Fix GroupHierarchie test, Fix DB-Fields test ([PR192](https://github.com/5pm-HDH/churchtools-api/pull/192), [PR194](https://github.com/5pm-HDH/churchtools-api/pull/194)) - Fix breaking changes Event-API ([PR196](https://github.com/5pm-HDH/churchtools-api/pull/196)) - Issue search for person ([PR210](https://github.com/5pm-HDH/churchtools-api/pull/210)) +- Fix issue with changelog ([PR213](https://github.com/5pm-HDH/churchtools-api/pull/213)) ## [2.0.0] From f550111eb0dd76731a3facfe866a7e6f1a2cc3f5 Mon Sep 17 00:00:00 2001 From: DumbergerL Date: Wed, 31 Jul 2024 09:55:56 +0200 Subject: [PATCH 3/4] skip integration test - fix with #215 --- tests/Integration/Requests/SongCommentRequestTest.php | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/Integration/Requests/SongCommentRequestTest.php b/tests/Integration/Requests/SongCommentRequestTest.php index a6dfde41..6b908859 100644 --- a/tests/Integration/Requests/SongCommentRequestTest.php +++ b/tests/Integration/Requests/SongCommentRequestTest.php @@ -13,6 +13,7 @@ class SongCommentRequestTest extends TestCaseAuthenticated protected function setUp(): void { parent::setUp(); + $this->markTestSkipped('Broken implementation of churchtools todo in #215'); $this->arrangementId = IntegrationTestData::getFilterAsInt("get_song_comments", "song_arrangement_id"); } From 747dc3ab51ac663547d5027e52b25add72da263a Mon Sep 17 00:00:00 2001 From: DumbergerL Date: Wed, 31 Jul 2024 10:00:16 +0200 Subject: [PATCH 4/4] skip integration test - fix with #215 --- tests/Integration/Requests/SongCommentRequestTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Integration/Requests/SongCommentRequestTest.php b/tests/Integration/Requests/SongCommentRequestTest.php index 6b908859..e9653e77 100644 --- a/tests/Integration/Requests/SongCommentRequestTest.php +++ b/tests/Integration/Requests/SongCommentRequestTest.php @@ -13,8 +13,8 @@ class SongCommentRequestTest extends TestCaseAuthenticated protected function setUp(): void { parent::setUp(); - $this->markTestSkipped('Broken implementation of churchtools todo in #215'); $this->arrangementId = IntegrationTestData::getFilterAsInt("get_song_comments", "song_arrangement_id"); + $this->markTestSkipped('Broken implementation of churchtools todo in #215'); } public function testGetSongArrangement()