test(suite): adapt metadata e2e tests

packages/e2e-utils/src/mocks/dropbox.ts

@@ -10,6 +10,7 @@ const port = 30002;
 export class DropboxMock {
     files: Record<string, any> = {};
     nextResponse: Record<string, any>[] = [];
+    uploadSessionFiles: Record<string, Buffer> = {};
     // store requests for assertions in tests
     requests: string[] = [];
     app?: Express;
@@ -117,8 +118,8 @@ export class DropboxMock {
                                     metadata: {
                                         '.tag': 'file',
                                         name: query,
-                                        path_lower: `/apps/trezor/${query}`,
-                                        path_display: `/Apps/TREZOR/${query}`,
+                                        path_lower: `/${query}`,
+                                        path_display: `/${query}`,
                                         id: 'id:foo-id',
                                         client_modified: '2020-10-07T09:52:45Z',
                                         server_modified: '2020-10-07T09:52:45Z',
@@ -139,25 +140,39 @@ export class DropboxMock {
             res.end();
         });
 
+        // https://api.dropboxapi.com/2/files/list_folder
+        app.post('/2/files/list_folder', (_req, res) => {
+            const entries = Object.keys(this.files).map(name =>
+                // name is without leading slash /
+                ({ name: name.replace('/', '') }),
+            );
+
+            res.write(
+                JSON.stringify({
+                    entries,
+                }),
+            );
+
+            return res.send();
+        });
+
         // https://content.dropboxapi.com/2/files/download
         app.post('/2/files/download', (req, res) => {
             // @ts-expect-error
             const dropboxApiArgs = JSON.parse(req.headers['dropbox-api-arg']);
             const { path } = dropboxApiArgs;
-            const name = path.replace('/apps/trezor', '');
-
-            const file = this.files[name];
 
+            const file = this.files[path];
             if (file) {
                 // @ts-expect-error
                 res.writeHeader(200, {
                     'Content-Type': 'application/octet-stream',
-                    'Dropbox-Api-Result': `{"name": "${name}", "path_lower": "${path}", "path_display": "/Apps/TREZOR/${name}", "id": "id:foo-bar", "client_modified": "2020-10-07T09:52:45Z", "server_modified": "2020-10-07T09:52:45Z", "rev": "foo-bar", "size": 666, "is_downloadable": true, "content_hash": "foo-bar"}`,
+                    'Dropbox-Api-Result': `{"name": "${path}", "path_lower": "${path}", "path_display": "/${path}", "id": "id:foo-bar", "client_modified": "2020-10-07T09:52:45Z", "server_modified": "2020-10-07T09:52:45Z", "rev": "foo-bar", "size": 666, "is_downloadable": true, "content_hash": "foo-bar"}`,
                 });
 
                 res.write(file, 'binary');
             } else {
-                console.error('[dropboxMock]: no such file found', file);
+                console.error('[dropboxMock]: no such file found', path);
             }
             return res.end();
         });
@@ -176,6 +191,17 @@ export class DropboxMock {
             },
         );
 
+        // https://content.dropboxapi.com/2/files/upload
+        app.post(
+            '/2/files/move_v2',
+            // express.raw({ type: 'application/octet-stream' }),
+            (req, res) => {
+                this.files[req.body.to_path] = this.files[req.body.from_path];
+                delete this.files[req.body.from_path];
+                res.send();
+            },
+        );
+
         this.app = app;
     }
 

packages/e2e-utils/src/mocks/google.ts

@@ -35,8 +35,8 @@ class File {
  * Mock implementation of Google Drive service intended to be used in e2e tests.
  */
 export class GoogleMock {
-    files: Record<string, any> = {};
     nextResponse: Record<string, any>[] = [];
+    files: Record<string, File> = {};
     // store requests for assertions in tests
     requests: string[] = [];
     app?: Express;
@@ -154,6 +154,12 @@ export class GoogleMock {
             });
         });
 
