mirror of
https://github.com/usebruno/bruno.git
synced 2026-06-27 06:34:06 +00:00
* feat(variables): add variable persistence with scripting feat(collections): implement script-driven update for collection variables, ensuring direct root modification and draft synchronization feat(collections): enhance script variable management with baseline tracking and draft preservation * feat(variables): add runtime variable updates and optimize disk writes by implementing dirty flags fix(collections): handle errors during environment persistence in script execution feat(collections): implement baseline clearing for script execution and optimize variable update handling feat(tests): add default persistence tests for environment variables and update runtime variable handling refactor(collections): streamline variable update handling and improve draft management by removing redundant comments and optimizing code clarity test(collection-vars): add verification for draft edits and script variable visibility in collection settings UI refactor(collection-vars): update header value selection logic for improved clarity and accuracy in draft isolation tests * feat(global-environments): enhance global environment updates to resolve stale active UIDs and improve persistence logic - Updated the `updateGlobalEnvironments` reducer to handle stale active UIDs by matching against environment names. - Improved the logic for setting global environments and active UIDs to ensure consistency after disk reloads. - Removed outdated tests related to persisted values in favor of more relevant assertions for environment variable handling. * feat(variables): enhance typed value handling and persistence in global and collection environments - Added tests to infer data types (number, boolean, object) when setting environment and collection variables. - Updated the logic to preserve existing data types when variables are not modified by scripts. - Implemented dirty flags to track changes in typed variables, ensuring accurate persistence across sessions. - Refactored related tests to verify the correct behavior of typed variables in various scenarios. * refactor(variables): streamline data type inference and enhance deletion methods - Removed redundant data type inference logic from global and collection variable updates to simplify the codebase. - Updated deletion methods in the Bru class to use Object.keys for improved resilience against user-defined properties. - Added tests to ensure deletion methods function correctly even when properties are shadowed. - Enhanced clarity in draft merge tests by standardizing keyboard shortcuts for selecting all text. * fix(tests): correct variable naming and improve environment panel interactions - Updated test cases to reflect the correct variable name 'wasSaved' instead of 'was-saved'. - Modified environment panel interaction to remove forced click, enhancing test reliability. - Added a utility function to close the environment panel in safe mode tests for better readability and maintainability. * feat(runtime): enhance variable management and cleanup logic - Introduced a new method to clear script-driven variable baselines for collections, ensuring no stale data leaks into new requests. - Updated the handling of runtime variables in the Bru class to track changes with a new dirty flag, improving state management. - Refactored the application of script environment variables to prevent direct mutations, ensuring immutability and cleaner state updates. - Enhanced the response handling in the script runtime to conditionally include runtime variables based on their dirty state. * feat(variables): improve request handling and state management for collections and environments - Enhanced event listeners to clear global environment baselines on both 'testrun-started' and 'request-queued' events, preventing stale data issues. - Updated global environment and collection variable update events to ignore stale updates from superseded requests, ensuring accurate state management. - Refactored the Bru class to optimize variable management, including checks for existing keys before updates and deletions, improving performance and reliability. - Introduced request UID tracking to maintain consistency across variable updates during concurrent requests. * refactor(collections): update action to clear script variable baselines - Replaced the dispatch of `_clearScriptGlobalEnvBaseline` with `clearScriptVariableBaselines` to improve clarity and maintainability in the Redux action handling for collections. * feat(environments): introduce getScriptModifiedKeys utility for improved variable management - Added a new utility function, `getScriptModifiedKeys`, to identify keys modified by scripts relative to a baseline, enhancing the handling of data types during variable updates. - Updated the application of script environment variables to prevent overwriting user-defined draft changes during no-op writes. - Refactored related logic in collections and global environments to utilize the new utility, ensuring accurate state management and improved clarity in the Redux slices. * refactor(global-environments): simplify active UID resolution logic in updateGlobalEnvironments reducer - Streamlined the logic for resolving the active global environment UID by consolidating conditions into a more concise format. - Removed outdated comments to enhance code clarity and maintainability. - Updated tests to ensure accurate resolution of active UIDs based on incoming environment data. * refactor(tests): remove outdated comments and streamline environment variable row expectations - Eliminated comments related to state sync and inference issues to enhance code clarity. - Adjusted expectations for environment variable row rendering in tests, focusing on relevant assertions. * feat(tests): add comprehensive tests for secret variable persistence in environments - Introduced new test cases to validate the preservation of secret variables when updated via scripts in both collection and global environments. - Implemented tests to ensure that secret values are encrypted before storage and can be correctly decrypted for subsequent requests. - Added fixtures and environment configurations for testing secret variable behavior in both bru and yml formats. - Enhanced utility functions for managing environment configurations and interactions within the test suite. * feat(tests): enhance environment variable tests and add global variable persistence - Updated MultiLineEditor and SingleLineEditor components to include data-testid for secret reveal toggle buttons, improving testability. - Introduced new tests for global environment variable persistence, ensuring non-secret variables survive app restarts and are correctly interpolated. - Added fixtures for workspace and collections to support the new global variable tests, enhancing the overall test coverage for environment management. - Refactored utility functions to streamline interactions with environment variables in tests. * refactor(collections): optimize environment and collection saving logic - Simplified the persistence logic for active environments by directly constructing the environment copy, reducing unnecessary cloning. - Updated the collection saving process to utilize the fresh collection state, ensuring accurate data is saved without drafts. - Enhanced error handling during the save operations to improve reliability and maintainability. * feat(tests): implement collection variable persistence tests - Added multiple test cases to validate the persistence of collection variables across app restarts, including typed values and multiple variable settings. - Created new fixtures for collection variables to support the tests, ensuring accurate simulation of variable management scenarios. - Enhanced the existing collection management logic to ensure that variables are correctly set and deleted as per the test requirements. * feat(tests): add tests for typed global environment variable persistence - Introduced a new test suite to validate the persistence of typed global environment variables across app restarts, ensuring correct data types are maintained. - Created a fixture for the test collection to simulate setting global variables with various data types, including number, boolean, object, and string. - Enhanced the test logic to verify that the environment file reflects the correct state before and after application restarts. * fix(tests): update request tab close interaction in variable persistence tests * fix(tests): improve hover interaction for collection actions in runner tests - Updated the hover logic for revealing collection actions to handle sidebar re-renders more reliably. - Replaced one-shot hover with a polling mechanism to ensure visibility of actions, enhancing test stability. * refactor(environments): streamline environment variable handling and remove ephemeral metadata logic - Simplified the comparison logic for environment variables by removing unnecessary ephemeral metadata handling. - Updated the saving process to directly use the environment variables without stripping metadata, enhancing clarity and maintainability. - Removed outdated comments and unused utility functions related to ephemeral variables, improving code cleanliness. * fix(ipc): update persistActiveEnvironment to handle requestUid for stale updates - Modified the persistActiveEnvironment function to accept a requestUid parameter, allowing for better management of stale updates. - Enhanced the logic to prevent disk writes for superseded requests, improving data integrity during environment persistence. * refactor(bru): remove unused envName variable in deleteAllEnvVars method - Eliminated the envName variable from the deleteAllEnvVars method, simplifying the logic for deleting environment variables. - Cleaned up the method by removing unnecessary checks related to the envName, enhancing code clarity and maintainability. * fix(bru): prevent deletion of internal __name__ variable in deleteEnvVar method - Added a check in the deleteEnvVar method to silently ignore attempts to delete the internal __name__ variable, preserving its integrity. - Updated tests to verify that the __name__ variable remains unchanged when deleteEnvVar is called with this key. - Enhanced runtime tests to ensure compatibility with QuickJS by confirming that environment variables set with persist options are handled correctly. * feat(tests): add legacy support test for environment variable persistence - Introduced a new test suite to validate that the legacy argument for setting environment variables with persistence is still functional in version 4. - Created a fixture to simulate the legacy syntax, ensuring that the variable is correctly persisted on disk without errors. - Enhanced integration testing to confirm that the legacy behavior aligns with the current implementation, maintaining backward compatibility. * test(tests): enhance legacy environment variable persistence tests for safe and developer modes - Updated the test suite for `bru.setEnvVar` to verify that the legacy persist flag is correctly handled in both safe and developer modes. - Introduced a helper function to streamline the verification process and ensure consistent behavior across different execution contexts. - Adjusted the test logic to reset the environment state between mode switches, maintaining test integrity. - Improved hover interaction in multiple persistent variable tests to ensure reliable visibility of actions during execution. * fix(EnvironmentVariablesTable): correct change detection logic for environment variables - Updated the logic for determining changes in environment variables to compare active current and saved values instead of previously used variablesToSave and savedValues. - This change ensures accurate detection of modifications before saving, improving user feedback when no changes are present. * test(tests): enhance secret variable persistence tests for environment configurations - Updated the test suites for `bru.setEnvVar` and `bru.setGlobalEnvVar` to include interactions with the secrets tab, ensuring visibility of secret variables during various states of the environment. - Added checks to confirm that the eye toggle functionality correctly reveals the values of secret variables after setting and overwriting them. - Improved test coverage for secret variable persistence, validating that the expected values are displayed in both collection and global environment contexts.
261 lines
11 KiB
TypeScript
261 lines
11 KiB
TypeScript
import { Page, expect, test } from '../../../playwright';
|
|
import { buildSandboxLocators } from './locators';
|
|
|
|
/**
|
|
* Builds locators for the runner results view
|
|
* @param page - The Playwright page object
|
|
* @returns Object with locators for runner elements
|
|
*/
|
|
export const buildRunnerLocators = (page: Page) => ({
|
|
allButton: () => page.locator('button').filter({ hasText: /^All/ }),
|
|
passedButton: () => page.locator('button').filter({ hasText: /^Passed/ }),
|
|
failedButton: () => page.locator('button').filter({ hasText: /^Failed/ }),
|
|
skippedButton: () => page.locator('button').filter({ hasText: /^Skipped/ }),
|
|
resetButton: () => page.getByRole('button', { name: 'Reset' }),
|
|
runCollectionButton: () => page.getByTestId('runner-run-button'),
|
|
runAgainButton: () => page.getByRole('button', { name: 'Run Again' }),
|
|
configPanel: () => page.getByTestId('runner-config-panel'),
|
|
configCounter: () => page.getByTestId('runner-config-counter'),
|
|
selectAllButton: () => page.getByTestId('runner-select-all'),
|
|
configResetButton: () => page.getByTestId('runner-config-reset'),
|
|
requestItems: () => page.getByTestId('runner-request-item'),
|
|
delayInput: () => page.getByTestId('runner-delay-input')
|
|
});
|
|
|
|
/**
|
|
* Reads test result counts from the filter buttons in the runner results view
|
|
* @param page - The Playwright page object
|
|
* @returns An object with totalRequests, passed, failed, and skipped counts
|
|
*/
|
|
export const getRunnerResultCounts = async (page: Page) => {
|
|
const locators = buildRunnerLocators(page);
|
|
|
|
const totalRequests = parseInt(await locators.allButton().locator('span').innerText());
|
|
const passed = parseInt(await locators.passedButton().locator('span').innerText());
|
|
const failed = parseInt(await locators.failedButton().locator('span').innerText());
|
|
const skipped = parseInt(await locators.skippedButton().locator('span').innerText());
|
|
|
|
return { totalRequests, passed, failed, skipped };
|
|
};
|
|
|
|
/**
|
|
* Opens the runner tab for a collection without starting a run
|
|
* @param page - The Playwright page object
|
|
* @param collectionName - The name of the collection to open the runner for
|
|
* @returns void
|
|
*/
|
|
export const openRunnerTab = async (page: Page, collectionName: string) => {
|
|
await test.step(`Open runner tab for "${collectionName}"`, async () => {
|
|
const collectionContainer = page.getByTestId('collections').locator('.collection-name').filter({ hasText: collectionName });
|
|
await collectionContainer.waitFor({ state: 'visible' });
|
|
|
|
// Re-hover on each poll: CSS `:hover` reveals `.collection-actions`, but sidebar
|
|
// re-renders can shift the row out from under a one-shot hover().
|
|
const actionsContainer = collectionContainer.locator('.collection-actions');
|
|
await expect(async () => {
|
|
await collectionContainer.hover();
|
|
await expect(actionsContainer).toBeVisible({ timeout: 1000 });
|
|
}).toPass({ timeout: 10000 });
|
|
|
|
const icon = actionsContainer.locator('.icon');
|
|
await icon.waitFor({ state: 'visible', timeout: 5000 });
|
|
await icon.click();
|
|
|
|
const runMenuItem = page.getByText('Run', { exact: true });
|
|
await runMenuItem.waitFor({ state: 'visible' });
|
|
await runMenuItem.click();
|
|
|
|
// Wait for the config panel to load
|
|
const locators = buildRunnerLocators(page);
|
|
await locators.configPanel().waitFor({ state: 'visible', timeout: 10000 });
|
|
});
|
|
};
|
|
|
|
/**
|
|
* Runs a collection by clicking the Run menu item and handling the runner tab
|
|
* Includes logic to reset existing results if present
|
|
* @param page - The Playwright page object
|
|
* @param collectionName - The name of the collection to run
|
|
* @returns void
|
|
*/
|
|
export const runCollection = async (page: Page, collectionName: string) => {
|
|
await test.step(`Run collection "${collectionName}"`, async () => {
|
|
// Ensure collection is visible and loaded (scope to sidebar)
|
|
const collectionContainer = page.getByTestId('collections').locator('.collection-name').filter({ hasText: collectionName });
|
|
await collectionContainer.waitFor({ state: 'visible' });
|
|
|
|
// Open collection actions menu - hover first to reveal the hidden actions button
|
|
// Re-hover on each poll: CSS `:hover` reveals `.collection-actions`, but sidebar
|
|
// re-renders can shift the row out from under a one-shot hover().
|
|
const actionsContainer = collectionContainer.locator('.collection-actions');
|
|
await expect(async () => {
|
|
await collectionContainer.hover();
|
|
await expect(actionsContainer).toBeVisible({ timeout: 1000 });
|
|
}).toPass({ timeout: 10000 });
|
|
|
|
const icon = actionsContainer.locator('.icon');
|
|
await icon.waitFor({ state: 'visible', timeout: 5000 });
|
|
await icon.click();
|
|
|
|
// Click Run menu item
|
|
const runMenuItem = page.getByText('Run', { exact: true });
|
|
await runMenuItem.waitFor({ state: 'visible' });
|
|
await runMenuItem.click();
|
|
|
|
// Handle runner tab - reset if needed, then run
|
|
const locators = buildRunnerLocators(page);
|
|
|
|
// Check if Reset button is visible (means there are existing results)
|
|
const resetVisible = await locators.resetButton().isVisible({ timeout: 1000 }).catch(() => false);
|
|
if (resetVisible) {
|
|
await locators.resetButton().click();
|
|
// Wait for the Run Collection button to become visible after reset
|
|
await locators.runCollectionButton().waitFor({ state: 'visible', timeout: 5000 });
|
|
}
|
|
|
|
// Now wait for and click Run Collection button
|
|
await locators.runCollectionButton().waitFor({ state: 'visible', timeout: 10000 });
|
|
await locators.runCollectionButton().click();
|
|
|
|
// Wait for the run to complete
|
|
await locators.runAgainButton().waitFor({ timeout: 2 * 60 * 1000 });
|
|
});
|
|
};
|
|
|
|
/**
|
|
* Runs a specific folder within a collection by navigating to it in the sidebar,
|
|
* opening its context menu, and clicking "Run" followed by "Recursive Run".
|
|
* @param page - The Playwright page object
|
|
* @param collectionName - The name of the collection containing the folder
|
|
* @param folderPath - Array of folder names forming the path (e.g. ['scripting', 'api', 'bru', 'cookies'])
|
|
*/
|
|
export const runFolder = async (page: Page, collectionName: string, folderPath: string[]) => {
|
|
await test.step(`Run folder "${folderPath.join('/')}" in "${collectionName}"`, async () => {
|
|
// Scope to the specific collection by its DOM id (collection-<name-kebab>)
|
|
const collectionId = `collection-${collectionName.replace(/\s+/g, '-').toLowerCase()}`;
|
|
const collectionContainer = page.locator(`#${collectionId}`);
|
|
await collectionContainer.waitFor({ state: 'visible', timeout: 5000 });
|
|
|
|
// Walk down the folder path, scoping each step to the previous folder's container.
|
|
// Each CollectionItem renders as a StyledWrapper div containing:
|
|
// - div.collection-item-name (the row with chevron, name, menu)
|
|
// - div (children container when expanded)
|
|
// We scope to the parent wrapper so the next folder lookup is unambiguous.
|
|
let scope = collectionContainer;
|
|
for (const folderName of folderPath) {
|
|
const row = scope.locator('.collection-item-name').filter({ hasText: folderName }).first();
|
|
await row.waitFor({ state: 'visible', timeout: 5000 });
|
|
|
|
// Click the chevron to expand (skip if already expanded)
|
|
const chevron = row.getByTestId('folder-chevron');
|
|
const isExpanded = await chevron.evaluate((el: HTMLElement) => el.classList.contains('rotate-90'));
|
|
if (!isExpanded) {
|
|
await chevron.click();
|
|
}
|
|
|
|
// Scope to this folder's wrapper (parent of the row) for the next iteration
|
|
scope = row.locator('..');
|
|
}
|
|
|
|
// The target folder row is the last one we found — hover to reveal menu
|
|
const targetRow = scope.locator('.collection-item-name').filter({ hasText: folderPath[folderPath.length - 1] }).first();
|
|
await targetRow.hover();
|
|
|
|
// Click the menu icon
|
|
const menuIcon = targetRow.locator('.menu-icon');
|
|
await menuIcon.waitFor({ state: 'visible', timeout: 5000 });
|
|
await menuIcon.click();
|
|
|
|
// Click "Run" in the dropdown
|
|
const runMenuItem = page.locator('.dropdown-item').filter({ hasText: 'Run' });
|
|
await runMenuItem.waitFor({ state: 'visible' });
|
|
await runMenuItem.click();
|
|
|
|
// In the RunCollectionItem modal, click "Recursive Run"
|
|
const recursiveRunButton = page.getByRole('button', { name: 'Recursive Run' });
|
|
await recursiveRunButton.waitFor({ state: 'visible', timeout: 5000 });
|
|
await recursiveRunButton.click();
|
|
|
|
// Wait for the run to complete
|
|
const runnerLocators = buildRunnerLocators(page);
|
|
await runnerLocators.runAgainButton().waitFor({ timeout: 2 * 60 * 1000 });
|
|
});
|
|
};
|
|
|
|
/**
|
|
* Sets up the JavaScript sandbox mode for a collection
|
|
* @param page - The Playwright page object
|
|
* @param collectionName - The name of the collection (can be title or text)
|
|
* @param mode - 'developer' or 'safe' mode
|
|
* @returns void
|
|
*/
|
|
export const setSandboxMode = async (page: Page, collectionName: string, mode: 'developer' | 'safe') => {
|
|
await test.step(`Set sandbox mode to "${mode}" for "${collectionName}"`, async () => {
|
|
const sandboxLocators = buildSandboxLocators(page);
|
|
|
|
// Click on the collection name in the sidebar
|
|
const sidebarCollection = page.getByTestId('collections').locator('#sidebar-collection-name').filter({ hasText: collectionName }).first();
|
|
await sidebarCollection.waitFor({ state: 'visible' });
|
|
await sidebarCollection.click();
|
|
|
|
// Check if there's already a mode selected - if so, we need to click the badge to open settings tab
|
|
const sandboxBadgeVisible = await sandboxLocators.sandboxModeSelector().isVisible().catch(() => false);
|
|
// If a badge exists, click it to open the security settings tab
|
|
if (sandboxBadgeVisible) {
|
|
await sandboxLocators.sandboxModeSelector().click();
|
|
|
|
// Wait for the security settings tab to be active
|
|
await sandboxLocators.jsSandboxHeading().waitFor({ state: 'visible', timeout: 10000 });
|
|
}
|
|
// If no badge exists, the modal should have appeared automatically (first time selection)
|
|
|
|
// Wait for security settings form to be visible - wait for either radio button
|
|
await Promise.race([
|
|
sandboxLocators.safeModeRadio().waitFor({ state: 'visible', timeout: 10000 }).catch(() => {}),
|
|
sandboxLocators.developerModeRadio().waitFor({ state: 'visible', timeout: 10000 }).catch(() => {})
|
|
]);
|
|
|
|
if (mode === 'developer') {
|
|
await sandboxLocators.developerModeRadio().waitFor({ state: 'visible', timeout: 5000 });
|
|
await sandboxLocators.developerModeRadio().click();
|
|
} else {
|
|
await sandboxLocators.safeModeRadio().waitFor({ state: 'visible', timeout: 5000 });
|
|
await sandboxLocators.safeModeRadio().click();
|
|
}
|
|
|
|
await page.keyboard.press('Escape');
|
|
});
|
|
};
|
|
|
|
/**
|
|
* Validates runner results against expected counts
|
|
* @param page - The Playwright page object
|
|
* @param expected - Expected counts
|
|
* @returns void
|
|
*/
|
|
export const validateRunnerResults = async (page: Page,
|
|
expected: {
|
|
totalRequests?: number;
|
|
passed?: number;
|
|
failed?: number;
|
|
skipped?: number;
|
|
}) => {
|
|
const { totalRequests, passed, failed, skipped } = await getRunnerResultCounts(page);
|
|
|
|
if (expected.totalRequests !== undefined) {
|
|
await expect(totalRequests).toBe(expected.totalRequests);
|
|
}
|
|
if (expected.passed !== undefined) {
|
|
await expect(passed).toBe(expected.passed);
|
|
}
|
|
if (expected.failed !== undefined) {
|
|
await expect(failed).toBe(expected.failed);
|
|
}
|
|
if (expected.skipped !== undefined) {
|
|
await expect(skipped).toBe(expected.skipped);
|
|
}
|
|
|
|
// Validate that passed + failed + skipped = totalRequests
|
|
await expect(passed).toBe(totalRequests - skipped - failed);
|
|
};
|