mirror of
https://github.com/usebruno/bruno.git
synced 2026-06-28 07:04:10 +00:00
feat(variables): persist scripted variable changes by default + re-enable disabled scripting APIs (#8315)
* 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.
This commit is contained in:
@@ -635,6 +635,31 @@ const openEnvironmentSelector = async (page: Page, type: EnvironmentType = 'coll
|
||||
});
|
||||
};
|
||||
|
||||
/**
|
||||
* Open the configuration tab for the currently active environment (collection or global).
|
||||
* Combines opening the env selector dropdown + clicking the "configure" button + waiting
|
||||
* for the resulting env config tab to appear. Use this when the test needs to interact
|
||||
* with the env variable rows (read a value, toggle the secret eye, etc.).
|
||||
* @param page - The page object
|
||||
* @param type - The type of environment configuration tab to open
|
||||
*/
|
||||
const openEnvironmentConfigTab = async (page: Page, type: EnvironmentType = 'collection') => {
|
||||
await test.step(`Open ${type} environment configuration tab`, async () => {
|
||||
await openEnvironmentSelector(page, type);
|
||||
|
||||
const locators = buildCommonLocators(page);
|
||||
// `waitFor` + `dispatchEvent` keeps the click stable when the dropdown is mid-transition;
|
||||
// the menu item briefly intercepts pointer events during the open animation.
|
||||
await locators.environment.configureButton().waitFor({ state: 'visible' });
|
||||
await locators.environment.configureButton().dispatchEvent('click');
|
||||
|
||||
const envTab = type === 'global'
|
||||
? locators.environment.globalEnvTab()
|
||||
: locators.environment.collectionEnvTab();
|
||||
await expect(envTab).toBeVisible();
|
||||
});
|
||||
};
|
||||
|
||||
/**
|
||||
* Create a new environment
|
||||
* @param page - The page object
|
||||
@@ -2198,6 +2223,7 @@ export {
|
||||
removeCollection,
|
||||
createFolder,
|
||||
openEnvironmentSelector,
|
||||
openEnvironmentConfigTab,
|
||||
createEnvironment,
|
||||
addEnvironmentVariable,
|
||||
addEnvironmentVariables,
|
||||
|
||||
@@ -76,23 +76,44 @@ export const buildCommonLocators = (page: Page) => ({
|
||||
currentEnvironment: () => page.locator('.current-environment'),
|
||||
configureButton: () => page.locator('#configure-env'),
|
||||
saveButton: () => page.getByTestId('save-env'),
|
||||
varRow: (name: string) => page.locator(`[data-testid="env-var-row-${name}"]`),
|
||||
varRow: (name: string) => page.getByTestId(`env-var-row-${name}`),
|
||||
// Prefix match — keep as a CSS selector since getByTestId is exact-match only.
|
||||
varRows: () => page.locator('tbody tr[data-testid^="env-var-row-"]'),
|
||||
// Rows for `name` whose CodeMirror value matches `value`. Useful when two rows
|
||||
// share a name (e.g. enabled + disabled twins after a script write).
|
||||
varRowsByValue: (name: string, value: string | RegExp) =>
|
||||
page.getByTestId(`env-var-row-${name}`)
|
||||
.filter({ has: page.locator('.CodeMirror-line', { hasText: value }) }),
|
||||
// Each env-var row has an `enabled` and a `secret` checkbox; target the latter
|
||||
// by its `<index>.secret` name (the formik index is dynamic).
|
||||
varRowSecretCheckbox: (name: string) => page.locator(`[data-testid="env-var-row-${name}"]`).locator('input[name$=".secret"]'),
|
||||
varRowLine: (name: string) => page.locator(`[data-testid="env-var-row-${name}"] .CodeMirror-line`).first(),
|
||||
addVariableButton: () => page.locator('button[data-testid="add-variable"]'),
|
||||
varRowSecretCheckbox: (name: string) => page.getByTestId(`env-var-row-${name}`).locator('input[name$=".secret"]'),
|
||||
// Eye icon that masks/reveals a secret variable's value.
|
||||
varRowEyeToggle: (name: string) => page.getByTestId(`env-var-row-${name}`).getByTestId('secret-reveal-toggle'),
|
||||
varRowLine: (name: string) => page.getByTestId(`env-var-row-${name}`).locator('.CodeMirror-line').first(),
|
||||
addVariableButton: () => page.getByTestId('add-variable'),
|
||||
variableNameInput: (index: number) => page.locator(`input[name="${index}.name"]`),
|
||||
variableSecretCheckbox: (index: number) => page.locator(`input[name="${index}.secret"]`),
|
||||
variableRow: (index: number) => page.locator('tr').filter({ has: page.locator(`input[name="${index}.name"]`) }),
|
||||
variableRowByName: (name: string) => page.locator('tbody tr').filter({ has: page.locator(`input[value="${name}"]`) }),
|
||||
// Targets the `.CodeMirror` wrapper (not `.CodeMirror-line`) so single-line and
|
||||
// multi-line values (e.g. formatted JSON for @object vars) are both covered —
|
||||
// CodeMirror renders each visual line as a separate `.CodeMirror-line`, so
|
||||
// matching on the wrapper is the only way to get the full concatenated text.
|
||||
variableValue: (name: string) => page.locator('tbody tr').filter({ has: page.locator(`input[value="${name}"]`) }).locator('.CodeMirror').first(),
|
||||
createEnvButton: () => page.locator('button[id="create-env"]'),
|
||||
envNameInput: () => page.locator('input[name="name"]'),
|
||||
// Variables and secrets each live on their own tab in the environment editor.
|
||||
variablesTab: () => page.getByTestId('responsive-tab-variables'),
|
||||
secretsTab: () => page.getByTestId('responsive-tab-secrets'),
|
||||
saveTab: () => page.getByTestId('save-env'),
|
||||
saveAll: () => page.getByTestId('save-all-env')
|
||||
saveAll: () => page.getByTestId('save-all-env'),
|
||||
collectionEnvTab: () => page.locator('.request-tab').filter({ hasText: /^Environments$/ }),
|
||||
globalEnvTab: () => page.locator('.request-tab').filter({ hasText: /^Global Environments$/ }),
|
||||
unsavedModal: {
|
||||
closeWithoutSave: () => page.getByTestId('env-unsaved-close-without-save'),
|
||||
cancel: () => page.getByTestId('env-unsaved-cancel'),
|
||||
saveAndClose: () => page.getByTestId('env-unsaved-save-and-close')
|
||||
}
|
||||
},
|
||||
codeMirror: {
|
||||
byTestId: (testId: string) => page.getByTestId(testId).locator('.CodeMirror').first()
|
||||
|
||||
@@ -49,9 +49,13 @@ export const openRunnerTab = async (page: Page, collectionName: string) => {
|
||||
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 collectionContainer.hover();
|
||||
await actionsContainer.waitFor({ state: 'visible' });
|
||||
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 });
|
||||
@@ -81,9 +85,13 @@ export const runCollection = async (page: Page, collectionName: string) => {
|
||||
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 collectionContainer.hover();
|
||||
await actionsContainer.waitFor({ state: 'visible' });
|
||||
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 });
|
||||
|
||||
Reference in New Issue
Block a user