Remove scopeCompanyables call from ConsumablesController

app/Http/Controllers/Api/ConsumablesController.php

@@ -45,11 +45,7 @@ class ConsumablesController extends Controller
                 'notes',
                 ];
 
-
+        $consumables = Consumable::with('company', 'location', 'category', 'users', 'manufacturer');
-        $consumables = Company::scopeCompanyables(
-            Consumable::select('consumables.*')
-                ->with('company', 'location', 'category', 'users', 'manufacturer')
-        );
 
         if ($request->filled('search')) {
             $consumables = $consumables->TextSearch(e($request->input('search')));

tests/Feature/Api/Consumables/ConsumablesIndexTest.php

@@ -0,0 +1,72 @@
+<?php
+
+namespace Tests\Feature\Api\Consumables;
+
+use App\Models\Company;
+use App\Models\Consumable;
+use App\Models\User;
+use Illuminate\Testing\TestResponse;
+use Laravel\Passport\Passport;
+use Tests\Support\InteractsWithSettings;
+use Tests\TestCase;
+
+class ConsumablesIndexTest extends TestCase
+{
+    use InteractsWithSettings;
+
+    public function testConsumableIndexAdheresToCompanyScoping()
+    {
+        [$companyA, $companyB] = Company::factory()->count(2)->create();
+
+        $consumableA = Consumable::factory()->for($companyA)->create();
+        $consumableB = Consumable::factory()->for($companyB)->create();
+
+        $superUser = $companyA->users()->save(User::factory()->superuser()->make());
+        $userInCompanyA = $companyA->users()->save(User::factory()->viewConsumables()->make());
+        $userInCompanyB = $companyB->users()->save(User::factory()->viewConsumables()->make());
+
+        $this->settings->disableMultipleFullCompanySupport();
+
+        Passport::actingAs($superUser);
+        $response = $this->getJson(route('api.consumables.index'));
+        $this->assertResponseContains($response, $consumableA);
+        $this->assertResponseContains($response, $consumableB);
+
+        Passport::actingAs($userInCompanyA);
+        $response = $this->getJson(route('api.consumables.index'));
+        $this->assertResponseContains($response, $consumableA);
+        $this->assertResponseContains($response, $consumableB);
+
+        Passport::actingAs($userInCompanyB);
+        $response = $this->getJson(route('api.consumables.index'));
+        $this->assertResponseContains($response, $consumableA);
+        $this->assertResponseContains($response, $consumableB);
+
+        $this->settings->enableMultipleFullCompanySupport();
+
+        Passport::actingAs($superUser);
+        $response = $this->getJson(route('api.consumables.index'));
+        $this->assertResponseContains($response, $consumableA);
+        $this->assertResponseContains($response, $consumableB);
+
+        Passport::actingAs($userInCompanyA);
+        $response = $this->getJson(route('api.consumables.index'));
+        $this->assertResponseContains($response, $consumableA);
+        $this->assertResponseDoesNotContain($response, $consumableB);
+
+        Passport::actingAs($userInCompanyB);
+        $response = $this->getJson(route('api.consumables.index'));
+        $this->assertResponseDoesNotContain($response, $consumableA);
+        $this->assertResponseContains($response, $consumableB);
+    }
+
+    private function assertResponseContains(TestResponse $response, Consumable $consumable)
+    {
+        $this->assertTrue(collect($response['rows'])->pluck('name')->contains($consumable->name));
+    }
+
+    private function assertResponseDoesNotContain(TestResponse $response, Consumable $consumable)
+    {
+        $this->assertFalse(collect($response['rows'])->pluck('name')->contains($consumable->name));
+    }
+}