From d220e9029b68ce5bf9051797fb5dd58f3fc5acb2 Mon Sep 17 00:00:00 2001 From: Wesley Beary Date: Thu, 5 Nov 2009 09:19:48 -0800 Subject: [PATCH] move File.open(lorem) into spec_helper to DRY --- spec/aws/requests/s3/copy_object_spec.rb | 3 +-- spec/aws/requests/s3/delete_bucket_spec.rb | 3 +-- spec/aws/requests/s3/delete_object_spec.rb | 3 +-- spec/aws/requests/s3/get_bucket_spec.rb | 6 ++---- spec/aws/requests/s3/get_object_spec.rb | 12 ++++-------- spec/aws/requests/s3/head_object_spec.rb | 6 ++---- spec/aws/requests/s3/put_object_spec.rb | 9 +++------ spec/spec_helper.rb | 4 ++++ 8 files changed, 18 insertions(+), 28 deletions(-) diff --git a/spec/aws/requests/s3/copy_object_spec.rb b/spec/aws/requests/s3/copy_object_spec.rb index 12d44c3f5..71785d72f 100644 --- a/spec/aws/requests/s3/copy_object_spec.rb +++ b/spec/aws/requests/s3/copy_object_spec.rb @@ -5,8 +5,7 @@ describe 'S3.copy_object' do before(:each) do s3.put_bucket('fogcopyobjectsource') - file = File.open(File.dirname(__FILE__) + '/../../../lorem.txt', 'r') - s3.put_object('fogcopyobjectsource', 'fog_copy_object_source', file) + s3.put_object('fogcopyobjectsource', 'fog_copy_object_source', lorem_file) s3.put_bucket('fogcopyobjectdestination') end diff --git a/spec/aws/requests/s3/delete_bucket_spec.rb b/spec/aws/requests/s3/delete_bucket_spec.rb index 0bff5a443..72a81f3eb 100644 --- a/spec/aws/requests/s3/delete_bucket_spec.rb +++ b/spec/aws/requests/s3/delete_bucket_spec.rb @@ -23,8 +23,7 @@ describe 'S3.delete_bucket' do it 'should raise a Conflict error if the bucket is not empty' do s3.put_bucket('fogdeletebucket') - file = File.open(File.dirname(__FILE__) + '/../../../lorem.txt', 'r') - s3.put_object('fogdeletebucket', 'fog_delete_object', file) + s3.put_object('fogdeletebucket', 'fog_delete_object', lorem_file) lambda { s3.delete_bucket('fogdeletebucket') }.should raise_error(Excon::Errors::Conflict) diff --git a/spec/aws/requests/s3/delete_object_spec.rb b/spec/aws/requests/s3/delete_object_spec.rb index 4b177d543..39e557782 100644 --- a/spec/aws/requests/s3/delete_object_spec.rb +++ b/spec/aws/requests/s3/delete_object_spec.rb @@ -5,8 +5,7 @@ describe 'S3.delete_object' do before(:each) do s3.put_bucket('fogdeleteobject') - file = File.open(File.dirname(__FILE__) + '/../../../lorem.txt', 'r') - s3.put_object('fogdeleteobject', 'fog_delete_object', file) + s3.put_object('fogdeleteobject', 'fog_delete_object', lorem_file) end after(:each) do diff --git a/spec/aws/requests/s3/get_bucket_spec.rb b/spec/aws/requests/s3/get_bucket_spec.rb index 18fe5779b..f8bfb8f28 100644 --- a/spec/aws/requests/s3/get_bucket_spec.rb +++ b/spec/aws/requests/s3/get_bucket_spec.rb @@ -5,10 +5,8 @@ describe 'S3.get_bucket' do before(:each) do s3.put_bucket('foggetbucket') - file = File.open(File.dirname(__FILE__) + '/../../../lorem.txt', 'r') - s3.put_object('foggetbucket', 'fog_object', file) - file = File.open(File.dirname(__FILE__) + '/../../../lorem.txt', 'r') - s3.put_object('foggetbucket', 'fog_other_object', file) + s3.put_object('foggetbucket', 'fog_object', lorem_file) + s3.put_object('foggetbucket', 'fog_other_object', lorem_file) end after(:each) do diff --git a/spec/aws/requests/s3/get_object_spec.rb b/spec/aws/requests/s3/get_object_spec.rb index 7a9361193..0a3f0e78b 100644 --- a/spec/aws/requests/s3/get_object_spec.rb +++ b/spec/aws/requests/s3/get_object_spec.rb @@ -5,8 +5,7 @@ describe 'S3.get_object' do before(:each) do s3.put_bucket('foggetobject') - file = File.open(File.dirname(__FILE__) + '/../../../lorem.txt', 'r') - s3.put_object('foggetobject', 'fog_get_object', file) + s3.put_object('foggetobject', 'fog_get_object', lorem_file) end after(:each) do @@ -17,8 +16,7 @@ describe 'S3.get_object' do it 'should return proper attributes' do actual = s3.get_object('foggetobject', 'fog_get_object') actual.status.should == 200 - file = File.open(File.dirname(__FILE__) + '/../../../lorem.txt', 'r') - data = file.read + data = lorem_file.read actual.body.should == data actual.headers['Content-Length'].should == data.length.to_s actual.headers['Content-Type'].should be_a(String) @@ -27,19 +25,17 @@ describe 'S3.get_object' do end it 'should return chunks with optional block' do - file = File.open(File.dirname(__FILE__) + '/../../../lorem.txt', 'r') data = '' s3.get_object('foggetobject', 'fog_get_object') do |chunk| data << chunk end - data.should == file.read + data.should == lorem_file.read end it 'should return a signed expiring url' do url = s3.get_object_url('foggetobject', 'fog_get_object', Time.now + 60 * 10) - file = File.open(File.dirname(__FILE__) + '/../../../lorem.txt', 'r') unless Fog.mocking? - open(url).read.should == file.read + open(url).read.should == lorem_file.read end end diff --git a/spec/aws/requests/s3/head_object_spec.rb b/spec/aws/requests/s3/head_object_spec.rb index 4ec74f569..64cca75ca 100644 --- a/spec/aws/requests/s3/head_object_spec.rb +++ b/spec/aws/requests/s3/head_object_spec.rb @@ -5,8 +5,7 @@ describe 'S3.head_object' do before(:each) do s3.put_bucket('fogheadobject') - file = File.open(File.dirname(__FILE__) + '/../../../lorem.txt', 'r') - s3.put_object('fogheadobject', 'fog_head_object', file) + s3.put_object('fogheadobject', 'fog_head_object', lorem_file) end after(:each) do @@ -17,8 +16,7 @@ describe 'S3.head_object' do it 'should return proper attributes' do actual = s3.head_object('fogheadobject', 'fog_head_object') actual.status.should == 200 - file = File.open(File.dirname(__FILE__) + '/../../../lorem.txt', 'r') - data = file.read + data = lorem_file.read actual.headers['Content-Length'].should == data.length.to_s actual.headers['ETag'].should be_a(String) actual.headers['Last-Modified'].should be_a(String) diff --git a/spec/aws/requests/s3/put_object_spec.rb b/spec/aws/requests/s3/put_object_spec.rb index 48ddb6d8e..148dbc668 100644 --- a/spec/aws/requests/s3/put_object_spec.rb +++ b/spec/aws/requests/s3/put_object_spec.rb @@ -5,8 +5,7 @@ describe 'S3.put_object' do before(:each) do s3.put_bucket('fogputobject') - file = File.open(File.dirname(__FILE__) + '/../../../lorem.txt', 'r') - @response = s3.put_object('fogputobject', 'fog_put_object', file) + @response = s3.put_object('fogputobject', 'fog_put_object', lorem_file) end after(:each) do @@ -19,8 +18,7 @@ describe 'S3.put_object' do end it 'should not raise an error if the object already exists' do - file = File.open(File.dirname(__FILE__) + '/../../../lorem.txt', 'r') - actual = s3.put_object('fogputobject', 'fog_put_object', file) + actual = s3.put_object('fogputobject', 'fog_put_object', lorem_file) actual.status.should == 200 end @@ -29,8 +27,7 @@ describe 'S3.put_object' do it 'should raise a NotFound error if the bucket does not exist' do lambda { - file = File.open(File.dirname(__FILE__) + '/../../../lorem.txt', 'r') - s3.put_object('fognotabucket', 'fog_put_object', file) + s3.put_object('fognotabucket', 'fog_put_object', lorem_file) }.should raise_error(Excon::Errors::NotFound) end diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 0444b4fc8..1f8e3cd53 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -83,3 +83,7 @@ end unless defined?(GENTOO_AMI) GENTOO_AMI = 'ami-5ee70037' end + +def lorem_file + File.open(File.dirname(__FILE__) + '/lorem.txt', 'r') +end \ No newline at end of file