Skip to content

Commit 1a176ae

Browse files
storage: fix signed url tests. fixes googleapis#238
1 parent 50704b7 commit 1a176ae

File tree

2 files changed

+28
-30
lines changed

2 files changed

+28
-30
lines changed

regression/storage.js

-20
Original file line numberDiff line numberDiff line change
@@ -224,25 +224,5 @@ describe('storage', function() {
224224
});
225225
});
226226
});
227-
228-
it('should allow control of expiration', function(done) {
229-
var offsetSeconds = 5;
230-
bucket.getSignedUrl({
231-
action: 'read',
232-
expires: Math.round(Date.now() / 1000) + offsetSeconds,
233-
resource: filename
234-
}, function(err, signedReadUrl) {
235-
assert.ifError(err);
236-
request.get(signedReadUrl, function(err, resp, body) {
237-
assert.equal(body, localFile);
238-
});
239-
setTimeout(function() {
240-
request.get(signedReadUrl, function(err, resp) {
241-
assert.equal(resp.statusCode, 400);
242-
bucket.remove(filename, done);
243-
});
244-
}, (offsetSeconds + 1) * 1000);
245-
});
246-
});
247227
});
248228
});

test/storage/index.js

+28-10
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
var assert = require('assert');
2222
var gcloud = require('../../lib');
2323
var storage = require('../../lib/storage');
24+
var url = require('url');
2425

2526
var credentials = require('../testdata/privateKeyFile.json');
2627
var noop = function() {};
@@ -142,15 +143,32 @@ describe('Bucket', function() {
142143
bucket.remove('file-name');
143144
});
144145

145-
it('should create a signed url', function(done) {
146-
bucket.getSignedUrl({
147-
action: 'read',
148-
resource: 'filename',
149-
expires: Date.now() / 1000
150-
}, function(err, url) {
151-
assert.ifError(err);
152-
assert.equal(typeof url, 'string');
153-
done();
154-
});
146+
describe('getSignedUrl', function() {
147+
it('should create a signed url', function(done) {
148+
bucket.getSignedUrl({
149+
action: 'read',
150+
expires: Math.round(Date.now() / 1000) + 5,
151+
resource: 'filename'
152+
}, function(err, signedUrl) {
153+
assert.ifError(err);
154+
assert.equal(typeof signedUrl, 'string');
155+
done();
156+
});
157+
});
158+
159+
it('should use the provided expiration date', function(done) {
160+
var nowInSeconds = Date.now() / 1000;
161+
var expirationTimestamp = Math.round(nowInSeconds + 60);
162+
bucket.getSignedUrl({
163+
action: 'read',
164+
resource: 'filename',
165+
expires: expirationTimestamp
166+
}, function(err, signedUrl) {
167+
assert.ifError(err);
168+
var expires = url.parse(signedUrl, true).query.Expires;
169+
assert.equal(expires, expirationTimestamp);
170+
done();
171+
});
172+
});
155173
});
156174
});

0 commit comments

Comments
 (0)