phlux/mattermostest
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix(e2e): E2E report should be available in the community channel. (#3305)

Browse Source
This commit is contained in:
yasser khan
2025-02-14 15:30:03 +05:30
committed by GitHub
parent face4096f1
commit d9967f30b0
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
e2e/utils/artifacts.js
View File

@@ -44,7 +44,7 @@ async function saveArtifacts() {
} }
const s3Folder = `${BUILD_ID}-${BRANCH}-${BUILD_TAG}`.replace(/\./g, '-'); const s3Folder = `${BUILD_ID}-${BRANCH}-${BUILD_TAG}`.replace(/\./g, '-');
const uploadPath = path.resolve(__dirname, `../../${MOCHAWESOME_REPORT_DIR}`); const uploadPath = path.resolve(__dirname, `../${MOCHAWESOME_REPORT_DIR}`);
const filesToUpload = await getFiles(uploadPath); const filesToUpload = await getFiles(uploadPath);
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {

6
src/main/contextMenu.ts
View File

@@ -2,7 +2,7 @@
// Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved. // Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved.
// See LICENSE.txt for license information. // See LICENSE.txt for license information.
import type {WebContentsView, BrowserWindow, ContextMenuParams, Event} from 'electron'; import type {BrowserWindow, BrowserView, WebviewTag, WebContents, ContextMenuParams, Event} from 'electron';
import type {Options} from 'electron-context-menu'; import type {Options} from 'electron-context-menu';
import electronContextMenu from 'electron-context-menu'; import electronContextMenu from 'electron-context-menu';
@@ -29,11 +29,11 @@ const defaultMenuOptions = {
}; };
export default class ContextMenu { export default class ContextMenu {
view: BrowserWindow | WebContentsView; view: BrowserWindow | BrowserView | WebviewTag | WebContents;
menuOptions: Options; menuOptions: Options;
menuDispose?: () => void; menuDispose?: () => void;
constructor(options: Options, view: BrowserWindow | WebContentsView) { constructor(options: Options, view: BrowserWindow | WebContents) {
const providedOptions: Options = options || {}; const providedOptions: Options = options || {};
this.menuOptions = Object.assign({}, defaultMenuOptions, providedOptions); this.menuOptions = Object.assign({}, defaultMenuOptions, providedOptions);

2
src/main/views/MattermostWebContentsView.ts
View File

@@ -91,7 +91,7 @@ export class MattermostWebContentsView extends EventEmitter {
WebContentsEventManager.addWebContentsEventListeners(this.webContentsView.webContents); WebContentsEventManager.addWebContentsEventListeners(this.webContentsView.webContents);
if (!DeveloperMode.get('disableContextMenu')) { if (!DeveloperMode.get('disableContextMenu')) {
this.contextMenu = new ContextMenu({}, this.webContentsView); this.contextMenu = new ContextMenu({}, this.webContentsView.webContents);
} }
this.maxRetries = MAX_SERVER_RETRIES; this.maxRetries = MAX_SERVER_RETRIES;

2
src/main/views/modalView.ts
View File

@@ -52,7 +52,7 @@ export class ModalView<T, T2> {
this.log.error(e); this.log.error(e);
} }
this.contextMenu = new ContextMenu({}, this.view); this.contextMenu = new ContextMenu({}, this.view.webContents);
} }
show = (win?: BrowserWindow, withDevTools?: boolean) => { show = (win?: BrowserWindow, withDevTools?: boolean) => {