google-drive-mock 1.1.5 → 1.1.6

package/dist/routes/v3.js

@@ -210,6 +210,22 @@ const createV3Router = () => {
             nextPageToken
         };
         const fields = req.query.fields;
+        if (fields && (fields.includes('etag') || fields.includes('kind,etag'))) {
+            res.status(400).json({
+                error: {
+                    code: 400,
+                    message: "Invalid field selection etag",
+                    errors: [{
+                            message: "Invalid field selection etag",
+                            domain: "global",
+                            reason: "invalidParameter",
+                            location: "fields",
+                            locationType: "parameter"
+                        }]
+                }
+            });
+            return;
+        }
         if (fields) {
             res.json((0, mappers_1.applyFields)(response, fields));
         }
@@ -434,7 +450,19 @@ const createV3Router = () => {
         }
         const fields = req.query.fields;
         if (fields && (fields.includes('etag') || fields.includes('kind,etag'))) {
-            res.status(400).json({ error: { code: 400, message: "Invalid field selection: etag" } });
+            res.status(400).json({
+                error: {
+                    code: 400,
+                    message: "Invalid field selection etag",
+                    errors: [{
+                            message: "Invalid field selection etag",
+                            domain: "global",
+                            reason: "invalidParameter",
+                            location: "fields",
+                            locationType: "parameter"
+                        }]
+                }
+            });
             return;
         }
         if (req.query.alt === 'media') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "google-drive-mock",
-  "version": "1.1.5",
+  "version": "1.1.6",
   "description": "Mock-Server that simulates being google-drive. Used for testing.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/routes/v3.ts

@@ -218,6 +218,23 @@ export const createV3Router = () => {
         };
 
         const fields = req.query.fields as string;