+        app.get('/drive/api/v3/reference/files/list', express.json(), (_req, res) => {
+            res.json({
+                files: Object.keys(this.files),
+            });
+        });
+
         app.get('/drive/v3/about', express.json(), (_req, res) => {
             console.log('[mockGoogleDrive]: about');
             res.send({

packages/suite-web/e2e/cypress.config.ts

@@ -78,7 +78,7 @@ export default defineConfig({
                 addMatchImageSnapshotPlugin(on, config);
             });
             on('task', {
-                metadataStartProvider: async provider => {
+                metadataStartProvider: async (provider: 'dropbox' | 'google') => {
                     switch (provider) {
                         case 'dropbox':
                             await mocked.dropbox.start();
@@ -141,6 +141,18 @@ export default defineConfig({
                             throw new Error('not a valid case');
                     }
                 },
+                metadataGetFilesList: ({ provider }) => {
+                    switch (provider) {
+                        case 'dropbox':
+                            return Object.keys(mocked.dropbox.files).map(name =>
+                                name.replace('/apps/trezor/', ''),
+                            );
+                        case 'google':
+                            return Object.keys(mocked.google.files);
+                        default:
+                            throw new Error('not a valid case');
+                    }
+                },
                 startMockedBridge: async har => {
                     await mocked.bridge.start(har);
                     return null;

packages/suite-web/e2e/support/utils/shortcuts.ts

@@ -58,8 +58,6 @@ export const passThroughBackupShamir = (shares: number, threshold: number) => {
 };
 
 export const passThroughInitMetadata = (provider: 'dropbox' | 'google') => {
-    cy.getConfirmActionOnDeviceModal();
-    cy.task('pressYes');
     cy.getTestElement(`@modal/metadata-provider/${provider}-button`).click();
     cy.getTestElement('@modal/metadata-provider').should('not.exist');
 };

packages/suite-web/e2e/tests/metadata/dropbox-api-errors.test.ts

@@ -18,14 +18,14 @@ describe('Dropbox api errors', () => {
         // prepare some initial files
         cy.task('metadataSetFileContent', {
             provider: 'dropbox',
-            file: '/f7acc942eeb83921892a95085e409b3e6b5325db6400ae5d8de523a305291dca.mtdt',
+            file: '/b9b5e1fd2800d4dc68e2f4e775fd819f4da3fb9e1bcc2cacd7f04fa543eac8a0_v2.mtdt',
             content: {
                 version: '1.0.0',
                 accountLabel: 'already existing label',
                 outputLabels: {},
                 addressLabels: {},
             },
-            aesKey: 'c785ef250807166bffc141960c525df97647fcc1bca57f6892ca3742ba86ed8d',
+            aesKey: '998daf71f3fbc486076f0ee8d5737a61b82bceacb0ec69100cbe4d45cd79676a',
         });
         cy.prefixedVisit('/', {
             onBeforeLoad: (win: Window) => {
@@ -80,14 +80,14 @@ describe('Dropbox api errors', () => {
         // prepare some initial files
         cy.task('metadataSetFileContent', {
             provider: 'dropbox',
-            file: '/f7acc942eeb83921892a95085e409b3e6b5325db6400ae5d8de523a305291dca.mtdt',
+            file: '/b9b5e1fd2800d4dc68e2f4e775fd819f4da3fb9e1bcc2cacd7f04fa543eac8a0_v2.mtdt',
             content: {
                 version: '1.0.0',
                 accountLabel: 'already existing label',
                 outputLabels: {},
                 addressLabels: {},
             },
-            aesKey: 'c785ef250807166bffc141960c525df97647fcc1bca57f6892ca3742ba86ed8d',
+            aesKey: '998daf71f3fbc486076f0ee8d5737a61b82bceacb0ec69100cbe4d45cd79676a',
         });
         cy.prefixedVisit('/', {
             onBeforeLoad: (win: Window) => {
@@ -100,32 +100,11 @@ describe('Dropbox api errors', () => {
         cy.discoveryShouldFinish();
 
         cy.getTestElement('@suite/menu/settings').click();
+
         cy.getTestElement('@settings/metadata-switch').click({ force: true });
 
         cy.passThroughInitMetadata('dropbox');
-
-        // this request is not retried
-        cy.task('metadataSetNextResponse', {
-            provider: 'dropbox',
-            status: 200,
-            body: {
-                name: {
-                    given_name: 'dog',
-                    surname: 'cat',
-                    familiar_name: 'kitty-dog',
-                    display_name: 'dog-cat',
-                    abbreviated_name: 'DC',
-                },
-                email: 'some@mail.com',
-                email_verified: true,
-                profile_photo_url: 'foo',
-                disabled: false,
-                country: 'CZ',
-                locale: 'en',
-                referral_link: 'foo',
-                is_paired: false,
-            },
-        });
+        cy.getTestElement('@settings/metadata/disconnect-provider-button');
 
         // this one is -> simulate rate limitted scenario
         cy.task('metadataSetNextResponse', {
@@ -139,6 +118,7 @@ describe('Dropbox api errors', () => {
         cy.getTestElement('@suite/menu/wallet-index').click();
 
         cy.getTestElement("@metadata/accountLabel/m/84'/0'/0'").click({ force: true });
+
         cy.getTestElement("@metadata/accountLabel/m/84'/0'/0'/edit-label-button").click({
             force: true,
         });
@@ -156,15 +136,15 @@ describe('Dropbox api errors', () => {
         // prepare some initial files
         cy.task('metadataSetFileContent', {
             provider: 'dropbox',
-            file: '/f7acc942eeb83921892a95085e409b3e6b5325db6400ae5d8de523a305291dca.mtdt',
+            file: '/b9b5e1fd2800d4dc68e2f4e775fd819f4da3fb9e1bcc2cacd7f04fa543eac8a0_v2.mtdt',
             content: {
                 version: '1.0.0',
                 accountLabel: 'already existing label',
                 // note: outputLabels and addressLabels are missing. this can happen in 2 situations:
                 // 1] user manually changed the files (very unlikely);
                 // 2] we screwed app data saving or reading
             },
-            aesKey: 'c785ef250807166bffc141960c525df97647fcc1bca57f6892ca3742ba86ed8d',
+            aesKey: '998daf71f3fbc486076f0ee8d5737a61b82bceacb0ec69100cbe4d45cd79676a',
         });
         cy.prefixedVisit('/', {
             onBeforeLoad: (win: Window) => {
@@ -180,6 +160,7 @@ describe('Dropbox api errors', () => {
         cy.getTestElement('@settings/metadata-switch').click({ force: true });
 
         cy.passThroughInitMetadata('dropbox');
+        cy.getTestElement('@settings/metadata/disconnect-provider-button');
 
         // just enter some label, this indicates that app did not crash
         cy.getTestElement('@suite/menu/wallet-index').click();

packages/suite-web/e2e/tests/metadata/interval-fetching.test.ts

@@ -9,13 +9,13 @@ const fixtures = [
     {
         provider: 'google',
         desc: 'does NOT watch files over time',
-        file: 'f7acc942eeb83921892a95085e409b3e6b5325db6400ae5d8de523a305291dca.mtdt',
+        file: 'b9b5e1fd2800d4dc68e2f4e775fd819f4da3fb9e1bcc2cacd7f04fa543eac8a0_v2.mtdt',
         content: 'already existing label',
     },
     {
         provider: 'dropbox',
         desc: 'does watch files over time',
-        file: '/f7acc942eeb83921892a95085e409b3e6b5325db6400ae5d8de523a305291dca.mtdt',
+        file: '/b9b5e1fd2800d4dc68e2f4e775fd819f4da3fb9e1bcc2cacd7f04fa543eac8a0_v2.mtdt',
         content: 'label from another window',
     },
 ] as const;
@@ -44,7 +44,7 @@ describe('Metadata - suite is watching cloud provider and syncs periodically', (
                     outputLabels: {},
                     addressLabels: {},
                 },
-                aesKey: 'c785ef250807166bffc141960c525df97647fcc1bca57f6892ca3742ba86ed8d',
+                aesKey: '998daf71f3fbc486076f0ee8d5737a61b82bceacb0ec69100cbe4d45cd79676a',
             });
             cy.prefixedVisit('/', {
                 onBeforeLoad: win => {
@@ -81,7 +81,7 @@ describe('Metadata - suite is watching cloud provider and syncs periodically', (
                     outputLabels: {},
                     addressLabels: {},
                 },
-                aesKey: 'c785ef250807166bffc141960c525df97647fcc1bca57f6892ca3742ba86ed8d',
+                aesKey: '998daf71f3fbc486076f0ee8d5737a61b82bceacb0ec69100cbe4d45cd79676a',
             });
 
             // and this does the time travel to trigger fetch