fix: remove team member test fix

NFDI4Chem · Feb 3, 2024 · 485c06d · 485c06d · CS76 · Feb 3, 2024
1 parent f3ab2aa
commit 485c06d
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 41 deletions.
diff --git a/app/Policies/TeamPolicy.php b/app/Policies/TeamPolicy.php
@@ -89,7 +89,7 @@ public function updateTeamMember(User $user, Team $team)
      */
     public function removeTeamMember(User $user, Team $team)
     {
-        if ($user->hasTeamRole($user->currentTeam->fresh(), 'owner') || $user->ownsTeam($team)) {
+        if ($user->hasTeamRole($team, 'owner') || $user->ownsTeam($team)) {
             return true;
         } else {
             return false;

diff --git a/database/factories/CitationFactory.php b/database/factories/CitationFactory.php
@@ -29,7 +29,7 @@ public function definition()
         $author = $author1.', '.$author2;
 
         return [
-            'doi' => "10.102X/acs.jnatprod.1c01SS",
+            'doi' => '10.102X/acs.jnatprod.1c01SS',
             'title' => $this->faker->title(),
             'authors' => $author,
             'citation_text' => $this->faker->text(),

diff --git a/phpunit.xml b/phpunit.xml
@@ -1,31 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="./vendor/phpunit/phpunit/phpunit.xsd"
-         bootstrap="vendor/autoload.php"
-         colors="true"
->
-    <testsuites>
-        <testsuite name="Unit">
-            <directory suffix="Test.php">./tests/Unit</directory>
-        </testsuite>
-        <testsuite name="Feature">
-            <directory suffix="Test.php">./tests/Feature</directory>
-        </testsuite>
-    </testsuites>
-    <coverage processUncoveredFiles="true">
-        <include>
-            <directory suffix=".php">./app</directory>
-        </include>
-    </coverage>
-    <php>
-        <server name="APP_ENV" value="testing"/>
-        <server name="BCRYPT_ROUNDS" value="4"/>
-        <server name="CACHE_DRIVER" value="array"/>
-        <env name="DB_CONNECTION" value="pgsql"/>
-        <env name="DB_DATABASE" value="nmrxiv"/>
-        <server name="MAIL_MAILER" value="array"/>
-        <server name="QUEUE_CONNECTION" value="sync"/>
-        <server name="SESSION_DRIVER" value="array"/>
-        <server name="TELESCOPE_ENABLED" value="false"/>
-    </php>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd" bootstrap="vendor/autoload.php" colors="true" cacheDirectory=".phpunit.cache">
+  <testsuites>
+    <testsuite name="Unit">
+      <directory suffix="Test.php">./tests/Unit</directory>
+    </testsuite>
+    <testsuite name="Feature">
+      <directory suffix="Test.php">./tests/Feature</directory>
+    </testsuite>
+  </testsuites>
+  <coverage/>
+  <php>
+    <server name="APP_ENV" value="testing"/>
+    <server name="BCRYPT_ROUNDS" value="4"/>
+    <server name="CACHE_DRIVER" value="array"/>
+    <env name="DB_CONNECTION" value="pgsql"/>
+    <env name="DB_DATABASE" value="nmrxiv"/>
+    <server name="MAIL_MAILER" value="array"/>
+    <server name="QUEUE_CONNECTION" value="sync"/>
+    <server name="SESSION_DRIVER" value="array"/>
+    <server name="TELESCOPE_ENABLED" value="false"/>
+  </php>
+  <source>
+    <include>
+      <directory suffix=".php">./app</directory>
+    </include>
+  </source>
 </phpunit>
diff --git a/tests/Feature/RemoveTeamMemberTest.php b/tests/Feature/RemoveTeamMemberTest.php
@@ -23,18 +23,22 @@ public function test_team_members_can_be_removed_from_teams()
         $this->assertCount(0, $user->currentTeam->fresh()->users);
     }
 
-    /* public function test_only_team_owner_can_remove_team_members()
-     {
-         $user = User::factory()->withPersonalTeam()->create();
+    public function test_only_team_owner_can_remove_team_members()
+    {
+        $user = User::factory()->withPersonalTeam()->create();
 
-         $user->currentTeam->users()->attach(
-             $otherUser = User::factory()->create(), ['role' => 'collaborator']
-         );
+        $user->currentTeam->users()->attach(
+            $otherUser = User::factory()->withPersonalTeam()->create(), ['role' => 'collaborator']
+        );
 
-         $this->actingAs($otherUser);
+        $user->currentTeam->users()->attach(
+            $anotherUser = User::factory()->withPersonalTeam()->create(), ['role' => 'collaborator']
+        );
+
+        $this->actingAs($otherUser);
 
-         $response = $this->delete('/teams/'.$user->currentTeam->id.'/members/'.$user->id);
+        $response = $this->delete('/teams/'.$user->currentTeam->id.'/members/'.$anotherUser->id);
 
-         $response->assertStatus(403);
-     } */
+        $response->assertStatus(403);
+    }
 }