Merge pull request silverstripe#41 from satrun77/pull/fix-file-creation

Fix creating file instance using fixture file extension

code/PopulateFactory.php

@@ -6,8 +6,8 @@
 use InvalidArgumentException;
 use SilverStripe\Assets\File;
 use SilverStripe\Assets\Folder;
-use SilverStripe\Assets\Image;
 use SilverStripe\Assets\Storage\AssetStore;
+use SilverStripe\Core\Injector\Injector;
 use SilverStripe\Dev\FixtureBlueprint;
 use SilverStripe\Dev\FixtureFactory;
 use SilverStripe\ORM\DataList;
@@ -251,7 +251,9 @@ private function populateFile($data)
                 return true;
             }
         } else {
-            $file = Image::create();
+            // Create instance of file data object based on the extension of the fixture file
+            $fileClass = File::get_class_for_file_extension(File::get_file_extension($fixtureFilePath));
+            $file = Injector::inst()->create($fileClass);
         }
 
         $folder = Folder::find_or_make(dirname($filenameWithoutAssets));

tests/assets/file.txt

@@ -0,0 +1 @@
+Hello

tests/php/PopulateFactoryTest.php

@@ -5,6 +5,9 @@
 use DNADesign\Populate\PopulateFactory;
 use DNADesign\Populate\Tests\PopulateFactoryTest\PopulateFactoryTestObject;
 use DNADesign\Populate\Tests\PopulateFactoryTest\PopulateFactoryTestVersionedObject;
+use SilverStripe\Assets\File;
+use SilverStripe\Assets\Image;
+use SilverStripe\Core\Injector\Injector;
 use SilverStripe\Dev\SapphireTest;
 use SilverStripe\Dev\TestOnly;
 use SilverStripe\Versioned\Versioned;
@@ -136,4 +139,28 @@ public function testMultipleMatchesRemoved()
         $this->assertEquals(1, $list->count());
         $this->assertEquals('Updated', $list->first()->Title);
     }
+
+    /**
+     * Test to ensure creating standard file such as PDF and image with correct DataObject file.
+     */
+    public function testCreatingFileOrImage()
+    {
+        // Collection of data to create file and image
+        $files = [
+            'file.txt' => File::class,
+            'image.png' => Image::class,
+        ];
+
+        // Create a file/image, check if data stored in database with expected DataObject class and file exists
+        foreach ($files as $name => $class) {
+            $this->factory->createObject(File::class, $name, [
+                'Filename' => $name,
+                'PopulateFileFrom' => sprintf('tests/assets/%s', $name),
+            ]);
+
+            $file = Injector::inst()->get($class)->get()->filter('Name', $name)->first();
+            $this->assertEquals($class, get_class($file));
+            $this->assertTrue($file->exists());
+        }
+    }
 }