ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-17 02:51:36 -05:00
Code Issues Packages Projects Releases Wiki Activity

remove close toast from dialogs (#15503)

Browse Source
This commit is contained in:
Lucy Zhang
2021-05-18 15:23:50 -04:00
committed by GitHub
parent 1040d5bc4c
commit d820137267
3 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
test/automation/src/sql/configurePythonDialog.ts
View File

@@ -5,13 +5,12 @@
import { Code } from '../code'; import { Code } from '../code';
import { Dialog } from './dialog'; import { Dialog } from './dialog';
import { NotificationToast } from './notificationToast';
const CONFIGURE_PYTHON_DIALOG_TITLE = 'Configure Python to run Python 3 kernel'; const CONFIGURE_PYTHON_DIALOG_TITLE = 'Configure Python to run Python 3 kernel';
export class ConfigurePythonDialog extends Dialog { export class ConfigurePythonDialog extends Dialog {
constructor(code: Code, private notificationToast: NotificationToast) { constructor(code: Code) {
super(CONFIGURE_PYTHON_DIALOG_TITLE, code); super(CONFIGURE_PYTHON_DIALOG_TITLE, code);
} }
@@ -32,14 +31,10 @@ export class ConfigurePythonDialog extends Dialog {
const pythonInstallLocationDropdownValue = `${dialog} select[aria-label="Python Install Location"] option`; const pythonInstallLocationDropdownValue = `${dialog} select[aria-label="Python Install Location"] option`;
await this.code.waitForElement(pythonInstallLocationDropdownValue); await this.code.waitForElement(pythonInstallLocationDropdownValue);
await this.notificationToast.closeNotificationToasts();
const nextButton = '.modal-dialog .modal-content .modal-footer .right-footer .footer-button a[aria-label="Next"][aria-disabled="false"]'; const nextButton = '.modal-dialog .modal-content .modal-footer .right-footer .footer-button a[aria-label="Next"][aria-disabled="false"]';
await this.code.waitAndClick(dialog); await this.code.waitAndClick(dialog);
await this.code.waitAndClick(nextButton); await this.code.waitAndClick(nextButton);
await this.notificationToast.closeNotificationToasts();
const installButton = '.modal-dialog .modal-content .modal-footer .right-footer .footer-button a[aria-label="Install"][aria-disabled="false"]'; const installButton = '.modal-dialog .modal-content .modal-footer .right-footer .footer-button a[aria-label="Install"][aria-disabled="false"]';
await this.code.waitAndClick(dialog); await this.code.waitAndClick(dialog);
await this.code.waitAndClick(installButton); await this.code.waitAndClick(installButton);

5
test/automation/src/sql/connectionDialog.ts
View File

@@ -5,13 +5,12 @@
import { Code } from '../code'; import { Code } from '../code';
import { Dialog } from './dialog'; import { Dialog } from './dialog';
import { NotificationToast } from './notificationToast';
const CONNECTION_DIALOG_TITLE = 'Connection'; const CONNECTION_DIALOG_TITLE = 'Connection';
export class ConnectionDialog extends Dialog { export class ConnectionDialog extends Dialog {
constructor(code: Code, private notificationToast: NotificationToast) { constructor(code: Code) {
super(CONNECTION_DIALOG_TITLE, code); super(CONNECTION_DIALOG_TITLE, code);
} }
@@ -31,8 +30,6 @@ export class ConnectionDialog extends Dialog {
private static readonly CONNECT_BUTTON_SELECTOR = '.modal .modal-footer a[aria-label="Connect"]:not(.disabled)'; private static readonly CONNECT_BUTTON_SELECTOR = '.modal .modal-footer a[aria-label="Connect"]:not(.disabled)';
async connect(): Promise<void> { async connect(): Promise<void> {
await this.notificationToast.closeNotificationToasts();
await this.code.waitAndClick(ConnectionDialog.CONNECT_BUTTON_SELECTOR); await this.code.waitAndClick(ConnectionDialog.CONNECT_BUTTON_SELECTOR);
await this.waitForDialogGone(); await this.waitForDialogGone();

4
test/automation/src/workbench.ts
View File

@@ -82,12 +82,12 @@ export class Workbench {
this.terminal = new Terminal(code, this.quickaccess); this.terminal = new Terminal(code, this.quickaccess);
// {{SQL CARBON EDIT}} // {{SQL CARBON EDIT}}
this.notificationToast = new NotificationToast(code); this.notificationToast = new NotificationToast(code);
this.connectionDialog = new ConnectionDialog(code, this.notificationToast); this.connectionDialog = new ConnectionDialog(code);
this.profiler = new Profiler(code, this.quickaccess); this.profiler = new Profiler(code, this.quickaccess);
this.queryEditors = new QueryEditors(code, this.editors); this.queryEditors = new QueryEditors(code, this.editors);
this.queryEditor = new QueryEditor(code); this.queryEditor = new QueryEditor(code);
this.sqlNotebook = new SqlNotebook(code, this.quickaccess, this.quickinput, this.editors); this.sqlNotebook = new SqlNotebook(code, this.quickaccess, this.quickinput, this.editors);
this.configurePythonDialog = new ConfigurePythonDialog(code, this.notificationToast); this.configurePythonDialog = new ConfigurePythonDialog(code);
// {{END}} // {{END}}
this.notebook = new Notebook(this.quickaccess, code); this.notebook = new Notebook(this.quickaccess, code);
} }