Add testing of removing volunteers

TheRestartProject · Jul 28, 2021 · d088eff · d088eff
1 parent 7f8fb34
commit d088eff
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/app/Helpers/Fixometer.php b/app/Helpers/Fixometer.php
@@ -215,6 +215,7 @@ public static function userIsHostOfGroup($groupId, $userId)
                                 ->where('group', $groupId)
                                 ->where('user', $userId)
                                 ->where('role', 3)
+                                ->whereNull('deleted_at')
                                 ->first();
 
         if ( ! empty($user_group_association)) {

diff --git a/app/Http/Controllers/GroupController.php b/app/Http/Controllers/GroupController.php
@@ -1046,8 +1046,6 @@ public function getRemoveVolunteer($group_id, $user_id, Request $request)
         return redirect()->back()->with('warning', 'Sorry, you do not have permission to do this');
     }
 
-    // TODO: is this alive?
-    // It's still in the action menu, but I don't believe it has been updated recently.
     public function volunteersNearby($groupid)
     {
         if (isset($_GET['action']) && isset($_GET['code'])) {

diff --git a/tests/Feature/Groups/GroupHostTest.php b/tests/Feature/Groups/GroupHostTest.php
@@ -70,6 +70,22 @@ public function testHostMakeHost() {
 
         $response = $this->get("/group/make-host/{$this->idgroups}/{$host->id}");
         $response->assertSessionHas('success');
+
+        // Remove them.
+        $response = $this->get("/group/remove-volunteer/{$this->idgroups}/{$host->id}");
+        $response->assertSessionHas('success');
+
+        // Remove them again - should redirect back with warning.
+        $response = $this->from('/')->get("/group/remove-volunteer/{$this->idgroups}/{$host->id}");
+        $response->assertRedirect('/');
+        $response->assertSessionHas('warning');
+
+        // Removed host tries and fails to remove the first host.
+        $response = $this->get('/logout');
+        $this->actingAs($host);
+        $response = $this->from('/')->get("/group/remove-volunteer/{$this->idgroups}/{$firsthost->id}");
+        $response->assertRedirect('/');
+        $response->assertSessionHas('warning');
     }
 
     public function testIrrelevantHost() {