mirror of
https://github.com/usebruno/bruno.git
synced 2026-07-01 08:34:07 +00:00
feat(import): set yml as a default file format across all types of imports (#8363)
* feat(import): set yml as a default file formal accross all type of imports * addressed review comments * addressed review comments * set DEFAULT_COLLECTION_FORMAT as the default for collection format options
This commit is contained in:
57
tests/import/bulk-import/yml-as-default-file-format.spec.ts
Normal file
57
tests/import/bulk-import/yml-as-default-file-format.spec.ts
Normal file
@@ -0,0 +1,57 @@
|
||||
import { test, expect } from '../../../playwright';
|
||||
import * as path from 'path';
|
||||
import * as fs from 'fs';
|
||||
import { closeAllCollections, openBulkImportModal } from '../../utils/page';
|
||||
import { buildCommonLocators } from '../../utils/page/locators';
|
||||
|
||||
test.describe('Bulk Import default file format', () => {
|
||||
const testDataDir = path.join(__dirname, '../test-data');
|
||||
const filesToImport = [
|
||||
path.join(testDataDir, 'sample-postman.json'),
|
||||
path.join(testDataDir, 'sample-insomnia.json')
|
||||
];
|
||||
|
||||
test.afterEach(async ({ page }) => {
|
||||
await closeAllCollections(page);
|
||||
});
|
||||
|
||||
test('Bulk import defaults to OpenCollection (YAML) and writes opencollection.yml collections', async ({ page, createTmpDir }) => {
|
||||
const locators = buildCommonLocators(page);
|
||||
const importDir = await createTmpDir('bulk-import-default-format');
|
||||
|
||||
await test.step('Open the bulk import modal and verify the File Format defaults to OpenCollection (YAML)', async () => {
|
||||
await openBulkImportModal(page, filesToImport);
|
||||
|
||||
const formatSelect = locators.import.bulkFormatSelect();
|
||||
await expect(formatSelect).toBeVisible();
|
||||
await expect(formatSelect).toHaveValue('yml');
|
||||
await expect(formatSelect.locator('option')).toHaveText(['OpenCollection (YAML)', 'BRU Format (.bru)']);
|
||||
});
|
||||
|
||||
await test.step('Set the location, Click Import, then close the modal', async () => {
|
||||
await locators.import.bulkLocationInput().fill(importDir);
|
||||
|
||||
await expect(locators.import.bulkSubmitButton()).toHaveText('Import');
|
||||
await locators.import.bulkSubmitButton().click();
|
||||
|
||||
await expect(locators.import.bulkSubmitButton()).toHaveText('Close');
|
||||
await locators.import.bulkSubmitButton().click();
|
||||
await expect(locators.import.bulkModal()).toBeHidden();
|
||||
});
|
||||
|
||||
await test.step('Verify each collection is written as opencollection.yml, not bruno.json', async () => {
|
||||
const collectionDirs = fs
|
||||
.readdirSync(importDir, { withFileTypes: true })
|
||||
.filter((entry) => entry.isDirectory())
|
||||
.map((entry) => path.join(importDir, entry.name));
|
||||
|
||||
expect(collectionDirs.length).toBeGreaterThan(0);
|
||||
|
||||
for (const dir of collectionDirs) {
|
||||
const files = fs.readdirSync(dir);
|
||||
expect(files).toContain('opencollection.yml');
|
||||
expect(files).not.toContain('bruno.json');
|
||||
}
|
||||
});
|
||||
});
|
||||
});
|
||||
@@ -524,6 +524,26 @@ const importCollection = async (
|
||||
});
|
||||
};
|
||||
|
||||
/**
|
||||
* Open the Bulk Import modal by importing multiple files at once.
|
||||
* Selecting more than one file routes the import flow to the Bulk Import modal
|
||||
* (instead of the single-collection location modal).
|
||||
* @param page - The page object
|
||||
* @param filePaths - Absolute paths of the files to import (must be 2 or more)
|
||||
*/
|
||||
const openBulkImportModal = async (page: Page, filePaths: string[]) => {
|
||||
await test.step('Open the Bulk Import modal', async () => {
|
||||
const locators = buildCommonLocators(page);
|
||||
|
||||
await locators.plusMenu.button().click();
|
||||
await locators.plusMenu.importCollection().click();
|
||||
await expect(locators.import.modal()).toBeVisible();
|
||||
|
||||
await locators.import.fileInput().setInputFiles(filePaths);
|
||||
await expect(locators.import.bulkModal()).toBeVisible();
|
||||
});
|
||||
};
|
||||
|
||||
/**
|
||||
* Remove a specific collection from the sidebar
|
||||
* @param page - The page object
|
||||
@@ -2220,6 +2240,7 @@ export {
|
||||
deleteRequest,
|
||||
deleteCollectionFromOverview,
|
||||
importCollection,
|
||||
openBulkImportModal,
|
||||
removeCollection,
|
||||
createFolder,
|
||||
openEnvironmentSelector,
|
||||
|
||||
@@ -240,6 +240,10 @@ export const buildCommonLocators = (page: Page) => ({
|
||||
locationModal: () => page.locator('[data-testid="import-collection-location-modal"]'),
|
||||
locationInput: () => page.locator('#collection-location'),
|
||||
fileInput: () => page.locator('input[type="file"]'),
|
||||
bulkModal: () => page.getByTestId('bulk-import-collection-location-modal'),
|
||||
bulkFormatSelect: () => page.getByTestId('bulk-import-collection-location-modal').getByTestId('bulk-import-collection-format-selector'),
|
||||
bulkLocationInput: () => page.getByTestId('bulk-import-collection-location-modal').getByTestId('bulk-import-collection-location-input'),
|
||||
bulkSubmitButton: () => page.getByTestId('bulk-import-collection-location-modal-submit-btn'),
|
||||
envOption: (name: string) => page.locator('.dropdown-item').getByText(name, { exact: true }),
|
||||
parsingError: () => page.getByTestId('import-error-message'),
|
||||
browseLink: (root?: Locator) => (root ?? page).getByTestId('import-collection-browse-link'),
|
||||
|
||||
Reference in New Issue
Block a user