fix: use correct indices for file.from and fix tests to verify names (#…

…2449)
googleapis · Apr 26, 2024 · d4240fa · d4240fa
1 parent 2eacda8
commit d4240fa
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/src/file.ts b/src/file.ts
@@ -2410,11 +2410,11 @@ class File extends ServiceObject<File, FileMetadata> {
     const httpsMatches = [...publicUrlOrGsUrl.matchAll(HTTPS_PUBLIC_URL_REGEX)];
 
     if (gsMatches.length > 0) {
-      const bucket = new Bucket(storageInstance, gsMatches[0][1]);
-      return new File(bucket, gsMatches[0][2], options);
+      const bucket = new Bucket(storageInstance, gsMatches[0][2]);
+      return new File(bucket, gsMatches[0][3], options);
     } else if (httpsMatches.length > 0) {
-      const bucket = new Bucket(storageInstance, httpsMatches[0][2]);
-      return new File(bucket, httpsMatches[0][3], options);
+      const bucket = new Bucket(storageInstance, httpsMatches[0][3]);
+      return new File(bucket, httpsMatches[0][4], options);
     } else {
       throw new Error(
         'URL string must be of format gs://bucket/file or https://storage.googleapis.com/bucket/file'

diff --git a/test/file.ts b/test/file.ts
@@ -5180,26 +5180,26 @@ describe('File', () => {
       const result = File.from(gsUrl, STORAGE);
 
       assert(result);
-      assert(result.bucket.name, 'mybucket');
-      assert(result.name, 'myfile');
+      assert.strictEqual(result.bucket.name, 'mybucket');
+      assert.strictEqual(result.name, 'myfile');
     });
 
     it('should create a File object from a gs:// formatted URL including a folder', () => {
       const gsUrl = 'gs://mybucket/myfolder/myfile';
       const result = File.from(gsUrl, STORAGE);
 
       assert(result);
-      assert(result.bucket.name, 'mybucket');
-      assert(result.name, 'myfolder/myfile');
+      assert.strictEqual(result.bucket.name, 'mybucket');
+      assert.strictEqual(result.name, 'myfolder/myfile');
     });
 
     it('should create a File object from a https:// formatted URL', () => {
       const httpsUrl = 'https://storage.googleapis.com/mybucket/myfile';
       const result = File.from(httpsUrl, STORAGE);
 
       assert(result);
-      assert(result.bucket.name, 'mybucket');
-      assert(result.name, 'myfile');
+      assert.strictEqual(result.bucket.name, 'mybucket');
+      assert.strictEqual(result.name, 'myfile');
     });
 
     it('should create a File object from a https:// formatted URL including a folder', () => {
@@ -5208,8 +5208,8 @@ describe('File', () => {
       const result = File.from(httpsUrl, STORAGE);
 
       assert(result);
-      assert(result.bucket.name, 'mybucket');
-      assert(result.name, 'myfolder/myfile');
+      assert.strictEqual(result.bucket.name, 'mybucket');
+      assert.strictEqual(result.name, 'myfolder/myfile');
     });
 
     it('should throw an error when invoked with an incorrectly formatted URL', () => {