tests/models/storage/url_tests.rb in fog-aws-0.0.7 vs tests/models/storage/url_tests.rb in fog-aws-0.0.8

@@ -1,7 +1,6 @@
 # encoding: utf-8
-
 Shindo.tests('AWS | url', ["aws"]) do
 
 
   @storage = Fog::Storage.new(
     :provider => 'AWS',
@@ -12,14 +11,33 @@
 
   @file = @storage.directories.new(:key => 'fognonbucket').files.new(:key => 'test.txt')
 
   now = Fog::Time.now
   if RUBY_VERSION > '1.8.7' # ruby 1.8.x doesn't provide hash ordering
-    tests('#url w/ response-cache-control').returns(
+    tests('#v4 url w/ response-cache-control').returns(
       "https://fognonbucket.s3.amazonaws.com/test.txt?response-cache-control=No-cache&X-Amz-Expires=500&X-Amz-Date=#{now.to_iso8601_basic}&X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=123/#{now.utc.strftime('%Y%m%d')}/us-east-1/s3/aws4_request&X-Amz-SignedHeaders=host&X-Amz-Signature="
     ) do
 
-      @file.url(Time.now + 500, :query => { 'response-cache-control' => 'No-cache' }).gsub(/(X-Amz-Signature=)[0-9a-f]+\z/,'\\1')
+      @file.url(now + 500, :query => { 'response-cache-control' => 'No-cache' }).gsub(/(X-Amz-Signature=)[0-9a-f]+\z/,'\\1')
+    end
+  end
+
+  @storage = Fog::Storage.new(
+    :provider => 'AWS',
+    :aws_access_key_id => '123',
+    :aws_secret_access_key => 'abc',
+    :aws_signature_version => 2,
+    :region => 'us-east-1'
+  )
+
+  @file = @storage.directories.new(:key => 'fognonbucket').files.new(:key => 'test.txt')
+
+  if RUBY_VERSION > '1.8.7' # ruby 1.8.x doesn't provide hash ordering
+    tests('#v2 url w/ response-cache-control').returns(
+      "https://fognonbucket.s3.amazonaws.com/test.txt?response-cache-control=No-cache&AWSAccessKeyId=123&Signature=foo&Expires=#{now.to_i + 500}"
+    ) do
+
+      @file.url(now + 500, :query => { 'response-cache-control' => 'No-cache' })
     end
   end
 
 
 end