Improvements for Contributors / Testing (#34)

* Remove extra test file

* Rename soon to be deprecated assertions

* Add newline

* Keep the cache directory as it is expected for tests to pass

* Style Updates

* Style Updates

Author: josecanhelp

.gitignore

@@ -1,4 +1,5 @@
 /vendor/
 /credentials/
 composer.lock
-/tests/cache/
+/tests/cache/*
+!/tests/cache/.gitkeep

tests/ExampleTest.php

@@ -36,6 +36,6 @@ public function it_creates_a_sheet_model_without_committing_any_crimes()
         $this->assertFileExists('tests/cache/sushi-tests-models-my-sheet-model.sqlite');
 
         $work->first()->invalidateCache();
-        $this->assertFileNotExists('tests/cache/sushi-tests-models-my-sheet-model.sqlite');
+        $this->assertFileDoesNotExist('tests/cache/sushi-tests-models-my-sheet-model.sqlite');
     }
 }

tests/MakeSheetModelCommandTest.php

@@ -2,7 +2,6 @@
 
 namespace Tests;
 
-use Illuminate\Support\Facades\File;
 use Tests\Models\DefineHeadersModel;
 use Tests\Models\InferredIdModel;
 use Tests\Models\TestModel;
@@ -24,11 +23,22 @@ public function setUp(): void
         config(['sushi.cache-path' => $this->cachePath = __DIR__.'/cache']);
     }
 
+    public function tearDown(): void
+    {
+        $this->clearCacheDirectory();
+        parent::tearDown();
+    }
+
+    private function clearCacheDirectory()
+    {
+        array_map('unlink', glob(config('sushi.cache-path').'/*'));
+    }
+
     /** @test */
     public function can_read_from_google_sheets()
     {
-        File::cleanDirectory(config('sushi.cache-path'));
-        $this->assertFileNotExists('tests/cache/sushi-tests-models-test-model.sqlite');
+        $this->clearCacheDirectory();
+        $this->assertFileDoesNotExist('tests/cache/sushi-tests-models-test-model.sqlite');
         $sheet = new TestModel();
         $this->assertIsArray($sheet->getRows());
     }
@@ -78,7 +88,7 @@ public function can_invalidate_cache()
         $sheet = TestModel::find(1);
         $this->assertFileExists('tests/cache/sushi-tests-models-test-model.sqlite');
         $sheet->invalidateCache();
-        $this->assertFileNotExists('tests/cache/sushi-tests-models-test-model.sqlite');
+        $this->assertFileDoesNotExist('tests/cache/sushi-tests-models-test-model.sqlite');
         $sheet = TestModel::find(2);
         $this->assertEquals('Justine', $sheet->name);
     }
@@ -90,6 +100,6 @@ public function can_invalidate_cache_by_request()
         $this->assertFileExists('tests/cache/sushi-tests-models-test-model.sqlite');
         $response = $this->get('/eloquent_sheets_forget/'.$sheet->cacheName);
         $response->assertSuccessful();
-        $this->assertFileNotExists('tests/cache/sushi-tests-test-model.sqlite');
+        $this->assertFileDoesNotExist('tests/cache/sushi-tests-test-model.sqlite');
     }
 }