aaron/mattermost-desktop
1
0
Fork 0
Code Issues Pull requests Actions 1 Packages Projects Releases Wiki Activity

[MM-44931] Allow zoom in/out when Shift is pressed (#2178)

Browse source 
* Add hidden menuitems for zoomIn zoomOut with shift

* Add e2e tests for zoom in/out with shift

* Fix e2e tests

* Add missing async

* Fix lint errors

* Put tests inside describes

* Fix lint errors

* Update e2e/specs/menu_bar/view_menu.test.js

Co-authored-by: Devin Binnie <52460000+devinbinnie@users.noreply.github.com>

* Update e2e/specs/menu_bar/view_menu.test.js

Co-authored-by: Devin Binnie <52460000+devinbinnie@users.noreply.github.com>

Co-authored-by: Devin Binnie <52460000+devinbinnie@users.noreply.github.com>
This commit is contained in:
Tasos Boulis 2022-06-30 21:14:47 +03:00 committed by GitHub
parent e674c5c28e
commit aa21179f8f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 95 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
e2e/specs/menu_bar/view_menu.test.js
View file

@ -20,6 +20,19 @@ async function setupPromise(window, id) {
return true;
}
function getZoomFactorOfServer(browserWindow, serverId) {
return browserWindow.evaluate(
(window, id) => window.getBrowserViews().find((view) => view.webContents.id === id).webContents.getZoomFactor(),
serverId,
);
}
function setZoomFactorOfServer(browserWindow, serverId, zoomFactor) {
return browserWindow.evaluate(
(window, {id, zoom}) => window.getBrowserViews().find((view) => view.webContents.id === id).webContents.setZoomFactor(zoom),
{id: serverId, zoom: zoomFactor},
);
}
describe('menu/view', function desc() {
this.timeout(30000);
@ -100,7 +113,6 @@ describe('menu/view', function desc() {
robot.keyTap('=', [env.cmdOrCtrl]);
await asyncSleep(1000);
console.log(firstServerId);
let zoomLevel = await browserWindow.evaluate((window, id) => window.getBrowserViews().find((view) => view.webContents.id === id).webContents.getZoomFactor(), firstServerId);
zoomLevel.should.be.greaterThan(1);
@ -110,7 +122,8 @@ describe('menu/view', function desc() {
zoomLevel.should.be.equal(1);
});
it('MM-T818 Zoom in from the menu bar', async () => {
describe('MM-T818 Zoom in from the menu bar', () => {
it('MM-T818 Zoom in when CmdOrCtrl+Plus is pressed', async () => {
const mainWindow = this.app.windows().find((window) => window.url().includes('index'));
const browserWindow = await this.app.browserWindow(mainWindow);
const loadingScreen = this.app.windows().find((window) => window.url().includes('loadingScreen'));
@ -126,7 +139,31 @@ describe('menu/view', function desc() {
zoomLevel.should.be.greaterThan(1);
});
it('MM-T819 Zoom out from the menu bar', async () => {
it('MM-T818_1 Zoom in when CmdOrCtrl+Shift+Plus is pressed', async () => {
const mainWindow = this.app.windows().find((window) => window.url().includes('index'));
const browserWindow = await this.app.browserWindow(mainWindow);
const loadingScreen = this.app.windows().find((window) => window.url().includes('loadingScreen'));
await loadingScreen.waitForSelector('.LoadingScreen', {state: 'hidden'});
const firstServer = this.serverMap[`${config.teams[0].name}___TAB_MESSAGING`].win;
const firstServerId = this.serverMap[`${config.teams[0].name}___TAB_MESSAGING`].webContentsId;
await env.loginToMattermost(firstServer);
await firstServer.waitForSelector('#searchBox');
// reset zoom
await setZoomFactorOfServer(browserWindow, firstServerId, 1);
await asyncSleep(1000);
const initialZoom = await getZoomFactorOfServer(browserWindow, firstServerId);
initialZoom.should.be.equal(1);
robot.keyTap('=', [env.cmdOrCtrl, 'shift']);
await asyncSleep(1000);
const zoomLevel = await getZoomFactorOfServer(browserWindow, firstServerId);
zoomLevel.should.be.greaterThan(1);
});
});
describe('MM-T818 Zoom out from the menu bar', () => {
it('MM-T819 Zoom out when CmdOrCtrl+Minus is pressed', async () => {
const mainWindow = this.app.windows().find((window) => window.url().includes('index'));
const browserWindow = await this.app.browserWindow(mainWindow);
const loadingScreen = this.app.windows().find((window) => window.url().includes('loadingScreen'));
@ -142,6 +179,29 @@ describe('menu/view', function desc() {
zoomLevel.should.be.lessThan(1);
});
it('MM-T819_1 Zoom out when CmdOrCtrl+Shift+Minus is pressed', async () => {
const mainWindow = this.app.windows().find((window) => window.url().includes('index'));
const browserWindow = await this.app.browserWindow(mainWindow);
const loadingScreen = this.app.windows().find((window) => window.url().includes('loadingScreen'));
await loadingScreen.waitForSelector('.LoadingScreen', {state: 'hidden'});
const firstServer = this.serverMap[`${config.teams[0].name}___TAB_MESSAGING`].win;
const firstServerId = this.serverMap[`${config.teams[0].name}___TAB_MESSAGING`].webContentsId;
await env.loginToMattermost(firstServer);
await firstServer.waitForSelector('#searchBox');
// reset zoom
await setZoomFactorOfServer(browserWindow, firstServerId, 1.0);
await asyncSleep(1000);
const initialZoom = await getZoomFactorOfServer(browserWindow, firstServerId);
initialZoom.should.be.equal(1);
robot.keyTap('-', [env.cmdOrCtrl, 'shift']);
await asyncSleep(1000);
const zoomLevel = await getZoomFactorOfServer(browserWindow, firstServerId);
zoomLevel.should.be.lessThan(1);
});
});
describe('Reload', () => {
let browserWindow;
let webContentsId;

8
src/main/menus/app.ts
View file

@ -131,9 +131,17 @@ export function createTemplate(config: Config, updateManager: UpdateManager) {
}, {
role: 'zoomIn',
accelerator: 'CmdOrCtrl+=',
}, {
role: 'zoomIn',
visible: false,
accelerator: 'CmdOrCtrl+Shift+=',
}, {
role: 'zoomOut',
accelerator: 'CmdOrCtrl+-',
}, {
role: 'zoomOut',
visible: false,
accelerator: 'CmdOrCtrl+Shift+-',
}, separatorItem, {
label: 'Developer Tools for Application Wrapper',
accelerator: (() => {