mirror of
https://github.com/usebruno/bruno.git
synced 2026-06-25 13:45:52 +00:00
e000e377d1
* feat: move import collection from git url and spec url from enterprise edition to opensource
* fix: corrected a typo
* test: add unit and e2e tests for import collection migration
* fix: guard against missing userAgentData platform in getOSName — Default platform to '' to prevent TypeError when navigator.userAgentData is unavailable (GitNotFoundModal/index.js)
fix: UID mismatch between status tracking and UI rendering in bulk import — Preserve synthetic file-${index} UID on converted collections so initialStatus, rename tracking, and the render loop all use the same key (BulkImportCollectionLocation/index.js)
fix: isConfirmDisabled returning non-boolean value — Changed .length checks to explicit comparisons (> 0, === 0) so the function always returns true/false (CloneGitRespository/index.js)
fix: missing ipcRenderer declaration in cloneGitRepository and scanForBrunoFiles — Added const { ipcRenderer } = window; to both actions to prevent ReferenceError at runtime (collections/actions.js)
fix: use strict equality in filterItemsInCollection — Changed == to === for item.name and item.type comparisons (importers/common.js)
fix: variable shadowing in transformItemsInCollection and hydrateSeqInCollection — Renamed forEach callback parameter from collection to col to avoid shadowing the outer parameter (importers/common.js)
fix: scanForBrunoFiles traversing node_modules and .git directories — Added exclusion for node_modules and .git to match getCollectionStats pattern, preventing app freezes on large repos (filesystem.js)
fix: diff hunk header using string character count instead of line count — Preserved prefixedLines array to compute lineCount before joining, so the @@ header has the correct line count (git.js)
fix: test locators not scoped to modal in bulk import e2e test — Changed page.getByTestId to bulkImportModal.getByTestId for grouping dropdown interactions (002-all-collection-types.spec.ts)
fix: missing afterEach cleanup in GitHub repository import test — Added closeAllCollections hook to match sibling test specs, replaced unused dotenv/config import (github-repository-import.spec.ts)
* fix: batch name tracking and git utility fixes
- Fix usedNamesInBatch tracking original name instead of final name, which
could produce duplicate environment names within the same batch
(BulkImportCollectionLocation/index.js)
- Remove unused lodash import (git.js)
- Add missing early return in fetchRemotes when gitRootPath is falsy,
preventing getSimpleGitInstanceForPath from running with undefined (git.js)
* fix: correct variable naming and state management in CloneGitRepository component
- Renamed `collectionpaths` to `collectionPaths` for consistency and clarity.
- Updated references throughout the component to use the corrected variable name.
- Removed error toast notification to streamline error handling during repository cloning.
57 lines
2.6 KiB
TypeScript
57 lines
2.6 KiB
TypeScript
import { test, expect } from '../../../playwright';
|
|
import * as path from 'path';
|
|
import { closeAllCollections } from '../../utils/page';
|
|
|
|
test.describe('Multiple Files Upload', () => {
|
|
const testDataDir = path.join(__dirname, '../test-data');
|
|
|
|
test.afterEach(async ({ page }) => {
|
|
// cleanup: close all collections
|
|
await closeAllCollections(page);
|
|
});
|
|
|
|
test('Multiple files can be uploaded together', async ({ page, createTmpDir }) => {
|
|
const postmanFile = path.join(testDataDir, 'sample-postman.json');
|
|
const insomniaFile = path.join(testDataDir, 'sample-insomnia.json');
|
|
|
|
await page.getByTestId('collections-header-add-menu').click();
|
|
await page.locator('.tippy-box .dropdown-item').filter({ hasText: 'Import collection' }).click();
|
|
|
|
// Wait for import collection modal to be ready
|
|
const importModal = page.getByRole('dialog');
|
|
await importModal.waitFor({ state: 'visible' });
|
|
await expect(importModal.locator('.bruno-modal-header-title')).toContainText('Import Collection');
|
|
|
|
await page.setInputFiles('input[type="file"]', [postmanFile, insomniaFile]);
|
|
|
|
// Wait for the loader to disappear
|
|
await page.locator('#import-collection-loader').waitFor({ state: 'hidden' });
|
|
|
|
// Verify that the Bulk Import modal is now displayed
|
|
const bulkImportModal = page.getByRole('dialog');
|
|
await expect(bulkImportModal.locator('.bruno-modal-header-title')).toContainText('Bulk Import');
|
|
|
|
// Check that the Collections count shows 2 collections in the Bulk Import modal
|
|
await expect(bulkImportModal.getByText('Collections (2)')).toBeVisible();
|
|
|
|
// Verify collection names are displayed
|
|
await expect(bulkImportModal.getByText('Sample Postman Collection')).toBeVisible();
|
|
await expect(bulkImportModal.getByText('Sample Insomnia Collection')).toBeVisible();
|
|
|
|
// Select a location and import
|
|
await page.locator('#collection-location').fill(await createTmpDir('multiple-files-test'));
|
|
await bulkImportModal.getByRole('button', { name: 'Import' }).click();
|
|
|
|
// Wait for import to complete (summary modal shows with "Close" button)
|
|
await expect(bulkImportModal.getByRole('button', { name: 'Close' })).toBeVisible();
|
|
|
|
// Close the summary modal
|
|
await bulkImportModal.getByRole('button', { name: 'Close' }).click();
|
|
await bulkImportModal.waitFor({ state: 'hidden' });
|
|
|
|
// Verify collections were imported successfully
|
|
await expect(page.locator('#sidebar-collection-name').getByText('Sample Postman Collection')).toBeVisible();
|
|
await expect(page.locator('#sidebar-collection-name').getByText('Sample Insomnia Collection')).toBeVisible();
|
|
});
|
|
});
|