932ddafdb0
* [MM-19054] Added new server tab look and feel, still missing proper hover states and session expired icon * [MM-19055] Added window controls and removed border for macOS * [MM-19055] Add dark mode for macOS * [MM-19054] Added session expired icon * Test windows titlebar * Fixed the menu issue and added non-macOS dark mode * Blank commit * Fixed a lint issue * Fixed more lint issues * Fixed more issues * New tray icons * [MM-19603] Drag and drop tabs * Fixed some assets and fixed build output to include missing assets * Fixed a couple small issues * Only show tabs for only 1 server on Mac * Fixed some more tests * Fixed another test * Revert "Fixed another test" This reverts commit 36040294a71a68663d06996d71eecc5ed23d7014. * Fixed another test * Trial and error! * A bunch of additional fixes * Fixed a lint issue * Fixed restore focus on add server tab causing bad UX * Trial and error on flaky test again * Fixed some bugs based on PR feedback. * blank commit to push tests * Revert "Test windows titlebar" This reverts commit 9cd46b71b1427b75942434ac49185870d2437b85. * Remove the rest of the old new titlebar and fixes * Added three-dot link * New menu * Rest of new windows menu and other fixes * Fixed lint errors * Added windows 10 style title bar buttons for non mac OS * Lint fixes and enabled the tab bar regardless of number of servers * Missed one * Fixed unicode characters * Commenting out test that should no longer be applicable * Removed Windows 10 style titlebar icons and used material design instead * Fixed a lint issue * Some small UX fixes * blank commit * Fixed an issue where dropping the first tab moves it too far over before snapping into place * Additional style fixes * Another small issue fix * Back to Windows 10 style * Lint fixes * Accessible three dot menu * Lint fixes * Shrinking tabs when window is too small * Gradient between tabs and title bar buttons when window is too small * Add drag to gradient * Replaced icons, drag and drop cursor sticking fix, slight tab change * Lint and some mac fixes * Light theme fix to three dot menu * Hack for tab sticking to cursor on macOS * Fixes for the find utility * Fix for Catalina dark mode * Revert "Fix for Catalina dark mode" This reverts commit 45da05dd0f17f46efd1c53fafb92e9c1fd9dd8d9. * Fixed a couple issues Dean found * More fixes * Three dot hover effect to circle * PR feedback * Test fixes * Test and config fixes * Disable dragging when there are GPO servers * [MM-20757] Fixed dark mode on debug when running macOS Catalina * Allow future config versions to use v2 config if launching this version of the app * Oops * New titlebar icons, blur for titlebar on inactive * Lint fix * Set unfocused opacity to 0.4 * Final FINAL icons * Fixed closing menu not returning focus to the app * Lint fix * Update src/browser/components/TabBar.jsx Co-Authored-By: Guillermo Vayá <guivaya@gmail.com> * Update src/main/Validator.js Co-Authored-By: Guillermo Vayá <guivaya@gmail.com> * Lint fixes * Moved react-smooth-dnd fork to MM org and fixed another merge issue Co-authored-by: mattermod <mattermod@users.noreply.github.com> Co-authored-by: Guillermo Vayá <guivaya@gmail.com>
139 lines
4.3 KiB
JavaScript
139 lines
4.3 KiB
JavaScript
// Copyright (c) 2015-2016 Yuya Ochiai
|
|
// Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved.
|
|
// See LICENSE.txt for license information.
|
|
'use strict';
|
|
|
|
const fs = require('fs');
|
|
|
|
const env = require('../modules/environment');
|
|
|
|
describe('application', function desc() {
|
|
this.timeout(30000);
|
|
|
|
beforeEach(() => {
|
|
env.createTestUserDataDir();
|
|
env.cleanTestConfig();
|
|
this.app = env.getSpectronApp();
|
|
return this.app.start();
|
|
});
|
|
|
|
afterEach(async () => {
|
|
if (this.app && this.app.isRunning()) {
|
|
await this.app.stop();
|
|
}
|
|
});
|
|
|
|
it('should show a window', async () => {
|
|
await this.app.client.waitUntilWindowLoaded();
|
|
const count = await this.app.client.getWindowCount();
|
|
count.should.equal(1);
|
|
const opened = await this.app.browserWindow.isDevToolsOpened();
|
|
opened.should.be.false;
|
|
|
|
const visible = await this.app.browserWindow.isVisible();
|
|
visible.should.be.true;
|
|
});
|
|
|
|
it.skip('should restore window bounds', async () => {
|
|
// bounds seems to be incorrectly calculated in some environments
|
|
// - Windows 10: OK
|
|
// - CircleCI: NG
|
|
const expectedBounds = {x: 100, y: 200, width: 300, height: 400};
|
|
fs.writeFileSync(env.boundsInfoPath, JSON.stringify(expectedBounds));
|
|
await this.app.restart();
|
|
const bounds = await this.app.browserWindow.getBounds();
|
|
bounds.should.deep.equal(expectedBounds);
|
|
});
|
|
|
|
it('should NOT restore window bounds if the origin is located on outside of viewarea', async () => {
|
|
// bounds seems to be incorrectly calculated in some environments (e.g. CircleCI)
|
|
// - Windows 10: OK
|
|
// - CircleCI: NG
|
|
fs.writeFileSync(env.boundsInfoPath, JSON.stringify({x: -100000, y: 200, width: 300, height: 400}));
|
|
await this.app.restart();
|
|
let bounds = await this.app.browserWindow.getBounds();
|
|
bounds.x.should.satisfy((x) => (x > -10000));
|
|
|
|
fs.writeFileSync(env.boundsInfoPath, JSON.stringify({x: 100, y: 200000, width: 300, height: 400}));
|
|
await this.app.restart();
|
|
bounds = await this.app.browserWindow.getBounds();
|
|
bounds.y.should.satisfy((y) => (y < 10000));
|
|
});
|
|
|
|
it('should show settings.html when there is no config file', async () => {
|
|
await this.app.client.waitUntilWindowLoaded();
|
|
await this.app.client.pause(1000);
|
|
const url = await this.app.client.getUrl();
|
|
url.should.match(/\/settings.html$/);
|
|
|
|
const existing = await this.app.client.isExisting('#newServerModal');
|
|
existing.should.equal(true);
|
|
});
|
|
|
|
it('should show index.html when there is config file', async () => {
|
|
const config = {
|
|
version: 2,
|
|
teams: [{
|
|
name: 'example',
|
|
url: env.mattermostURL,
|
|
order: 0,
|
|
}, {
|
|
name: 'github',
|
|
url: 'https://github.com/',
|
|
order: 1,
|
|
}],
|
|
showTrayIcon: false,
|
|
trayIconTheme: 'light',
|
|
minimizeToTray: false,
|
|
notifications: {
|
|
flashWindow: 0,
|
|
bounceIcon: false,
|
|
bounceIconType: 'informational',
|
|
},
|
|
showUnreadBadge: true,
|
|
useSpellChecker: true,
|
|
enableHardwareAcceleration: true,
|
|
autostart: true,
|
|
darkMode: false,
|
|
};
|
|
fs.writeFileSync(env.configFilePath, JSON.stringify(config));
|
|
await this.app.restart();
|
|
|
|
const url = await this.app.client.getUrl();
|
|
url.should.match(/\/index.html$/);
|
|
});
|
|
|
|
it('should upgrade v0 config file', async () => {
|
|
const Config = require('../../src/common/config').default;
|
|
const newConfig = new Config(env.configFilePath);
|
|
const oldConfig = {
|
|
url: env.mattermostURL,
|
|
};
|
|
fs.writeFileSync(env.configFilePath, JSON.stringify(oldConfig));
|
|
await this.app.restart();
|
|
|
|
const url = await this.app.client.getUrl();
|
|
url.should.match(/\/index.html$/);
|
|
|
|
const str = fs.readFileSync(env.configFilePath, 'utf8');
|
|
const upgradedConfig = JSON.parse(str);
|
|
upgradedConfig.version.should.equal(newConfig.defaultData.version);
|
|
});
|
|
|
|
it.skip('should be stopped when the app instance already exists', (done) => {
|
|
const secondApp = env.getSpectronApp();
|
|
|
|
// In the correct case, 'start().then' is not called.
|
|
// So need to use setTimeout in order to finish this test.
|
|
const timer = setTimeout(() => {
|
|
done();
|
|
}, 3000);
|
|
secondApp.start().then(() => {
|
|
clearTimeout(timer);
|
|
return secondApp.stop();
|
|
}).then(() => {
|
|
done(new Error('Second app instance exists'));
|
|
});
|
|
});
|
|
});
|