Merge pull request #148 from plank/fix-command-tests

fix flakey command tests
plank · Oct 5, 2019 · 8f3d356 · 8f3d356
2 parents 22bbb48 + 09f2ce8
commit 8f3d356
Show file tree

Hide file tree

Showing 8 changed files with 42 additions and 13 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,3 +4,4 @@ coverage/
 .env
 .idea/
 .phpunit.result.cache
+infection/
diff --git a/.travis.yml b/.travis.yml
@@ -13,10 +13,6 @@ script:
   - vendor/bin/phpunit --coverage-clover build/logs/clover.xml
 after_script:
   - php vendor/bin/php-coveralls -v
-branches:
-  only:
-  - master
-  - develop
 cache:
   directories:
     - $HOME/.composer/cache
diff --git a/infection.json.dist b/infection.json.dist
@@ -0,0 +1,14 @@
+{
+    "timeout": 10,
+    "source": {
+        "directories": [
+            "src"
+        ]
+    },
+    "logs": {
+        "text": "infection\/infection.log"
+    },
+    "mutators": {
+        "@default": true
+    }
+}
diff --git a/phpunit.xml b/phpunit.xml
@@ -8,6 +8,8 @@
          convertWarningsToExceptions="true"
          processIsolation="false"
          stopOnFailure="false"
+         executionOrder="random"
+         resolveDependencies="true"
 >
     <testsuites>
         <testsuite name="Package Test Suite">

diff --git a/src/Exceptions/MediaUpload/ConfigurationException.php b/src/Exceptions/MediaUpload/ConfigurationException.php
@@ -28,8 +28,6 @@ public static function unrecognizedSource($source): self
             $source = get_class($source);
         } elseif (is_resource($source)) {
             $source = get_resource_type($source);
-        } else {
-            $source = (string)$source;
         }
 
         return new static("Could not recognize source, `{$source}` provided.");

diff --git a/tests/integration/Commands/ImportMediaCommandTest.php b/tests/integration/Commands/ImportMediaCommandTest.php
@@ -64,11 +64,12 @@ public function test_it_creates_media_for_unmatched_files_non_recursively()
 
     public function test_it_skips_files_of_unmatched_aggregate_type()
     {
-        $this->markTestIncomplete('working locally, failing in Travis. Need to investigate further.');
         $artisan = $this->getArtisan();
         $filesystem = app(\Illuminate\Filesystem\FilesystemManager::class);
+        /** @var \Plank\Mediable\MediaUploader $uploader */
         $uploader = app('mediable.uploader');
         $uploader->setAllowUnrecognizedTypes(false);
+        $uploader->setAllowedAggregateTypes(['image']);
         $command = new ImportMediaCommand($filesystem, $uploader);
 
         $media = factory(Media::class)->make(['disk' => 'tmp', 'extension' => 'foo', 'mime_type' => 'bar']);
@@ -82,7 +83,6 @@ public function test_it_skips_files_of_unmatched_aggregate_type()
 
     public function test_it_updates_existing_media()
     {
-        $this->markTestIncomplete('working locally, sporadically failing in Travis. Need to investigate further.');
         $artisan = $this->getArtisan();
         $media1 = factory(Media::class)->create([
             'disk' => 'tmp',
@@ -95,7 +95,7 @@ public function test_it_updates_existing_media()
             'disk' => 'tmp',
             'filename' => 'bar',
             'extension' => 'png',
-            'size' => 8444,
+            'size' => 7173,
             'mime_type' => 'image/png',
             'aggregate_type' => 'image'
         ]);

diff --git a/tests/integration/Commands/SyncMediaCommandTest.php b/tests/integration/Commands/SyncMediaCommandTest.php
@@ -6,15 +6,32 @@ class SyncMediaCommandTest extends TestCase
 {
     public function test_it_calls_prune_and_install()
     {
+        /** @var SyncMediaCommand $command */
         $command = $this->getMockBuilder(SyncMediaCommand::class)
             ->setMethods(['call', 'option', 'argument'])
             ->getMock();
         $command->expects($this->exactly(2))
             ->method('call')
             ->withConsecutive(
-                [$this->equalTo('media:prune')],
-                [$this->equalTo('media:import')]
+                [
+                    $this->equalTo('media:prune'),
+                    [
+                        'disk' => null,
+                        '--directory' => '',
+                        '--non-recursive' => false,
+                    ]
+                ],
+                [
+                    $this->equalTo('media:import'),
+                    [
+                        'disk' => null,
+                        '--directory' => '',
+                        '--non-recursive' => false,
+                        '--force' => false
+                    ]
+                ]
             );
+
         $command->handle();
     }
 }
diff --git a/tests/integration/MediaUploaderTest.php b/tests/integration/MediaUploaderTest.php
@@ -301,14 +301,15 @@ public function test_it_can_increment_filename_on_duplicate_files()
         $media = factory(Media::class)->make([
             'disk' => 'tmp',
             'directory' => '',
-            'filename' => 'plank',
+            'filename' => 'duplicate',
             'extension' => 'png'
         ]);
+        $this->seedFileForMedia($media);
 
         $method->invoke($uploader, $media);
 
 
-        $this->assertEquals('plank-1', $media->filename);
+        $this->assertEquals('duplicate-1', $media->filename);
     }
 
     public function test_it_uploads_files()