Merge pull request 5pm-HDH#213 from devdot/fix-gitignore2

Fix gitignore
devdot · Jul 31, 2024 · 4251974 · 4251974
2 parents 7ce5156 + 747dc3a
commit 4251974
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git 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
 

diff --git 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]
 

diff --git a/tests/Integration/Requests/SongCommentRequestTest.php b/tests/Integration/Requests/SongCommentRequestTest.php
@@ -14,6 +14,7 @@ protected function setUp(): void
     {
         parent::setUp();
         $this->arrangementId = IntegrationTestData::getFilterAsInt("get_song_comments", "song_arrangement_id");
+        $this->markTestSkipped('Broken implementation of churchtools todo in #215');
     }
 
     public function testGetSongArrangement()