storage: fix signed url tests. fixes googleapis#238

stephenplusplus · Sep 23, 2014 · 1a176ae · 1a176ae
1 parent 50704b7
commit 1a176ae
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 30 deletions.
diff --git a/regression/storage.js b/regression/storage.js
@@ -224,25 +224,5 @@ describe('storage', function() {
           });
         });
     });
-
-    it('should allow control of expiration', function(done) {
-      var offsetSeconds = 5;
-      bucket.getSignedUrl({
-          action: 'read',
-          expires: Math.round(Date.now() / 1000) + offsetSeconds,
-          resource: filename
-        }, function(err, signedReadUrl) {
-          assert.ifError(err);
-          request.get(signedReadUrl, function(err, resp, body) {
-            assert.equal(body, localFile);
-          });
-          setTimeout(function() {
-            request.get(signedReadUrl, function(err, resp) {
-              assert.equal(resp.statusCode, 400);
-              bucket.remove(filename, done);
-            });
-          }, (offsetSeconds + 1) * 1000);
-        });
-    });
   });
 });
diff --git a/test/storage/index.js b/test/storage/index.js
@@ -21,6 +21,7 @@
 var assert = require('assert');
 var gcloud = require('../../lib');
 var storage = require('../../lib/storage');
+var url = require('url');
 
 var credentials = require('../testdata/privateKeyFile.json');
 var noop = function() {};
@@ -142,15 +143,32 @@ describe('Bucket', function() {
     bucket.remove('file-name');
   });
 
-  it('should create a signed url', function(done) {
-    bucket.getSignedUrl({
-        action: 'read',
-        resource: 'filename',
-        expires: Date.now() / 1000
-      }, function(err, url) {
-        assert.ifError(err);
-        assert.equal(typeof url, 'string');
-        done();
-      });
+  describe('getSignedUrl', function() {
+    it('should create a signed url', function(done) {
+      bucket.getSignedUrl({
+          action: 'read',
+          expires: Math.round(Date.now() / 1000) + 5,
+          resource: 'filename'
+        }, function(err, signedUrl) {
+          assert.ifError(err);
+          assert.equal(typeof signedUrl, 'string');
+          done();
+        });
+    });
+
+    it('should use the provided expiration date', function(done) {
+      var nowInSeconds = Date.now() / 1000;
+      var expirationTimestamp = Math.round(nowInSeconds + 60);
+      bucket.getSignedUrl({
+          action: 'read',
+          resource: 'filename',
+          expires: expirationTimestamp
+        }, function(err, signedUrl) {
+          assert.ifError(err);
+          var expires = url.parse(signedUrl, true).query.Expires;
+          assert.equal(expires, expirationTimestamp);
+          done();
+        });
+    });
   });
 });