+        if (fields && (fields.includes('etag') || fields.includes('kind,etag'))) {
+            res.status(400).json({
+                error: {
+                    code: 400,
+                    message: "Invalid field selection etag",
+                    errors: [{
+                        message: "Invalid field selection etag",
+                        domain: "global",
+                        reason: "invalidParameter",
+                        location: "fields",
+                        locationType: "parameter"
+                    }]
+                }
+            });
+            return;
+        }
+
         if (fields) {
             res.json(applyFields(response, fields));
         } else {
@@ -491,7 +508,19 @@ export const createV3Router = () => {
 
         const fields = req.query.fields as string;
         if (fields && (fields.includes('etag') || fields.includes('kind,etag'))) {
-            res.status(400).json({ error: { code: 400, message: "Invalid field selection: etag" } });
+            res.status(400).json({
+                error: {
+                    code: 400,
+                    message: "Invalid field selection etag",
+                    errors: [{
+                        message: "Invalid field selection etag",
+                        domain: "global",
+                        reason: "invalidParameter",
+                        location: "fields",
+                        locationType: "parameter"
+                    }]
+                }
+            });
             return;
         }
 

package/test/advanced_changes.test.ts

@@ -57,7 +57,7 @@ describe('Advanced Drive Features (Part 1)', () => {
         const fileId = (createRes.body as DriveFile).id;
 
         // 3. List Changes
-        const changesRes = await req('GET', `/drive/v3/changes?pageToken=${startToken}&supportsAllDrives=true&fields=changes(fileId,removed,file(name))`);
+        const changesRes = await req('GET', `/drive/v3/changes?pageToken=${startToken}&supportsAllDrives=true&includeItemsFromAllDrives=true&fields=changes(fileId,removed,file(name))`);
         expect(changesRes.status).toBe(200);
 
         let found: DriveChange | undefined;
@@ -65,7 +65,7 @@ describe('Advanced Drive Features (Part 1)', () => {
         const retryDelay = 400;
 
         for (let i = 0; i < maxRetries; i++) {
-            const changesRes = await req('GET', `/drive/v3/changes?pageToken=${startToken}&supportsAllDrives=true&fields=changes(fileId,removed,file(name))`);
+            const changesRes = await req('GET', `/drive/v3/changes?pageToken=${startToken}&supportsAllDrives=true&includeItemsFromAllDrives=true&fields=changes(fileId,removed,file(name))`);
             expect(changesRes.status).toBe(200);
             const changes = (changesRes.body as { changes: DriveChange[] }).changes;
             found = changes.find((c: DriveChange) => c.fileId === fileId);
@@ -86,7 +86,7 @@ describe('Advanced Drive Features (Part 1)', () => {
 
         // 4. Delete file (Change)
         await req('DELETE', `/drive/v3/files/${fileId}`);
-        const changesRes2 = await req('GET', `/drive/v3/changes?pageToken=${startToken}&supportsAllDrives=true`);
+        const changesRes2 = await req('GET', `/drive/v3/changes?pageToken=${startToken}&supportsAllDrives=true&includeItemsFromAllDrives=true`);
         const changes2 = (changesRes2.body as { changes: DriveChange[] }).changes;
         const deletion = changes2.find((c: DriveChange) => c.fileId === fileId && c.removed === true);
 

package/test/iterate_changes.test.ts

@@ -7,7 +7,7 @@ import { DriveFile } from '../src/store';
 
 const randomString = () => Math.random().toString(36).substring(7);
 
-const createFileWithContent = async (name: string, content: string, config: TestConfig) => {
+const createFileWithContent = async (name: string, content: string, config: TestConfig, parentId?: string) => {
     const res = await fetch(`${config.baseUrl}/upload/drive/v3/files?uploadType=media`, {
         method: 'POST',
         headers: {
@@ -24,7 +24,11 @@ const createFileWithContent = async (name: string, content: string, config: Test
     // actually, let's just use the patch to set name/metadata to ensure it's correct for the test.
 
     // Better: use multipart or just update after create.
-    await fetch(`${config.baseUrl}/drive/v3/files/${file.id}`, {
+    const patchUrl = parentId 
+        ? `${config.baseUrl}/drive/v3/files/${file.id}?addParents=${parentId}`
+        : `${config.baseUrl}/drive/v3/files/${file.id}`;
+
+    await fetch(patchUrl, {
         method: 'PATCH',
         headers: {
             'Authorization': `Bearer ${config.token}`,
@@ -52,19 +56,31 @@ describe('Iterate Changes Queries', () => {
     });
 
     it('should find files where last write time was greater than X, sorted by modifiedTime and id, with limit', async () => {
+        // Create a parent folder
+        const parentRes = await fetch(`${config.baseUrl}/drive/v3/files`, {
+            method: 'POST',
+            headers: { ...headers, 'Content-Type': 'application/json' },
+            body: JSON.stringify({
+                name: 'ParentFolder_GreaterThan_' + randomString(),
+                mimeType: 'application/vnd.google-apps.folder'
+            })
+        });
+        expect(parentRes.status).toBe(200);
+        const parentId = (await parentRes.json()).id;
+
         // Create 3 files with slight delays to ensure different modifiedTimes
-        const file1 = await createFileWithContent('file1', randomString(), config);
+        const file1 = await createFileWithContent('file1', randomString(), config, parentId);
         await new Promise(r => setTimeout(r, 1100)); // Ensure > 1s diff for reliable sorting if seconds resolution
-        const file2 = await createFileWithContent('file2', randomString(), config);
+        const file2 = await createFileWithContent('file2', randomString(), config, parentId);
         await new Promise(r => setTimeout(r, 1100));
-        const file3 = await createFileWithContent('file3', randomString(), config);
+        const file3 = await createFileWithContent('file3', randomString(), config, parentId);
 
         // Use file1's modifiedTime as the baseline (X)
         const timeX = file1.modifiedTime;
 
         // Query: modifiedTime > X, orderBy modifiedTime asc, name asc (using name as proxy for ID stability in test if needed, but user asked for ID)
         // User asked for: Sorted by write data and id. with limit
-        const q = `modifiedTime > '${timeX}' and trashed = false`;
+        const q = `modifiedTime > '${timeX}' and '${parentId}' in parents and trashed = false`;
         const orderBy = 'modifiedTime asc, name asc';
         const pageSize = 1;
 

package/test/v3_parity.test.ts

@@ -62,7 +62,7 @@ describe('Google Drive API V3 Parity', () => {
         return makeRequest(config.target, method, path, headers, body);
     }
 
-    it('should return 400 if fields=etag is requested', async () => {
+    it('should return 400 if fields=etag is requested on get', async () => {
         // Create file
         const createRes = await req('POST', '/drive/v3/files', { name: 'V3 Fields Test' });
         const fileId = createRes.body.id;
@@ -73,6 +73,12 @@ describe('Google Drive API V3 Parity', () => {
         expect(getRes.status).toBe(400);
     });
 
+    it('should return 400 if fields=etag is requested on list', async () => {
+        const getRes = await req('GET', `/drive/v3/files?fields=files(id,name,mimeType,parents,modifiedTime,size,etag)`);
+        
+        expect(getRes.status).toBe(400);
+    });
+
     it('should ignore If-Match header on PATCH (Last Write Wins)', async () => {
         // Create file
         const createRes = await req('POST', '/drive/v3/files', { name: 'V3 If-Match Test' });