Merge pull request #4384 from BacLuc/api-fix-deprecated-fixture-access

api/tests/Api: replace deprecated fixture access static::$fixtures th FixtureStore
ecamp · Jan 8, 2024 · 0c3639b · 0c3639b
2 parents d86b4cd + 0acedcb
commit 0c3639b
Show file tree

Hide file tree

Showing 104 changed files with 615 additions and 608 deletions.
diff --git a/api/tests/Api/Activities/CreateActivityTest.php b/api/tests/Api/Activities/CreateActivityTest.php
@@ -32,7 +32,7 @@ public function testCreateActivityIsDeniedForAnonymousUser() {
 
     public function testCreateActivityIsNotPossibleForUnrelatedUserBecausePeriodIsNotReadable() {
         /** @var User $user */
-        $user = static::$fixtures['user4unrelated'];
+        $user = static::getFixture('user4unrelated');
         static::createClientWithCredentials(['email' => $user->getEmail()])
             ->request('POST', '/activities', ['json' => $this->getExampleWritePayload()])
         ;

diff --git a/api/tests/Api/Activities/DeleteActivityTest.php b/api/tests/Api/Activities/DeleteActivityTest.php
@@ -10,7 +10,7 @@
  */
 class DeleteActivityTest extends ECampApiTestCase {
     public function testDeleteActivityIsDeniedForAnonymousUser() {
-        $activity = static::$fixtures['activity1'];
+        $activity = static::getFixture('activity1');
         static::createBasicClient()->request('DELETE', '/activities/'.$activity->getId());
         $this->assertResponseStatusCodeSame(401);
         $this->assertJsonContains([
@@ -20,7 +20,7 @@ public function testDeleteActivityIsDeniedForAnonymousUser() {
     }
 
     public function testDeleteActivityIsDeniedForUnrelatedUser() {
-        $activity = static::$fixtures['activity1'];
+        $activity = static::getFixture('activity1');
         static::createClientWithCredentials(['email' => static::$fixtures['user4unrelated']->getEmail()])
             ->request('DELETE', '/activities/'.$activity->getId())
         ;
@@ -33,7 +33,7 @@ public function testDeleteActivityIsDeniedForUnrelatedUser() {
     }
 
     public function testDeleteActivityIsDeniedForInactiveCollaborator() {
-        $activity = static::$fixtures['activity1'];
+        $activity = static::getFixture('activity1');
         static::createClientWithCredentials(['email' => static::$fixtures['user5inactive']->getEmail()])
             ->request('DELETE', '/activities/'.$activity->getId())
         ;
@@ -46,7 +46,7 @@ public function testDeleteActivityIsDeniedForInactiveCollaborator() {
     }
 
     public function testDeleteActivityIsDeniedForGuest() {
-        $activity = static::$fixtures['activity1'];
+        $activity = static::getFixture('activity1');
         static::createClientWithCredentials(['email' => static::$fixtures['user3guest']->getEmail()])
             ->request('DELETE', '/activities/'.$activity->getId())
         ;
@@ -59,7 +59,7 @@ public function testDeleteActivityIsDeniedForGuest() {
     }
 
     public function testDeleteActivityIsAllowedForMember() {
-        $activity = static::$fixtures['activity1'];
+        $activity = static::getFixture('activity1');
         static::createClientWithCredentials(['email' => static::$fixtures['user2member']->getEmail()])
             ->request('DELETE', '/activities/'.$activity->getId())
         ;
@@ -68,14 +68,14 @@ public function testDeleteActivityIsAllowedForMember() {
     }
 
     public function testDeleteActivityIsAllowedForManager() {
-        $activity = static::$fixtures['activity1'];
+        $activity = static::getFixture('activity1');
         static::createClientWithCredentials()->request('DELETE', '/activities/'.$activity->getId());
         $this->assertResponseStatusCodeSame(204);
         $this->assertNull($this->getEntityManager()->getRepository(Activity::class)->find($activity->getId()));
     }
 
     public function testDeleteActivityFromCampPrototypeIsDeniedForUnrelatedUser() {
-        $activity = static::$fixtures['activity1campPrototype'];
+        $activity = static::getFixture('activity1campPrototype');
         static::createClientWithCredentials()->request('DELETE', '/activities/'.$activity->getId());
 
         $this->assertResponseStatusCodeSame(403);

diff --git a/api/tests/Api/Activities/ListActivitiesTest.php b/api/tests/Api/Activities/ListActivitiesTest.php
@@ -41,7 +41,7 @@ public function testListActivitiesIsAllowedForLoggedInUserButFiltered() {
     }
 
     public function testListActivitiesFilteredByCampIsAllowedForCollaborator() {
-        $camp = static::$fixtures['camp1'];
+        $camp = static::getFixture('camp1');
         $response = static::createClientWithCredentials()->request('GET', '/activities?camp=%2Fcamps%2F'.$camp->getId());
         $this->assertResponseStatusCodeSame(200);
         $this->assertJsonContains([
@@ -60,7 +60,7 @@ public function testListActivitiesFilteredByCampIsAllowedForCollaborator() {
     }
 
     public function testListActivitiesFilteredByCampIsDeniedForUnrelatedUser() {
-        $camp = static::$fixtures['camp1'];
+        $camp = static::getFixture('camp1');
         $response = static::createClientWithCredentials(['email' => static::$fixtures['user4unrelated']->getEmail()])
             ->request('GET', '/activities?camp=%2Fcamps%2F'.$camp->getId())
         ;
@@ -70,7 +70,7 @@ public function testListActivitiesFilteredByCampIsDeniedForUnrelatedUser() {
     }
 
     public function testListActivitiesFilteredByCampIsDeniedForInactiveCollaborator() {
-        $camp = static::$fixtures['camp1'];
+        $camp = static::getFixture('camp1');
         $response = static::createClientWithCredentials(['email' => static::$fixtures['user5inactive']->getEmail()])
             ->request('GET', '/activities?camp=%2Fcamps%2F'.$camp->getId())
         ;
@@ -80,7 +80,7 @@ public function testListActivitiesFilteredByCampIsDeniedForInactiveCollaborator(
     }
 
     public function testListActivitiesFilteredByCampPrototypeIsAllowedForUnrelatedUser() {
-        $camp = static::$fixtures['campPrototype'];
+        $camp = static::getFixture('campPrototype');
         $response = static::createClientWithCredentials()->request('GET', '/activities?camp=%2Fcamps%2F'.$camp->getId());
         $this->assertResponseStatusCodeSame(200);
         $this->assertJsonContains(['totalItems' => 1]);

diff --git a/api/tests/Api/Activities/ReadActivityTest.php b/api/tests/Api/Activities/ReadActivityTest.php
@@ -11,7 +11,7 @@
 class ReadActivityTest extends ECampApiTestCase {
     public function testGetSingleActivityIsDeniedForAnonymousUser() {
         /** @var Activity $activity */
-        $activity = static::$fixtures['activity1'];
+        $activity = static::getFixture('activity1');
         static::createBasicClient()->request('GET', '/activities/'.$activity->getId());
         $this->assertResponseStatusCodeSame(401);
         $this->assertJsonContains([
@@ -22,7 +22,7 @@ public function testGetSingleActivityIsDeniedForAnonymousUser() {
 
     public function testGetSingleActivityIsDeniedForUnrelatedUser() {
         /** @var Activity $activity */
-        $activity = static::$fixtures['activity1'];
+        $activity = static::getFixture('activity1');
         static::createClientWithCredentials(['email' => static::$fixtures['user4unrelated']->getEmail()])
             ->request('GET', '/activities/'.$activity->getId())
         ;
@@ -35,7 +35,7 @@ public function testGetSingleActivityIsDeniedForUnrelatedUser() {
 
     public function testGetSingleActivityIsDeniedForInactiveCollaborator() {
         /** @var Activity $activity */
-        $activity = static::$fixtures['activity1'];
+        $activity = static::getFixture('activity1');
         static::createClientWithCredentials(['email' => static::$fixtures['user5inactive']->getEmail()])
             ->request('GET', '/activities/'.$activity->getId())
         ;
@@ -48,7 +48,7 @@ public function testGetSingleActivityIsDeniedForInactiveCollaborator() {
 
     public function testGetSingleActivityIsAllowedForGuest() {
         /** @var Activity $activity */
-        $activity = static::$fixtures['activity1'];
+        $activity = static::getFixture('activity1');
         static::createClientWithCredentials(['email' => static::$fixtures['user3guest']->getEmail()])
             ->request('GET', '/activities/'.$activity->getId())
         ;
@@ -70,7 +70,7 @@ public function testGetSingleActivityIsAllowedForGuest() {
 
     public function testGetSingleActivityIsAllowedForMember() {
         /** @var Activity $activity */
-        $activity = static::$fixtures['activity1'];
+        $activity = static::getFixture('activity1');
         $result = static::createClientWithCredentials(['email' => static::$fixtures['user2member']->getEmail()])
             ->request('GET', '/activities/'.$activity->getId())
         ;
@@ -98,7 +98,7 @@ public function testGetSingleActivityIsAllowedForMember() {
 
     public function testGetSingleActivityIsAllowedForManager() {
         /** @var Activity $activity */
-        $activity = static::$fixtures['activity1'];
+        $activity = static::getFixture('activity1');
         static::createClientWithCredentials()->request('GET', '/activities/'.$activity->getId());
         $this->assertResponseStatusCodeSame(200);
         $this->assertJsonContains([
@@ -118,7 +118,7 @@ public function testGetSingleActivityIsAllowedForManager() {
 
     public function testGetSingleActivityFromCampPrototypeIsAllowedForUnrelatedUser() {
         /** @var Activity $activity */
-        $activity = static::$fixtures['activity1campPrototype'];
+        $activity = static::getFixture('activity1campPrototype');
         static::createClientWithCredentials()->request('GET', '/activities/'.$activity->getId());
         $this->assertResponseStatusCodeSame(200);
         $this->assertJsonContains([

diff --git a/api/tests/Api/Activities/UpdateActivityTest.php b/api/tests/Api/Activities/UpdateActivityTest.php
@@ -9,7 +9,7 @@
  */
 class UpdateActivityTest extends ECampApiTestCase {
     public function testPatchActivityIsDeniedForAnonymousUser() {
-        $activity = static::$fixtures['activity1'];
+        $activity = static::getFixture('activity1');
         static::createBasicClient()->request('PATCH', '/activities/'.$activity->getId(), ['json' => [
             'title' => 'Hello World',
             'location' => 'Stoos',
@@ -23,7 +23,7 @@ public function testPatchActivityIsDeniedForAnonymousUser() {
     }
 
     public function testPatchActivityIsDeniedForUnrelatedUser() {
-        $activity = static::$fixtures['activity1'];
+        $activity = static::getFixture('activity1');
         static::createClientWithCredentials(['email' => static::$fixtures['user4unrelated']->getEmail()])
             ->request('PATCH', '/activities/'.$activity->getId(), ['json' => [
                 'title' => 'Hello World',
@@ -39,7 +39,7 @@ public function testPatchActivityIsDeniedForUnrelatedUser() {
     }
 
     public function testPatchActivityIsDeniedForInactiveCollaborator() {
-        $activity = static::$fixtures['activity1'];
+        $activity = static::getFixture('activity1');
         static::createClientWithCredentials(['email' => static::$fixtures['user5inactive']->getEmail()])
             ->request('PATCH', '/activities/'.$activity->getId(), ['json' => [
                 'title' => 'Hello World',
@@ -55,7 +55,7 @@ public function testPatchActivityIsDeniedForInactiveCollaborator() {
     }
 
     public function testPatchActivityIsDeniedForGuest() {
-        $activity = static::$fixtures['activity1'];
+        $activity = static::getFixture('activity1');
         static::createClientWithCredentials(['email' => static::$fixtures['user3guest']->getEmail()])
             ->request('PATCH', '/activities/'.$activity->getId(), ['json' => [
                 'title' => 'Hello World',
@@ -71,7 +71,7 @@ public function testPatchActivityIsDeniedForGuest() {
     }
 
     public function testPatchActivityIsAllowedForMember() {
-        $activity = static::$fixtures['activity1'];
+        $activity = static::getFixture('activity1');
         static::createClientWithCredentials(['email' => static::$fixtures['user2member']->getEmail()])
             ->request('PATCH', '/activities/'.$activity->getId(), ['json' => [
                 'title' => 'Hello World',
@@ -90,7 +90,7 @@ public function testPatchActivityIsAllowedForMember() {
     }
 
     public function testPatchActivityIsAllowedForManager() {
-        $activity = static::$fixtures['activity1'];
+        $activity = static::getFixture('activity1');
         static::createClientWithCredentials()->request('PATCH', '/activities/'.$activity->getId(), ['json' => [
             'title' => 'Hello World',
             'location' => 'Stoos',
@@ -107,7 +107,7 @@ public function testPatchActivityIsAllowedForManager() {
     }
 
     public function testPatchActivityFromCampPrototypeIsDeniedForUnrelatedUser() {
-        $activity = static::$fixtures['activity1campPrototype'];
+        $activity = static::getFixture('activity1campPrototype');
         static::createClientWithCredentials()->request('PATCH', '/activities/'.$activity->getId(), ['json' => [
             'title' => 'Hello World',
             'location' => 'Stoos',
@@ -121,7 +121,7 @@ public function testPatchActivityFromCampPrototypeIsDeniedForUnrelatedUser() {
     }
 
     public function testPatchActivityValidatesCategoryFromSameCamp() {
-        $activity = static::$fixtures['activity1'];
+        $activity = static::getFixture('activity1');
         static::createClientWithCredentials()->request('PATCH', '/activities/'.$activity->getId(), ['json' => [
             'category' => $this->getIriFor('category1camp2'),
         ], 'headers' => ['Content-Type' => 'application/merge-patch+json']]);
@@ -138,7 +138,7 @@ public function testPatchActivityValidatesCategoryFromSameCamp() {
     }
 
     public function testPatchActivityValidatesNullTitle() {
-        $activity = static::$fixtures['activity1'];
+        $activity = static::getFixture('activity1');
         static::createClientWithCredentials(['email' => static::$fixtures['user2member']->getEmail()])
             ->request('PATCH', '/activities/'.$activity->getId(), ['json' => [
                 'title' => null,
@@ -153,7 +153,7 @@ public function testPatchActivityValidatesNullTitle() {
     }
 
     public function testPatchActivityValidatesTitleMinLength() {
-        $activity = static::$fixtures['activity1'];
+        $activity = static::getFixture('activity1');
         static::createClientWithCredentials(['email' => static::$fixtures['user2member']->getEmail()])
             ->request('PATCH', '/activities/'.$activity->getId(), ['json' => [
                 'title' => '',
@@ -172,7 +172,7 @@ public function testPatchActivityValidatesTitleMinLength() {
     }
 
     public function testPatchActivityValidatesTitleMaxLength() {
-        $activity = static::$fixtures['activity1'];
+        $activity = static::getFixture('activity1');
         static::createClientWithCredentials(['email' => static::$fixtures['user2member']->getEmail()])
             ->request('PATCH', '/activities/'.$activity->getId(), ['json' => [
                 'title' => str_repeat('a', 33),
@@ -191,7 +191,7 @@ public function testPatchActivityValidatesTitleMaxLength() {
     }
 
     public function testPatchActivityCleansForbiddenCharactersFromTitle() {
-        $activity = static::$fixtures['activity1'];
+        $activity = static::getFixture('activity1');
         static::createClientWithCredentials(['email' => static::$fixtures['user2member']->getEmail()])
             ->request('PATCH', '/activities/'.$activity->getId(), ['json' => [
                 'title' => "this\n\t\u{202E} is 'a' <sample> text😀 \\",
@@ -205,7 +205,7 @@ public function testPatchActivityCleansForbiddenCharactersFromTitle() {
     }
 
     public function testPatchActivityTrimsTitle() {
-        $activity = static::$fixtures['activity1'];
+        $activity = static::getFixture('activity1');
         static::createClientWithCredentials(['email' => static::$fixtures['user2member']->getEmail()])
             ->request('PATCH', '/activities/'.$activity->getId(), ['json' => [
                 'title' => " \t".str_repeat('a', 32)." \t",
@@ -219,7 +219,7 @@ public function testPatchActivityTrimsTitle() {
     }
 
     public function testPatchActivityValidatesNullLocation() {
-        $activity = static::$fixtures['activity1'];
+        $activity = static::getFixture('activity1');
         static::createClientWithCredentials(['email' => static::$fixtures['user2member']->getEmail()])
             ->request('PATCH', '/activities/'.$activity->getId(), ['json' => [
                 'location' => null,
@@ -234,7 +234,7 @@ public function testPatchActivityValidatesNullLocation() {
     }
 
     public function testPatchActivityAllowsSettingLocationToEmptyString() {
-        $activity = static::$fixtures['activity1'];
+        $activity = static::getFixture('activity1');
         static::createClientWithCredentials(['email' => static::$fixtures['user2member']->getEmail()])
             ->request('PATCH', '/activities/'.$activity->getId(), ['json' => [
                 'location' => '',
@@ -248,7 +248,7 @@ public function testPatchActivityAllowsSettingLocationToEmptyString() {
     }
 
     public function testPatchActivityValidatesLocationMaxLength() {
-        $activity = static::$fixtures['activity1'];
+        $activity = static::getFixture('activity1');
         static::createClientWithCredentials(['email' => static::$fixtures['user2member']->getEmail()])
             ->request('PATCH', '/activities/'.$activity->getId(), ['json' => [
                 'location' => str_repeat('a', 65),
@@ -267,7 +267,7 @@ public function testPatchActivityValidatesLocationMaxLength() {
     }
 
     public function testPatchActivityCleansForbiddenCharactersFromLocation() {
-        $activity = static::$fixtures['activity1'];
+        $activity = static::getFixture('activity1');
         static::createClientWithCredentials(['email' => static::$fixtures['user2member']->getEmail()])
             ->request('PATCH', '/activities/'.$activity->getId(), ['json' => [
                 'location' => "this\n\t\u{202E} is 'a' <sample> text😀 \\",
@@ -281,7 +281,7 @@ public function testPatchActivityCleansForbiddenCharactersFromLocation() {
     }
 
     public function testPatchActivityTrimsLocation() {
-        $activity = static::$fixtures['activity1'];
+        $activity = static::getFixture('activity1');
         static::createClientWithCredentials(['email' => static::$fixtures['user2member']->getEmail()])
             ->request('PATCH', '/activities/'.$activity->getId(), ['json' => [
                 'location' => " \t".str_repeat('a', 64)." \t",