mirror of
https://github.com/usebruno/bruno.git
synced 2026-07-09 06:55:03 +00:00
14532b48a6
* feat(phase-1): allow user to customize keybindings * fix: necessary changes for customizied keybindings to work * fix: updated hotkeys provider * fix: test cases for edit keybindings in preferences * fix: removed old keyboard shortcuts test cases * fix: resolved coderabbit coments * fix: fixed move tabs test cases * feat: provided customized keybindings shorcut for codemirror instacnces * fix: handle closetabs/closeAllTabs in RequestTab/index.js for better consitency * fix: resolved comments * fix: resolved zoom issues * fix: revert codemirror instacnces * fix: handle codemirror instances shortcut in .Pass * feat: integrate shorcut keys with codemirror instacneces * fix: ui updates * fix: updated shortcuts * fix: test cases * chore: revert `alt-enter` keybind * chore: allow jest to replace esm spec in store * chore: lint whitespace fix --------- Co-authored-by: shubh-bruno <shubh-bruno@shubh-bruno.local>
157 lines
7.4 KiB
TypeScript
157 lines
7.4 KiB
TypeScript
import { test, expect } from '../../../playwright';
|
|
import { closeAllCollections, createCollection } from '../../utils/page';
|
|
|
|
test.describe('Move tabs', () => {
|
|
const modifier = process.platform === 'darwin' ? 'Meta' : 'Control';
|
|
|
|
test.afterEach(async ({ page }) => {
|
|
// cleanup: close all collections
|
|
await closeAllCollections(page);
|
|
});
|
|
|
|
test('Verify tab move by drag and drop', async ({ page, createTmpDir }) => {
|
|
// Create a collection
|
|
await createCollection(page, 'source-collection-drag-drop', await createTmpDir('source-collection-drag-drop'));
|
|
|
|
// Create a folder in the collection
|
|
const sourceCollection = page.locator('.collection-name').filter({ hasText: 'source-collection-drag-drop' });
|
|
await sourceCollection.hover();
|
|
await sourceCollection.locator('.collection-actions .icon').click();
|
|
await page.locator('.dropdown-item').filter({ hasText: 'New Folder' }).click();
|
|
|
|
// Fill folder name in the modal
|
|
await expect(page.locator('#folder-name')).toBeVisible();
|
|
await page.locator('#folder-name').fill('test-folder');
|
|
await page.getByRole('button', { name: 'Create' }).click();
|
|
|
|
// Wait for the folder to be created and appear in the sidebar
|
|
await page.waitForTimeout(2000);
|
|
await expect(page.locator('.collection-item-name').filter({ hasText: 'test-folder' })).toBeVisible();
|
|
|
|
// Open the folder tab
|
|
await page.locator('.collection-item-name').filter({ hasText: 'test-folder' }).dblclick();
|
|
await page.waitForTimeout(500);
|
|
await expect(page.locator('.request-tab .tab-label').filter({ hasText: 'test-folder' })).toBeVisible();
|
|
|
|
// Add a request to the collection
|
|
await sourceCollection.hover();
|
|
await sourceCollection.locator('.collection-actions .icon').click();
|
|
await page.locator('.dropdown-item').filter({ hasText: 'New Request' }).click();
|
|
await page.getByPlaceholder('Request Name').fill('test-request');
|
|
await page.locator('#new-request-url .CodeMirror').click();
|
|
await page.locator('#new-request-url textarea').fill('https://echo.usebruno.com');
|
|
await page.getByRole('button', { name: 'Create' }).click();
|
|
|
|
// Wait for the request to be created
|
|
await page.waitForTimeout(1000);
|
|
await expect(page.locator('.collection-item-name').filter({ hasText: 'test-request' })).toBeVisible();
|
|
|
|
// Open the request tab
|
|
await page.locator('.collection-item-name').filter({ hasText: 'test-request' }).dblclick();
|
|
await page.waitForTimeout(500);
|
|
await expect(page.locator('.request-tab .tab-label').filter({ hasText: 'test-request' })).toBeVisible();
|
|
|
|
// Verify order of tabs before move
|
|
const tabs = page.locator('.request-tab .tab-label');
|
|
await expect(tabs.nth(0)).toHaveText('test-folder');
|
|
await expect(tabs.nth(1)).toHaveText('GETtest-request');
|
|
|
|
// Drag and drop the request tab before the folder tab
|
|
let source = page.locator('.request-tab .tab-label').filter({ hasText: 'test-request' });
|
|
let target = page.locator('.request-tab .tab-label').filter({ hasText: 'test-folder' });
|
|
let sourceBox = await source.boundingBox();
|
|
let targetBox = await target.boundingBox();
|
|
|
|
if (sourceBox && targetBox) {
|
|
await page.mouse.move(sourceBox.x + sourceBox.width / 2, sourceBox.y + sourceBox.height / 2);
|
|
await page.mouse.down();
|
|
await page.mouse.move(targetBox.x + targetBox.width / 2, targetBox.y + targetBox.height / 2, { steps: 5 });
|
|
await page.mouse.up();
|
|
}
|
|
|
|
// Verify order of tabs after drag and drop
|
|
await expect(tabs.nth(0)).toHaveText('GETtest-request');
|
|
await expect(tabs.nth(1)).toHaveText('test-folder');
|
|
|
|
// Drag and drop the request tab back to its original position
|
|
source = page.locator('.request-tab .tab-label').filter({ hasText: 'test-request' });
|
|
target = page.locator('.request-tab .tab-label').filter({ hasText: 'test-folder' });
|
|
sourceBox = await source.boundingBox();
|
|
targetBox = await target.boundingBox();
|
|
|
|
if (sourceBox && targetBox) {
|
|
await page.mouse.move(sourceBox.x + sourceBox.width / 2, sourceBox.y + sourceBox.height / 2);
|
|
await page.mouse.down();
|
|
await page.mouse.move(targetBox.x + targetBox.width / 2, targetBox.y + targetBox.height + 10, { steps: 5 });
|
|
await page.mouse.up();
|
|
}
|
|
});
|
|
|
|
test('Verify tab move by keyboard shortcut', async ({ page, createTmpDir }) => {
|
|
// Create a collection
|
|
await createCollection(page, 'source-collection-keyboard-shortcut', await createTmpDir('source-collection-keyboard-shortcut'));
|
|
|
|
// Create a folder in the collection
|
|
const sourceCollection = page.locator('.collection-name').filter({ hasText: 'source-collection-keyboard-shortcut' });
|
|
await sourceCollection.hover();
|
|
await sourceCollection.locator('.collection-actions .icon').click();
|
|
await page.locator('.dropdown-item').filter({ hasText: 'New Folder' }).click();
|
|
|
|
// Fill folder name in the modal
|
|
await expect(page.locator('#folder-name')).toBeVisible();
|
|
await page.locator('#folder-name').fill('test-folder');
|
|
await page.getByRole('button', { name: 'Create' }).click();
|
|
|
|
// Wait for the folder to be created and appear in the sidebar
|
|
await page.waitForTimeout(2000);
|
|
await expect(page.locator('.collection-item-name').filter({ hasText: 'test-folder' })).toBeVisible();
|
|
|
|
// Open the folder tab
|
|
await page.locator('.collection-item-name').filter({ hasText: 'test-folder' }).dblclick();
|
|
await page.waitForTimeout(500);
|
|
await expect(page.locator('.request-tab .tab-label').filter({ hasText: 'test-folder' })).toBeVisible();
|
|
|
|
// Add a request to the collection
|
|
await sourceCollection.hover();
|
|
await sourceCollection.locator('.collection-actions .icon').click();
|
|
await page.locator('.dropdown-item').filter({ hasText: 'New Request' }).click();
|
|
await page.getByPlaceholder('Request Name').fill('test-request');
|
|
await page.locator('#new-request-url .CodeMirror').click();
|
|
await page.locator('#new-request-url textarea').fill('https://echo.usebruno.com');
|
|
await page.getByRole('button', { name: 'Create' }).click();
|
|
|
|
// Wait for the request to be created
|
|
await page.waitForTimeout(1000);
|
|
await expect(page.locator('.collection-item-name').filter({ hasText: 'test-request' })).toBeVisible();
|
|
|
|
// Open the request tab
|
|
await page.locator('.collection-item-name').filter({ hasText: 'test-request' }).dblclick();
|
|
await page.waitForTimeout(500);
|
|
await expect(page.locator('.request-tab .tab-label').filter({ hasText: 'test-request' })).toBeVisible();
|
|
|
|
// Verify order of tabs before move
|
|
const tabs = page.locator('.request-tab .tab-label');
|
|
await expect(tabs.nth(0)).toHaveText('test-folder');
|
|
await expect(tabs.nth(1)).toHaveText('GETtest-request');
|
|
|
|
// Move the request tab before the folder tab using keyboard shortcut
|
|
const source = page.locator('.request-tab .tab-label').filter({ hasText: 'test-request' });
|
|
await source.click();
|
|
await page.keyboard.press(`${modifier}+BracketLeft`);
|
|
await page.waitForTimeout(500);
|
|
|
|
// Verify order of tabs after move
|
|
await expect(tabs.nth(0)).toHaveText('GETtest-request');
|
|
await expect(tabs.nth(1)).toHaveText('test-folder');
|
|
|
|
// Move the request tab back to its original position using keyboard shortcut
|
|
await source.click();
|
|
await page.keyboard.press(`${modifier}+BracketRight`);
|
|
await page.waitForTimeout(500);
|
|
|
|
// Verify order of tabs after move
|
|
await expect(tabs.nth(0)).toHaveText('test-folder');
|
|
await expect(tabs.nth(1)).toHaveText('GETtest-request');
|
|
});
|
|
});
|