1
0
Fork 0
mirror of https://github.com/fog/fog.git synced 2022-11-09 13:51:43 -05:00

Merge pull request #1386 from n2uitive/bug_rackspace_storage_etag

Bugfix for Storage::Rackspace::File#save with etag attribute
This commit is contained in:
Wesley Beary 2012-12-17 13:22:35 -08:00
commit e2fbe1fc26
2 changed files with 7 additions and 1 deletions

View file

@ -124,7 +124,7 @@ module Fog
end
def metadata_attributes
if etag
if last_modified
headers = connection.head_object(directory.key, self.key).headers
headers.reject! {|k, v| !metadata_attribute?(k)}
else

View file

@ -26,6 +26,12 @@ Shindo.tests('Fog::Rackspace::Storage | file', ['rackspace']) do
directories.
create(directory_attributes)
model_tests(@directory.files, file_attributes.merge(:etag => 'foo'), Fog.mocking?) do
tests('#save should not blow up with etag') do
@instance.save
end
end
model_tests(@directory.files, file_attributes, Fog.mocking?) do
tests("#metadata should load empty metadata").returns({}) do