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>
215 lines
6.2 KiB
JavaScript
215 lines
6.2 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 http = require('http');
|
|
const path = require('path');
|
|
|
|
const env = require('../../modules/environment');
|
|
const {asyncSleep} = require('../../modules/utils');
|
|
|
|
describe('browser/index.html', function desc() {
|
|
this.timeout(30000);
|
|
|
|
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,
|
|
};
|
|
|
|
const serverPort = 8181;
|
|
|
|
before(() => {
|
|
function serverCallback(req, res) {
|
|
res.writeHead(200, {
|
|
'Content-Type': 'text/html',
|
|
});
|
|
res.end(fs.readFileSync(path.resolve(env.sourceRootDir, 'test/modules/test.html'), 'utf-8'));
|
|
}
|
|
this.server = http.createServer(serverCallback).listen(serverPort, '127.0.0.1');
|
|
});
|
|
|
|
beforeEach(async () => {
|
|
fs.writeFileSync(env.configFilePath, JSON.stringify(config));
|
|
await asyncSleep(1000);
|
|
this.app = env.getSpectronApp();
|
|
await this.app.start();
|
|
});
|
|
|
|
afterEach(async () => {
|
|
if (this.app && this.app.isRunning()) {
|
|
await this.app.stop();
|
|
}
|
|
});
|
|
|
|
after((done) => {
|
|
this.server.close(done);
|
|
});
|
|
|
|
it('should set src of webview from config file', async () => {
|
|
const src0 = await this.app.client.getAttribute('#mattermostView0', 'src');
|
|
src0.should.equal(config.teams[0].url);
|
|
|
|
const src1 = await this.app.client.getAttribute('#mattermostView1', 'src');
|
|
src1.should.equal(config.teams[1].url);
|
|
|
|
const existing = await this.app.client.isExisting('#mattermostView2');
|
|
existing.should.be.false;
|
|
});
|
|
|
|
it('should set name of tab from config file', async () => {
|
|
const tabName0 = await this.app.client.getText('#teamTabItem0');
|
|
tabName0.should.equal(config.teams[0].name);
|
|
|
|
const tabName1 = await this.app.client.getText('#teamTabItem1');
|
|
tabName1.should.equal(config.teams[1].name);
|
|
});
|
|
|
|
it('should show only the selected team', () => {
|
|
return this.app.client.
|
|
waitForVisible('#mattermostView0', 2000).
|
|
waitForVisible('#mattermostView1', 2000, true).
|
|
click('#teamTabItem1').
|
|
waitForVisible('#mattermostView1', 2000).
|
|
waitForVisible('#mattermostView0', 2000, true);
|
|
});
|
|
|
|
// validation now prevents incorrect url's from being used
|
|
it.skip('should show error when using incorrect URL', async () => {
|
|
this.timeout(30000);
|
|
fs.writeFileSync(env.configFilePath, JSON.stringify({
|
|
version: 2,
|
|
teams: [{
|
|
name: 'error_1',
|
|
url: 'http://false',
|
|
order: 0,
|
|
}],
|
|
}));
|
|
await this.app.restart();
|
|
return this.app.client.
|
|
waitForVisible('#mattermostView0-fail', 20000);
|
|
});
|
|
|
|
it('should set window title by using webview\'s one', async () => {
|
|
fs.writeFileSync(env.configFilePath, JSON.stringify({
|
|
version: 2,
|
|
teams: [{
|
|
name: 'title_test',
|
|
url: `http://localhost:${serverPort}`,
|
|
order: 0,
|
|
}],
|
|
}));
|
|
await this.app.restart();
|
|
await this.app.client.pause(2000);
|
|
const windowTitle = await this.app.browserWindow.getTitle();
|
|
windowTitle.should.equal('Mattermost Desktop testing html');
|
|
});
|
|
|
|
// Skip because it's very unstable in CI
|
|
it.skip('should update window title when the activated tab\'s title is updated', async () => {
|
|
fs.writeFileSync(env.configFilePath, JSON.stringify({
|
|
version: 2,
|
|
teams: [{
|
|
name: 'title_test_0',
|
|
url: `http://localhost:${serverPort}`,
|
|
order: 0,
|
|
}, {
|
|
name: 'title_test_1',
|
|
url: `http://localhost:${serverPort}`,
|
|
order: 1,
|
|
}],
|
|
}));
|
|
await this.app.restart();
|
|
await this.app.client.pause(500);
|
|
|
|
// Note: Indices of webview are correct.
|
|
// Somehow they are swapped.
|
|
await this.app.client.
|
|
windowByIndex(2).
|
|
execute(() => {
|
|
document.title = 'Title 0';
|
|
});
|
|
await this.app.client.windowByIndex(0).pause(500);
|
|
let windowTitle = await this.app.browserWindow.getTitle();
|
|
windowTitle.should.equal('Title 0');
|
|
|
|
await this.app.client.
|
|
windowByIndex(1).
|
|
execute(() => {
|
|
document.title = 'Title 1';
|
|
});
|
|
await this.app.client.windowByIndex(0).pause(500);
|
|
windowTitle = await this.app.browserWindow.getTitle();
|
|
windowTitle.should.equal('Title 0');
|
|
});
|
|
|
|
// Skip because it's very unstable in CI
|
|
it.skip('should update window title when a tab is selected', async () => {
|
|
fs.writeFileSync(env.configFilePath, JSON.stringify({
|
|
version: 2,
|
|
teams: [{
|
|
name: 'title_test_0',
|
|
url: `http://localhost:${serverPort}`,
|
|
order: 0,
|
|
}, {
|
|
name: 'title_test_1',
|
|
url: `http://localhost:${serverPort}`,
|
|
order: 1,
|
|
}],
|
|
}));
|
|
await this.app.restart();
|
|
|
|
// Note: Indices of webview are correct.
|
|
// Somehow they are swapped.
|
|
await this.app.client.pause(500);
|
|
|
|
await this.app.client.
|
|
windowByIndex(2).
|
|
execute(() => {
|
|
document.title = 'Title 0';
|
|
});
|
|
await this.app.client.
|
|
windowByIndex(1).
|
|
execute(() => {
|
|
document.title = 'Title 1';
|
|
});
|
|
await this.app.client.windowByIndex(0).pause(500);
|
|
|
|
let windowTitle = await this.app.browserWindow.getTitle();
|
|
windowTitle.should.equal('Title 0');
|
|
|
|
await this.app.client.click('#teamTabItem1').pause(500);
|
|
windowTitle = await this.app.browserWindow.getTitle();
|
|
windowTitle.should.equal('Title 1');
|
|
});
|
|
|
|
it('should open the new server prompt after clicking the add button', async () => {
|
|
// See settings_test for specs that cover the actual prompt
|
|
await this.app.client.click('#addServerButton').pause(500);
|
|
const isModalExisting = await this.app.client.isExisting('#newServerModal');
|
|
isModalExisting.should.be.true;
|
|
});
|
|
});
|