Universal Insomnia/Git Sync for all files (documents/collections)

packages/insomnia-smoke-test/tests/prerelease/cookie-editor-interactions.test.ts

@@ -10,7 +10,7 @@ test.describe('Cookie editor', async () => {
     await page.getByRole('menuitem', { name: 'Import' }).click();
     await page.getByText('Clipboard').click();
     await page.getByRole('button', { name: 'Scan' }).click();
-    await page.getByRole('button', { name: 'Import' }).click();
+    await page.getByRole('dialog').getByRole('button', { name: 'Import' }).click();
     await page.getByText('Collectionsimplejust now').click();
   });
 

packages/insomnia-smoke-test/tests/prerelease/dashboard-interactions.test.ts

@@ -7,7 +7,8 @@ test.describe('Dashboard', async () => {
   test.slow(process.platform === 'darwin' || process.platform === 'win32', 'Slow app start on these platforms');
   test.describe('Projects', async () => {
     test('Can create, rename and delete new project', async ({ page }) => {
-      await expect(page.locator('.app')).toContainText('All Files (1)');
+      await expect(page.locator('.app')).toContainText('All Files (0)');
+      await expect(page.locator('.app')).not.toContainText('Git Sync');
       await expect(page.locator('.app')).not.toContainText('Setup Git Sync');
 
       // Create new project
@@ -41,14 +42,15 @@ test.describe('Dashboard', async () => {
       await expect(page.locator('.app')).toContainText('Insomnia');
       await expect(page.locator('.app')).not.toContainText('My Project123');
       await expect(page.locator('.app')).toContainText('New Document');
-      await expect(page.locator('.app')).toContainText('All Files (1)');
+      await expect(page.locator('.app')).toContainText('All Files (0)');
       await expect(page.locator('.app')).not.toContainText('Setup Git Sync');
     });
   });
   test.describe('Interactions', async () => { // Not sure about the name here
     // TODO(INS-2504) - we don't support importing multiple collections at this time
     test.skip('Can filter through multiple collections', async ({ app, page }) => {
-      await expect(page.locator('.app')).toContainText('All Files (1)');
+      await expect(page.locator('.app')).toContainText('All Files (0)');
+      await expect(page.locator('.app')).not.toContainText('Git Sync');
       await expect(page.locator('.app')).not.toContainText('Setup Git Sync');
 
       await page.getByRole('button', { name: 'Create' }).click();
@@ -57,7 +59,7 @@ test.describe('Dashboard', async () => {
       await page.getByRole('menuitem', { name: 'Import' }).click();
       await page.getByText('Clipboard').click();
       await page.getByRole('button', { name: 'Scan' }).click();
-      await page.getByRole('button', { name: 'Import' }).click();
+      await page.getByRole('dialog').getByRole('button', { name: 'Import' }).click();
       await page.getByText('CollectionSmoke testsjust now').click();
       // Check that 10 new workspaces are imported besides the default one
       const workspaceCards = page.locator('.card-badge');
@@ -85,18 +87,19 @@ test.describe('Dashboard', async () => {
     });
 
     test('Can create, rename and delete a document', async ({ page }) => {
-      await expect(page.locator('.app')).toContainText('All Files (1)');
+      await expect(page.locator('.app')).toContainText('All Files (0)');
+      await expect(page.locator('.app')).not.toContainText('Git Sync');
       await expect(page.locator('.app')).not.toContainText('Setup Git Sync');
 
       // Create new document
       await page.getByRole('button', { name: 'Create' }).click();
       await page.getByRole('menuitem', { name: 'Design Document' }).click();
       await page.locator('text=Create').nth(1).click();
 
-      // Return to dashboardawait expect(page.locator('.app')).toContainText('My Document');
+      await page.getByTestId('proj_default-project').getByRole('link', { name: 'Insomnia' }).click();
 
       // Rename document
-      await page.click('text=DocumentMy Documentjust now >> button');
+      await page.click('text=DocumentNew Documentjust now >> button');
       await page.getByRole('menuitem', { name: 'Rename' }).click();
       await page.locator('text=Rename DocumentName Rename >> input[type="text"]').fill('test123');
       await page.click('#root button:has-text("Rename")');
@@ -108,28 +111,29 @@ test.describe('Dashboard', async () => {
       await page.locator('input[name="name"]').fill('test123-duplicate');
       await page.click('[role="dialog"] button:has-text("Duplicate")');
 
-      // Return to dashboardawait expect(page.locator('.app')).toContainText('test123-duplicate');
+      await page.getByTestId('proj_default-project').getByRole('link', { name: 'Insomnia' }).click();
 
       const workspaceCards = page.locator('.card-badge');
-      await expect(workspaceCards).toHaveCount(3);
+      await expect(workspaceCards).toHaveCount(2);
 
       // Delete document
       await page.click('text=Documenttest123just now >> button');
       await page.getByRole('menuitem', { name: 'Delete' }).click();
       await page.locator('text=Yes').click();
-      await expect(workspaceCards).toHaveCount(2);
+      await expect(workspaceCards).toHaveCount(1);
     });
 
     test('Can create, rename and delete a collection', async ({ page }) => {
-      await expect(page.locator('.app')).toContainText('All Files (1)');
+      await expect(page.locator('.app')).toContainText('All Files (0)');
+      await expect(page.locator('.app')).not.toContainText('Git Sync');
       await expect(page.locator('.app')).not.toContainText('Setup Git Sync');
 
       // Create new collection
       await page.getByRole('button', { name: 'Create' }).click();
       await page.getByRole('menuitem', { name: 'Request Collection' }).click();
       await page.locator('text=Create').nth(1).click();
 
-      // Return to dashboardawait expect(page.locator('.app')).toContainText('My Collection');
+      await page.getByTestId('proj_default-project').getByRole('link', { name: 'Insomnia' }).click();
 
       // Rename collection
       await page.click('text=CollectionMy Collectionjust now >> button');
@@ -144,15 +148,15 @@ test.describe('Dashboard', async () => {
       await page.locator('input[name="name"]').fill('test123-duplicate');
       await page.click('[role="dialog"] button:has-text("Duplicate")');
 
-      // Return to dashboardawait expect(page.locator('.app')).toContainText('test123-duplicate');
+      await page.getByTestId('proj_default-project').getByRole('link', { name: 'Insomnia' }).click();
       const workspaceCards = page.locator('.card-badge');
-      await expect(workspaceCards).toHaveCount(3);
+      await expect(workspaceCards).toHaveCount(2);
 
       // Delete collection
       await page.click('text=Collectiontest123just now >> button');
       await page.getByRole('menuitem', { name: 'Delete' }).click();
       await page.locator('text=Yes').click();
-      await expect(workspaceCards).toHaveCount(2);
+      await expect(workspaceCards).toHaveCount(1);
     });
   });
 });

packages/insomnia-smoke-test/tests/prerelease/debug-sidebar-interactions.test.ts

@@ -12,7 +12,7 @@ test.describe('Debug-Sidebar', async () => {
     await page.getByRole('menuitem', { name: 'Import' }).click();
     await page.getByText('Clipboard').click();
     await page.getByRole('button', { name: 'Scan' }).click();
-    await page.getByRole('button', { name: 'Import' }).click();
+    await page.getByRole('dialog').getByRole('button', { name: 'Import' }).click();
     await page.getByText('Collectionsimplejust now').click();
   });
 
@@ -61,9 +61,9 @@ test.describe('Debug-Sidebar', async () => {
     });
 
     test('Open properties of the collection', async ({ page }) => {
-      await page.getByRole('button', { name: 'Untitled' }).click();
-      await page.getByRole('menuitem', { name: 'Document Settings' }).click();
-      await page.getByText('Document Settings').click();
+      await page.getByRole('button', { name: 'simple' }).click();
+      await page.getByRole('menuitem', { name: 'Collection Settings' }).click();
+      await page.getByText('Collection Settings').click();
     });
 
     test('Filter by request name', async ({ page }) => {

packages/insomnia-smoke-test/tests/prerelease/design-interactions.test.ts

@@ -14,8 +14,8 @@ test.describe('Design interactions', async () => {
     await page.getByRole('menuitem', { name: 'Import' }).click();
     await page.getByText('Clipboard').click();
     await page.getByRole('button', { name: 'Scan' }).click();
-    await page.getByRole('button', { name: 'Import' }).click();
-    await page.getByText('CollectionSmoke testsjust now').click();
+    await page.getByRole('dialog').getByRole('button', { name: 'Import' }).click();
+    await page.getByText('unit-test.yaml').click();
     // Switch to Test tab
     await page.click('a:has-text("Test")');
 

packages/insomnia-smoke-test/tests/prerelease/environment-editor-interactions.test.ts

@@ -10,8 +10,8 @@ test.describe('Environment Editor', async () => {
     await page.getByRole('menuitem', { name: 'Import' }).click();
     await page.getByText('Clipboard').click();
     await page.getByRole('button', { name: 'Scan' }).click();
-    await page.getByRole('button', { name: 'Import' }).click();
-    await page.getByText('CollectionSmoke testsjust now').click();
+    await page.getByRole('dialog').getByRole('button', { name: 'Import' }).click();
+    await page.getByText('Collectionenvironments').click();
   });
 
   test('create a new environment', async ({ page }) => {

packages/insomnia-smoke-test/tests/prerelease/git-sync-interactions.test.ts

@@ -13,7 +13,7 @@ test('Clone Repo with bad values', async ({ page }) => {
   await page.getByText('Author Email').fill('test');
   await page.getByText('Username').fill('test');
   await page.getByText('Authentication Token').fill('test');
-  await page.getByRole('button', { name: 'Clone' }).click();
+  await page.getByRole('dialog').getByRole('button', { name: 'Clone' }).click();
 
   // Basic check repository data is loaded
   // Design doc
@@ -50,31 +50,6 @@ test('Clone Repo with bad values', async ({ page }) => {
   await expect(page.locator('.app')).toContainText('Error Pushing Repository');
 });
 
-test('Clone Bitbucket Repo with bad values', async ({ page }) => {
-  await page.getByRole('button', { name: 'Create' }).click();
-  await page.getByRole('menuitem', { name: 'Git Clone' }).click();
-  await page.getByRole('tab', { name: 'Git' }).nth(2).click();
-
-  // Fill in Git Sync details and clone repository
-  await page.getByText('Git URI (https)').fill('https://bitbucket.org/atlassian/bitbucket-example-plugin.git');
-  await page.getByText('Author Name').fill('test');
-  await page.getByText('Author Email').fill('test');
-  await page.getByText('Username').fill('test');
-  await page.getByText('Authentication Token').fill('test');
-  await page.getByRole('button', { name: 'Clone' }).click();
-
-  // Create a branch and try to push with bad Git token
-  await page.getByRole('button', { name: 'master' }).click();
-  await page.getByRole('menuitem', { name: 'Branches' }).click();
-  await page.getByPlaceholder('testing-branch').fill('test123');
-  await page.getByRole('button', { name: '+ Create' }).click();
-  await page.getByRole('cell', { name: 'test123(current)' }).click();
-  await page.getByRole('button', { name: 'Done' }).click();
-  await page.getByRole('button', { name: 'test123' }).click();
-  await page.getByRole('menuitem', { name: 'Push' }).click();
-  await expect(page.locator('.app')).toContainText('Error Pushing Repository');
-});
-
 test('Clone Gitlab Repo with bad values', async ({ page }) => {
   await page.getByRole('button', { name: 'Create' }).click();
   await page.getByRole('menuitem', { name: 'Git Clone' }).click();
@@ -86,7 +61,7 @@ test('Clone Gitlab Repo with bad values', async ({ page }) => {
   await page.getByText('Author Email').fill('test');
   await page.getByText('Username').fill('test');
   await page.getByText('Authentication Token').fill('test');
-  await page.getByRole('button', { name: 'Clone' }).click();
+  await page.getByRole('dialog').getByRole('button', { name: 'Clone' }).click();
 
   // Create a branch and try to push with bad Git token
   await page.getByRole('button', { name: 'master' }).click();

packages/insomnia-smoke-test/tests/prerelease/grpc-interactions.test.ts

@@ -19,7 +19,7 @@ test.describe('gRPC interactions', () => {
     await page.getByRole('menuitem', { name: 'Import' }).click();
     await page.getByText('Clipboard').click();
     await page.getByRole('button', { name: 'Scan' }).click();
-    await page.getByRole('button', { name: 'Import' }).click();
+    await page.getByRole('dialog').getByRole('button', { name: 'Import' }).click();
     await page.getByText('CollectionPreRelease gRPCjust now').click();
     statusTag = page.locator('[data-testid="response-status-tag"]:visible');
     responseBody = page.locator('[data-testid="response-pane"] >> [data-testid="CodeEditor"]:visible', {

packages/insomnia-smoke-test/tests/prerelease/plugins-interactions.test.ts

@@ -18,8 +18,8 @@ test.describe('Plugins', async () => {
   });
 
   test('Check Declarative Config and Kong Kubernetes config', async ({ page }) => {
-    // Switch to design tab
-    await page.click('text=Design');
+    await page.getByRole('button', { name: 'New Document' }).click();
+    await page.getByRole('dialog').getByRole('button', { name: 'Create' }).click();
 
     // Set example OpenAPI spec
     await page.click('text=start from an example');

packages/insomnia-smoke-test/tests/prerelease/request-pane-tab.test.ts

@@ -1,5 +1,13 @@
 import { test } from '../../playwright/test';
 
+test.beforeEach(async ({ page }) => {
+  await page.getByRole('button', { name: 'New Collection' }).click();
+  await page.getByRole('dialog').getByRole('button', { name: 'Create' }).click();
+
+  await page.getByRole('button', { name: ' ' }).press('ArrowDown');
+  await page.getByRole('menuitem', { name: 'HTTP Request' }).press('Enter');
+});
+
 test('Select body dropdown', async ({ page }) => {
   await page.getByRole('button', { name: 'Body' }).click();
   await page.getByRole('menuitem', { name: 'JSON' }).click();

packages/insomnia-smoke-test/tests/smoke/git-sync.test.ts

@@ -3,6 +3,7 @@ import { test } from '../../playwright/test';
 test('Sign in with GitHub', async ({ app, page }) => {
   await page.getByRole('button', { name: 'New Document' }).click();
   await page.getByRole('dialog').getByRole('button', { name: 'Create' }).click();
+  await page.getByRole('button', { name: 'Git Sync' }).click();
   await page.getByRole('button', { name: 'Setup Git Sync' }).click();
 
   await page.getByRole('tab', { name: 'Github' }).click();

packages/insomnia-smoke-test/tests/smoke/oauth-gitlab.test.ts

@@ -3,6 +3,7 @@ import { test } from '../../playwright/test';
 test('Sign in with Gitlab', async ({ app, page }) => {
   await page.getByRole('button', { name: 'New Document' }).click();
   await page.getByRole('dialog').getByRole('button', { name: 'Create' }).click();
+  await page.getByRole('button', { name: 'Git Sync' }).click();
   await page.getByRole('button', { name: 'Setup Git Sync' }).click();
   await page.getByRole('tab', { name: 'GitLab' }).click();
 

packages/insomnia/src/models/api-spec.ts

@@ -10,7 +10,7 @@ export const prefix = 'spc';
 
 export const canDuplicate = true;
 
-export const canSync = false;
+export const canSync = true;
 
 export interface BaseApiSpec {
   fileName: string;

packages/insomnia/src/sync/vcs/__tests__/initialize-backend-project.test.ts

@@ -9,24 +9,6 @@ import { VCS } from '../vcs';
 describe('initialize-backend-project', () => {
   beforeEach(globalBeforeEach);
 
-  describe('initializeLocalBackendProjectAndMarkForSync()', () => {
-    it('should do nothing if not request collection', async () => {
-      // Arrange
-      const workspace = await models.workspace.create({ scope: 'design' });
-      const vcs = new VCS(new MemoryDriver());
-      const switchAndCreateBackendProjectIfNotExistSpy = jest.spyOn(vcs, 'switchAndCreateBackendProjectIfNotExist');
-
-      // Act
-      await initializeLocalBackendProjectAndMarkForSync({ workspace, vcs });
-
-      // Assert
-      expect(switchAndCreateBackendProjectIfNotExistSpy).not.toHaveBeenCalled();
-      // const workspaceMeta = await models.workspaceMeta.getByParentId(workspace._id);
-      // expect(workspaceMeta?.pushSnapshotOnInitialize).toBe(false);
-      switchAndCreateBackendProjectIfNotExistSpy.mockClear();
-    });
-  });
-
   describe('pushSnapshotOnInitialize()', () => {
     const vcs = new VCS(new MemoryDriver());
 

packages/insomnia/src/sync/vcs/initialize-backend-project.ts

@@ -2,18 +2,13 @@ import { database } from '../../common/database';
 import * as models from '../../models';
 import { getStatusCandidates } from '../../models/helpers/get-status-candidates';
 import { Project } from '../../models/project';
-import { isCollection, Workspace } from '../../models/workspace';
+import { Workspace } from '../../models/workspace';
 import { WorkspaceMeta } from '../../models/workspace-meta';
 import { VCS } from './vcs';
 
 const blankStage = {};
 
 export const initializeLocalBackendProjectAndMarkForSync = async ({ vcs, workspace }: { vcs: VCS; workspace: Workspace }) => {
-  if (!isCollection(workspace)) {
-    // Don't initialize and mark for sync unless we're in a collection
-    return;
-  }
-
   // Create local project
   await vcs.switchAndCreateBackendProjectIfNotExist(workspace._id, workspace.name);
 

packages/insomnia/src/sync/vcs/migrate-collections.ts

@@ -1,6 +1,6 @@
 import { isLoggedIn } from '../../account/session';
-import { asyncFilter } from '../../common/async-array-helpers';
 import { database } from '../../common/database';
+import { isNotNullOrUndefined } from '../../common/misc';
 import * as models from '../../models';
 import { isRemoteProject, RemoteProject } from '../../models/project';
 import {  isCollection, Workspace } from '../../models/workspace';
@@ -36,7 +36,7 @@ export const migrateCollectionsIntoRemoteProject = async (vcs: VCS) => {
   const isNotInRemoteProject = (collection: Workspace) => !Boolean(remoteProjects.find(project => project._id === collection.parentId));
   const hasLocalProject = (collection: Workspace) => vcs.hasBackendProjectForRootDocument(collection._id);
 
-  const needsMigration = await asyncFilter(collections, async coll => await hasLocalProject(coll) && isNotInRemoteProject(coll));
+  const needsMigration = (await Promise.all(collections.map(async coll => await hasLocalProject(coll) && isNotInRemoteProject(coll) ? coll : null))).filter(isNotNullOrUndefined);
 
   // If nothing to migrate, exit
   if (!needsMigration.length) {