Add bare bucket transfer manager test

pzorn · Jul 22, 2015 · 656ad9e · 656ad9e
1 parent 5f83656
commit 656ad9e
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 3 deletions.
diff --git a/src/S3/Transfer.php b/src/S3/Transfer.php
@@ -319,14 +319,14 @@ private function createS3Key($filename)
     {
         $relative_file_path = ltrim(
             preg_replace('#^' . preg_quote($this->source['path']) . '#', '', $filename),
-            '/'
+            '/\\'
         );
 
         if (isset($this->s3Args['Key'])) {
             return rtrim($this->s3Args['Key'], '/').'/'.$relative_file_path;
-        } else {
-            return $relative_file_path;
         }
+
+        return $relative_file_path;
     }
 
     private function addDebugToBefore($debug)

diff --git a/tests/S3/TransferTest.php b/tests/S3/TransferTest.php
@@ -187,6 +187,33 @@ public function testDownloadsObjects()
         `rm -rf $dir`;
     }
 
+    public function testCanUploadToBareBucket()
+    {
+        $s3 = $this->getMockBuilder('Aws\S3\S3Client')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $filesInDirectory = array_filter(
+            iterator_to_array(\Aws\recursive_dir_iterator(__DIR__)),
+            function ($path) { return !is_dir($path); }
+        );
+
+        $s3->expects($this->exactly(count($filesInDirectory)))
+            ->method('getCommand')
+            ->with(
+                'PutObject',
+                new \PHPUnit_Framework_Constraint_Callback(function (array $args) use ($filesInDirectory) {
+                    return 'bare-bucket' === $args['Bucket']
+                        && in_array($args['SourceFile'], $filesInDirectory)
+                        && __DIR__ . '/' . $args['Key'] === $args['SourceFile'];
+                })
+            )
+            ->willReturn($this->getMock('Aws\CommandInterface'));
+
+        (new Transfer($s3, __DIR__, 's3://bare-bucket'))
+            ->transfer();
+    }
+
     private function mockResult(callable $fn)
     {
         return function (callable $handler) use ($fn) {