Skip to content

Commit d4ce4b4

Browse files
thiyaguk09thiyaguk09
committed
unit test fix
1 parent 1bfca02 commit d4ce4b4

13 files changed

Lines changed: 221 additions & 154 deletions

File tree

‎handwritten/storage/src/bucket.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1688,7 +1688,7 @@ class Bucket extends ServiceObject<Bucket, BucketMetadata> {
16881688
.makeRequest(
16891689
{
16901690
method: 'POST',
1691-
url: '/storage/v1/b/${this.name}/o/${encodeURIComponent(destinationFile.name)}/compose',
1691+
url: `/storage/v1/b/${this.name}/o/${encodeURIComponent(destinationFile.name)}/compose`,
16921692
maxRetries,
16931693
body: JSON.stringify({
16941694
destination: {

‎handwritten/storage/src/file.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1409,7 +1409,7 @@ class File extends ServiceObject<File, FileMetadata> {
14091409
.makeRequest<RewriteResponse>(
14101410
{
14111411
method: 'POST',
1412-
url: `storage/v1/b/${this.bucket.name}/o/${encodeURIComponent(this.name)}/rewriteTo/b/${
1412+
url: `/storage/v1/b/${this.bucket.name}/o/${encodeURIComponent(this.name)}/rewriteTo/b/${
14131413
destBucket.name
14141414
}/o/${encodeURIComponent(newFile.name)}`,
14151415
queryParameters: query as unknown as StorageQueryParameters,

‎handwritten/storage/src/storage-transport.ts‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,12 @@ export class StorageTransport {
167167
timeout: this.timeout,
168168
// eslint-disable-next-line @typescript-eslint/no-explicit-any
169169
...({decompress: false} as any),
170-
validateStatus: status => status >= 200 && status < 300,
170+
validateStatus: status => {
171+
if (urlString.includes('uploadType=resumable')) {
172+
return (status >= 200 && status < 300) || status === 308;
173+
}
174+
return status >= 200 && status < 300;
175+
}, //status => status >= 200 && status < 300,
171176
});
172177

173178
// Response Handling

‎handwritten/storage/src/storage.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@ export const RETRYABLE_ERR_FN_DEFAULT = function (err?: GaxiosError) {
307307

308308
const config = err.config;
309309
const method = (config.method || 'GET').toUpperCase();
310-
const url = config.url.toString() || '';
310+
const url = config.url ? config.url.toString() : '';
311311
const params = config.params || {};
312312
const data = config.data;
313313

‎handwritten/storage/test/acl.ts‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ describe('storage/acl', () => {
6262
it('should make the correct api request', () => {
6363
acl.storageTransport.makeRequest = sandbox.stub().callsFake(reqOpts => {
6464
assert.strictEqual(reqOpts.method, 'POST');
65-
assert.strictEqual(reqOpts.url, '/bucket/acl');
65+
assert.strictEqual(reqOpts.url, '/storage/v1/b/bucket/acl');
6666
assert.deepStrictEqual(JSON.parse(reqOpts.body), {
6767
entity: ENTITY,
6868
role: ROLE,
@@ -166,7 +166,10 @@ describe('storage/acl', () => {
166166
it('should make the correct api request', () => {
167167
acl.storageTransport.makeRequest = sandbox.stub().callsFake(reqOpts => {
168168
assert.strictEqual(reqOpts.method, 'DELETE');
169-
assert.strictEqual(reqOpts.url, `/bucket/acl/${ENTITY}`);
169+
assert.strictEqual(
170+
reqOpts.url,
171+
`/storage/v1/b/bucket/acl/${encodeURIComponent(ENTITY)}`,
172+
);
170173
return Promise.resolve();
171174
});
172175

@@ -240,7 +243,7 @@ describe('storage/acl', () => {
240243
describe('all ACL objects', () => {
241244
it('should make the correct API request', () => {
242245
acl.storageTransport.makeRequest = sandbox.stub().callsFake(reqOpts => {
243-
assert.strictEqual(reqOpts.url, '/bucket/acl');
246+
assert.strictEqual(reqOpts.url, '/storage/v1/b/bucket/acl');
244247

245248
return Promise.resolve();
246249
});
@@ -295,7 +298,10 @@ describe('storage/acl', () => {
295298
describe('ACL object for an entity', () => {
296299
it('should get a specific ACL object', () => {
297300
acl.storageTransport.makeRequest = sandbox.stub().callsFake(reqOpts => {
298-
assert.strictEqual(reqOpts.url, `/bucket/acl/${ENTITY}`);
301+
assert.strictEqual(
302+
reqOpts.url,
303+
`/storage/v1/b/bucket/acl/${encodeURIComponent(ENTITY)}`,
304+
);
299305
return Promise.resolve();
300306
});
301307

@@ -408,7 +414,10 @@ describe('storage/acl', () => {
408414
it('should make the correct API request', () => {
409415
acl.storageTransport.makeRequest = sandbox.stub().callsFake(reqOpts => {
410416
assert.strictEqual(reqOpts.method, 'PUT');
411-
assert.strictEqual(reqOpts.url, `/bucket/acl/${ENTITY}`);
417+
assert.strictEqual(
418+
reqOpts.url,
419+
`/storage/v1/b/bucket/acl/${encodeURIComponent(ENTITY)}`,
420+
);
412421
assert.deepStrictEqual(JSON.parse(reqOpts.body), {role: ROLE});
413422
return Promise.resolve();
414423
});

‎handwritten/storage/test/bucket.ts‎

Lines changed: 23 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ describe('Bucket', () => {
9999
.stub()
100100
.callsFake((reqOpts, callback) => {
101101
assert.strictEqual(reqOpts.method, 'POST');
102-
assert.strictEqual(reqOpts.url, '/b');
102+
assert.strictEqual(reqOpts.url, '/storage/v1/b');
103103
assert.deepStrictEqual(
104104
reqOpts.queryParameters!.userProject,
105105
options.userProject,
@@ -127,7 +127,7 @@ describe('Bucket', () => {
127127
.stub()
128128
.callsFake(reqOpts => {
129129
assert.strictEqual(reqOpts.method, 'DELETE');
130-
assert.strictEqual(reqOpts.url, `/b/${BUCKET_NAME}`);
130+
assert.strictEqual(reqOpts.url, `/storage/v1/b/${BUCKET_NAME}`);
131131
assert.deepStrictEqual(
132132
reqOpts.queryParameters!.userProject,
133133
options.userProject,
@@ -156,7 +156,7 @@ describe('Bucket', () => {
156156
.stub()
157157
.callsFake(reqOpts => {
158158
assert.strictEqual(reqOpts.method, 'GET');
159-
assert.strictEqual(reqOpts.url, `/b/${BUCKET_NAME}`);
159+
assert.strictEqual(reqOpts.url, `/storage/v1/b/${BUCKET_NAME}`);
160160
assert.deepStrictEqual(
161161
reqOpts.queryParameters!.userProject,
162162
options.userProject,
@@ -185,7 +185,7 @@ describe('Bucket', () => {
185185
.stub()
186186
.callsFake(reqOpts => {
187187
assert.strictEqual(reqOpts.method, 'GET');
188-
assert.strictEqual(reqOpts.url, `/b/${BUCKET_NAME}`);
188+
assert.strictEqual(reqOpts.url, `/storage/v1/b/${BUCKET_NAME}`);
189189
assert.deepStrictEqual(
190190
reqOpts.queryParameters!.userProject,
191191
options.userProject,
@@ -214,7 +214,7 @@ describe('Bucket', () => {
214214
.stub()
215215
.callsFake(reqOpts => {
216216
assert.strictEqual(reqOpts.method, 'GET');
217-
assert.strictEqual(reqOpts.url, `/b/${BUCKET_NAME}`);
217+
assert.strictEqual(reqOpts.url, `/storage/v1/b/${BUCKET_NAME}`);
218218
assert.deepStrictEqual(
219219
reqOpts.queryParameters!.userProject,
220220
options.userProject,
@@ -247,7 +247,7 @@ describe('Bucket', () => {
247247
.stub()
248248
.callsFake(reqOpts => {
249249
assert.strictEqual(reqOpts.method, 'PATCH');
250-
assert.strictEqual(reqOpts.url, `/b/${BUCKET_NAME}`);
250+
assert.strictEqual(reqOpts.url, `/storage/v1/b/${BUCKET_NAME}`);
251251
assert.deepStrictEqual(
252252
reqOpts.queryParameters!.versioning,
253253
options.versioning,
@@ -570,7 +570,10 @@ describe('Bucket', () => {
570570
.callsFake(reqOpts => {
571571
const body = JSON.parse(reqOpts.body);
572572
assert.strictEqual(reqOpts.method, 'POST');
573-
assert.strictEqual(reqOpts.url, '/compose');
573+
assert.strictEqual(
574+
reqOpts.url,
575+
'/storage/v1/b/test-bucket/o/destination.txt/compose',
576+
);
574577
assert.strictEqual(body.sourceObjects[0].name, file1.name);
575578
assert.strictEqual(body.sourceObjects[1].name, file2.name);
576579
done();
@@ -640,7 +643,10 @@ describe('Bucket', () => {
640643

641644
storageTransport.makeRequest = sandbox.stub().callsFake(reqOpts => {
642645
const body = JSON.parse(reqOpts.body);
643-
assert.strictEqual(reqOpts.url, '/compose');
646+
assert.strictEqual(
647+
reqOpts.url,
648+
'/storage/v1/b/test-bucket/o/destination.foo/compose',
649+
);
644650
assert.deepStrictEqual(body, {
645651
destination: {},
646652
sourceObjects: [{name: sources[0].name}, {name: sources[1].name}],
@@ -827,7 +833,10 @@ describe('Bucket', () => {
827833
.stub()
828834
.callsFake(reqOpts => {
829835
assert.strictEqual(reqOpts.method, 'POST');
830-
assert.strictEqual(reqOpts.url, `/b/${BUCKET_NAME}/o/watch`);
836+
assert.strictEqual(
837+
reqOpts.url,
838+
`/storage/v1/b/${BUCKET_NAME}/o/watch`,
839+
);
831840

832841
const expectedJson = Object.assign({}, config, {
833842
id: ID,
@@ -955,7 +964,7 @@ describe('Bucket', () => {
955964
assert.strictEqual(reqOpts.method, 'POST');
956965
assert.strictEqual(
957966
reqOpts.url,
958-
`/b/${BUCKET_NAME}/notificationConfigs`,
967+
`/storage/v1/b/${BUCKET_NAME}/notificationConfigs`,
959968
);
960969
assert.deepStrictEqual(JSON.parse(reqOpts.body), expectedJson);
961970
assert.notStrictEqual(reqOpts.body, options);
@@ -1644,7 +1653,7 @@ describe('Bucket', () => {
16441653
bucket.storageTransport.makeRequest = sandbox
16451654
.stub()
16461655
.callsFake(reqOpts => {
1647-
assert.strictEqual(reqOpts.url, `/b/${BUCKET_NAME}/o`);
1656+
assert.strictEqual(reqOpts.url, `/storage/v1/b/${BUCKET_NAME}/o`);
16481657
assert.deepStrictEqual(reqOpts.queryParameters, {});
16491658
});
16501659

@@ -1917,7 +1926,7 @@ describe('Bucket', () => {
19171926
.callsFake(reqOpts => {
19181927
assert.strictEqual(
19191928
reqOpts.url,
1920-
`/b/${BUCKET_NAME}/notificationConfigs`,
1929+
`/storage/v1/b/${BUCKET_NAME}/notificationConfigs`,
19211930
);
19221931
assert.strictEqual(reqOpts.queryParameters, options);
19231932
done();
@@ -2072,7 +2081,7 @@ describe('Bucket', () => {
20722081
.callsFake((reqOpts, callback) => {
20732082
assert.deepStrictEqual(reqOpts, {
20742083
method: 'POST',
2075-
url: `/b/${BUCKET_NAME}/lockRetentionPolicy`,
2084+
url: `/storage/v1/b/${BUCKET_NAME}/lockRetentionPolicy`,
20762085
queryParameters: {
20772086
ifMetagenerationMatch: metageneration,
20782087
},
@@ -2293,7 +2302,7 @@ describe('Bucket', () => {
22932302
.callsFake(reqOpts => {
22942303
assert.deepStrictEqual(reqOpts, {
22952304
method: 'POST',
2296-
url: `/b/${BUCKET_NAME}/restore`,
2305+
url: `/storage/v1/b/${BUCKET_NAME}/restore`,
22972306
queryParameters: {generation: '123456789'},
22982307
});
22992308
return [];

‎handwritten/storage/test/channel.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ describe('Channel', () => {
6262
.stub()
6363
.callsFake(reqOpts => {
6464
assert.strictEqual(reqOpts.method, 'POST');
65-
assert.strictEqual(reqOpts.url, '/channels/stop');
65+
assert.strictEqual(reqOpts.url, '/storage/v1/channels/stop');
6666
assert.deepStrictEqual(JSON.parse(reqOpts.body), channel.metadata);
6767

6868
return Promise.resolve();

0 commit comments

Comments
 (0)