diff --git a/src/launcher.ts b/src/launcher.ts index 4785d155..041ff8fd 100644 --- a/src/launcher.ts +++ b/src/launcher.ts @@ -94,7 +94,9 @@ export default class VSCodeServiceLauncher extends ChromedriverServiceLauncher { * setup VSCode Web */ await this._setupVSCodeWeb(version, cap) - this._mapBrowserCapabilities() + // @ts-expect-error CJS + const instance = await instance + this._mapBrowserCapabilities(instance.options as ServiceOptions) } return super.onPrepare() @@ -147,6 +149,8 @@ export default class VSCodeServiceLauncher extends ChromedriverServiceLauncher { throw new Error(`No key "${VSCODE_CAPABILITY_KEY}" found in caps`) } + // @ts-expect-error CJS + const instance = await this.instance if (versionsFileExist) { const content = JSON.parse((await fs.readFile(versionsFilePath)).toString()) as Versions const chromedriverPath = path.join(this._cachePath, `chromedriver-${content[version]?.chromedriver}`) @@ -161,18 +165,18 @@ export default class VSCodeServiceLauncher extends ChromedriverServiceLauncher { + `and Chromedriver v${content[version]?.chromedriver} already exist` ) - Object.assign(cap, this.options) + Object.assign(cap, instance.options) cap[VSCODE_CAPABILITY_KEY].binary = ( cap[VSCODE_CAPABILITY_KEY].binary || await this._downloadVSCode(content[version]?.vscode as string) ) - this.chromedriverCustomPath = chromedriverPath + instance.chromedriverCustomPath = chromedriverPath return } } const [vscodeVersion, chromedriverVersion, chromedriverPath] = await this._setupChromedriver(version) - this.chromedriverCustomPath = chromedriverPath + instance.chromedriverCustomPath = chromedriverPath const serviceArgs: ServiceCapability = { chromedriver: { version: chromedriverVersion, path: chromedriverPath }, vscode: { @@ -180,7 +184,7 @@ export default class VSCodeServiceLauncher extends ChromedriverServiceLauncher { path: cap[VSCODE_CAPABILITY_KEY]?.binary || await this._downloadVSCode(vscodeVersion) } } - Object.assign(cap, this.options) + Object.assign(cap, instance.options) cap[VSCODE_CAPABILITY_KEY].binary = serviceArgs.vscode.path await this._updateVersionsTxt(version, serviceArgs, versionsFileExist) } @@ -349,14 +353,14 @@ export default class VSCodeServiceLauncher extends ChromedriverServiceLauncher { ) } - private _mapBrowserCapabilities () { - if (isMultiremote(this.capabilities)) { + private _mapBrowserCapabilities (options: ServiceOptions) { + if (isMultiremote(this._capabilities)) { throw new SevereServiceError('This service deson\'t support multiremote yet') } for (const cap of this._capabilities as any as Capabilities.Capabilities[]) { if (isChrome(cap)) { - Object.assign(cap, this.options) + Object.assign(cap, options) } } } diff --git a/src/locators/1.67.0.ts b/src/locators/1.67.0.ts index 9b55febb..bbf94149 100644 --- a/src/locators/1.67.0.ts +++ b/src/locators/1.67.0.ts @@ -7,7 +7,7 @@ import { } from './1.66.0' export * from './1.66.0' -export const locatorVersion = '1.70.0' +export const locatorVersion = '1.73.0' export const BottomBarPanel = { ...BottomBarPanelImport, action: (label: string) => `.//li[starts-with(@title, '${label}')]` diff --git a/src/locators/1.73.0.ts b/src/locators/1.73.0.ts new file mode 100644 index 00000000..878f1bc5 --- /dev/null +++ b/src/locators/1.73.0.ts @@ -0,0 +1,10 @@ +import { + BottomBarViews as BottomBarViewsImport +} from './1.70.0' + +export * from './1.70.0' +export const locatorVersion = '1.73.0' +export const BottomBarViews = { + ...BottomBarViewsImport, + outputChannels: 'select[title="Tasks"]' +} diff --git a/src/locators/insiders.ts b/src/locators/insiders.ts index 0b8ee9bb..48b2d8ea 100644 --- a/src/locators/insiders.ts +++ b/src/locators/insiders.ts @@ -1,8 +1,8 @@ import { QuickOpenBox as QuickOpenBoxImport -} from './1.70.0' +} from './1.73.0' -export * from './1.70.0' +export * from './1.73.0' export const locatorVersion = 'insiders' export const QuickOpenBox = { ...QuickOpenBoxImport, diff --git a/src/pageobjects/activityBar/ActionsControl.ts b/src/pageobjects/activityBar/ActionsControl.ts index 006455b6..f6069c10 100644 --- a/src/pageobjects/activityBar/ActionsControl.ts +++ b/src/pageobjects/activityBar/ActionsControl.ts @@ -1,5 +1,5 @@ import { ElementWithContextMenu } from '../utils' -import { ActivityBar as ActivityBarLocators } from '../../locators/1.70.0' +import { ActivityBar as ActivityBarLocators } from '../../locators/1.73.0' import type { ContextMenu } from '../menu/ContextMenu' /** diff --git a/src/pageobjects/activityBar/ActivityBar.ts b/src/pageobjects/activityBar/ActivityBar.ts index 18545086..ea4b7877 100644 --- a/src/pageobjects/activityBar/ActivityBar.ts +++ b/src/pageobjects/activityBar/ActivityBar.ts @@ -1,6 +1,6 @@ import { ViewControl, ActionsControl } from '..' import { PageDecorator, IPageDecorator, ElementWithContextMenu } from '../utils' -import { ActivityBar as ActivityBarLocators } from '../../locators/1.70.0' +import { ActivityBar as ActivityBarLocators } from '../../locators/1.73.0' export interface ActivityBar extends IPageDecorator {} /** diff --git a/src/pageobjects/activityBar/ViewControl.ts b/src/pageobjects/activityBar/ViewControl.ts index 9b12460c..9c321746 100644 --- a/src/pageobjects/activityBar/ViewControl.ts +++ b/src/pageobjects/activityBar/ViewControl.ts @@ -8,7 +8,7 @@ import { NewScmView } from '../sidebar/scm/NewScmView' import { PageDecorator, IPageDecorator, ElementWithContextMenu, VSCodeLocatorMap } from '../utils' -import { ViewControl as ViewControlLocators } from '../../locators/1.70.0' +import { ViewControl as ViewControlLocators } from '../../locators/1.73.0' export interface ViewControl extends IPageDecorator { } /** diff --git a/src/pageobjects/bottomBar/BottomBarPanel.ts b/src/pageobjects/bottomBar/BottomBarPanel.ts index b0f92b07..d2ab46fc 100644 --- a/src/pageobjects/bottomBar/BottomBarPanel.ts +++ b/src/pageobjects/bottomBar/BottomBarPanel.ts @@ -3,7 +3,7 @@ import { StatusBar } from '..' import { BasePage, PageDecorator, IPageDecorator } from '../utils' -import { BottomBarPanel as BottomBarPanelLocators } from '../../locators/1.70.0' +import { BottomBarPanel as BottomBarPanelLocators } from '../../locators/1.73.0' export interface BottomBarPanel extends IPageDecorator {} /** diff --git a/src/pageobjects/bottomBar/ProblemsView.ts b/src/pageobjects/bottomBar/ProblemsView.ts index bf734497..06a60f75 100644 --- a/src/pageobjects/bottomBar/ProblemsView.ts +++ b/src/pageobjects/bottomBar/ProblemsView.ts @@ -4,7 +4,7 @@ import { BottomBarPanel } from '..' import { BasePage, ElementWithContextMenu, PageDecorator, IPageDecorator, VSCodeLocatorMap } from '../utils' -import { ProblemsView as ProblemsViewLocators, Marker as MarkerLocators } from '../../locators/1.70.0' +import { ProblemsView as ProblemsViewLocators, Marker as MarkerLocators } from '../../locators/1.73.0' export interface ProblemsView extends IPageDecorator {} /** @@ -70,8 +70,8 @@ export class ProblemsView extends BasePage { /** * @deprecated The method should not be used and getAllVisibleMarkers() should be used instead. */ - async getAllMarkers (type: MarkerType): Promise { - return this.getAllVisibleMarkers(type) + async getAllMarkers (): Promise { + return this.getAllVisibleMarkers(MarkerType.Any) } /** diff --git a/src/pageobjects/bottomBar/Views.ts b/src/pageobjects/bottomBar/Views.ts index f45b9450..9d71304f 100644 --- a/src/pageobjects/bottomBar/Views.ts +++ b/src/pageobjects/bottomBar/Views.ts @@ -10,7 +10,7 @@ import { OutputView as OutputViewLocators, DebugConsoleView as DebugConsoleViewLocators, TerminalView as TerminalViewLocators -} from '../../locators/1.70.0' +} from '../../locators/1.73.0' export interface OutputView extends IPageDecorator {} /** diff --git a/src/pageobjects/dialog/ModalDialog.ts b/src/pageobjects/dialog/ModalDialog.ts index 5570a767..56306b44 100644 --- a/src/pageobjects/dialog/ModalDialog.ts +++ b/src/pageobjects/dialog/ModalDialog.ts @@ -1,5 +1,5 @@ import { PageDecorator, IPageDecorator, BasePage } from '../utils' -import { Dialog as DialogLocators } from '../../locators/1.70.0' +import { Dialog as DialogLocators } from '../../locators/1.73.0' export interface ModalDialog extends IPageDecorator {} /** diff --git a/src/pageobjects/editor/ContentAssist.ts b/src/pageobjects/editor/ContentAssist.ts index 26dc6ca9..8872c4e7 100644 --- a/src/pageobjects/editor/ContentAssist.ts +++ b/src/pageobjects/editor/ContentAssist.ts @@ -6,7 +6,7 @@ import { import { PageDecorator, IPageDecorator, VSCodeLocatorMap, sleep } from '../utils' -import { ContentAssist as ContentAssistLocators } from '../../locators/1.70.0' +import { ContentAssist as ContentAssistLocators } from '../../locators/1.73.0' export interface ContentAssist extends IPageDecorator {} /** diff --git a/src/pageobjects/editor/CustomEditor.ts b/src/pageobjects/editor/CustomEditor.ts index f47b6eb9..28954d2b 100644 --- a/src/pageobjects/editor/CustomEditor.ts +++ b/src/pageobjects/editor/CustomEditor.ts @@ -1,6 +1,6 @@ import { Editor, InputBox } from '..' import { PageDecorator, IPageDecorator } from '../utils' -import { Editor as EditorLocators } from '../../locators/1.70.0' +import { Editor as EditorLocators } from '../../locators/1.73.0' import { CMD_KEY } from '../../constants' export interface CustomEditor extends IPageDecorator {} diff --git a/src/pageobjects/editor/DiffEditor.ts b/src/pageobjects/editor/DiffEditor.ts index 14289841..17c46aed 100644 --- a/src/pageobjects/editor/DiffEditor.ts +++ b/src/pageobjects/editor/DiffEditor.ts @@ -2,7 +2,7 @@ import { Editor, EditorLocators } from './Editor' import { TextEditor } from './TextEditor' import { EditorView } from './EditorView' import { PageDecorator, IPageDecorator } from '../utils' -import { DiffEditor as DiffEditorLocators } from '../../locators/1.70.0' +import { DiffEditor as DiffEditorLocators } from '../../locators/1.73.0' export interface DiffEditor extends IPageDecorator {} /** diff --git a/src/pageobjects/editor/Editor.ts b/src/pageobjects/editor/Editor.ts index c37d2ce7..0f2c73b0 100644 --- a/src/pageobjects/editor/Editor.ts +++ b/src/pageobjects/editor/Editor.ts @@ -8,7 +8,7 @@ import { TextEditor as TextEditorLocators, DiffEditor as DiffEditorLocators, EditorView as EditorViewLocators -} from '../../locators/1.70.0' +} from '../../locators/1.73.0' /** * @hidden diff --git a/src/pageobjects/editor/EditorView.ts b/src/pageobjects/editor/EditorView.ts index 54e1d639..bbd9ca89 100644 --- a/src/pageobjects/editor/EditorView.ts +++ b/src/pageobjects/editor/EditorView.ts @@ -7,7 +7,7 @@ import { import { EditorView as EditorViewLocators, Editor as EditorLocatorsObj -} from '../../locators/1.70.0' +} from '../../locators/1.73.0' export interface EditorView extends IPageDecorator {} /** diff --git a/src/pageobjects/editor/SettingsEditor.ts b/src/pageobjects/editor/SettingsEditor.ts index 54886277..234bca10 100644 --- a/src/pageobjects/editor/SettingsEditor.ts +++ b/src/pageobjects/editor/SettingsEditor.ts @@ -5,7 +5,7 @@ import { EditorView, EditorGroup } from '..' import { PageDecorator, IPageDecorator, BasePage, VSCodeLocatorMap, sleep } from '../utils' -import { SettingsEditor as SettingsEditorLocators } from '../../locators/1.70.0' +import { SettingsEditor as SettingsEditorLocators } from '../../locators/1.73.0' export interface SettingsEditor extends IPageDecorator {} /** diff --git a/src/pageobjects/editor/TextEditor.ts b/src/pageobjects/editor/TextEditor.ts index 9bf9e9f4..73987e32 100644 --- a/src/pageobjects/editor/TextEditor.ts +++ b/src/pageobjects/editor/TextEditor.ts @@ -12,7 +12,7 @@ import { import { TextEditor as TextEditorLocators, FindWidget as FindWidgetLocators -} from '../../locators/1.70.0' +} from '../../locators/1.73.0' import { CMD_KEY } from '../../constants' export interface TextEditor extends IPageDecorator {} diff --git a/src/pageobjects/menu/ContextMenu.ts b/src/pageobjects/menu/ContextMenu.ts index e563217e..976fe9ac 100644 --- a/src/pageobjects/menu/ContextMenu.ts +++ b/src/pageobjects/menu/ContextMenu.ts @@ -4,7 +4,7 @@ import { Menu, MenuItem } from '..' import { PageDecorator, IPageDecorator, VSCodeLocatorMap, sleep } from '../utils' -import { ContextMenu as ContextMenuLocators } from '../../locators/1.70.0' +import { ContextMenu as ContextMenuLocators } from '../../locators/1.73.0' export interface ContextMenu extends IPageDecorator {} /** diff --git a/src/pageobjects/menu/TitleBar.ts b/src/pageobjects/menu/TitleBar.ts index ad32f1b2..eae34c5f 100644 --- a/src/pageobjects/menu/TitleBar.ts +++ b/src/pageobjects/menu/TitleBar.ts @@ -2,7 +2,7 @@ import { PageDecorator, IPageDecorator, VSCodeLocatorMap } from '../utils' import { WindowControls, ContextMenu } from '..' import { Menu } from './Menu' import { MenuItem } from './MenuItem' -import { TitleBar as TitleBarLocators } from '../../locators/1.70.0' +import { TitleBar as TitleBarLocators } from '../../locators/1.73.0' export interface TitleBar extends IPageDecorator {} /** diff --git a/src/pageobjects/menu/WindowControls.ts b/src/pageobjects/menu/WindowControls.ts index 0a3bb5e7..f97f73d3 100644 --- a/src/pageobjects/menu/WindowControls.ts +++ b/src/pageobjects/menu/WindowControls.ts @@ -4,7 +4,7 @@ import { PageDecorator, IPageDecorator, BasePage, VSCodeLocatorMap } from '../utils' import { TitleBar } from '../..' -import { WindowControls as WindowControlsLocators } from '../../locators/1.70.0' +import { WindowControls as WindowControlsLocators } from '../../locators/1.73.0' export interface WindowControls extends IPageDecorator {} /** diff --git a/src/pageobjects/sidebar/SideBarView.ts b/src/pageobjects/sidebar/SideBarView.ts index 3f8e9400..991c1a04 100644 --- a/src/pageobjects/sidebar/SideBarView.ts +++ b/src/pageobjects/sidebar/SideBarView.ts @@ -2,7 +2,7 @@ import { ViewContent, ViewTitlePart } from '..' import { PageDecorator, IPageDecorator, BasePage, LocatorComponents } from '../utils' -import { SideBarView as SideBarViewLocators } from '../../locators/1.70.0' +import { SideBarView as SideBarViewLocators } from '../../locators/1.73.0' export interface SideBarView extends IPageDecorator { } /** diff --git a/src/pageobjects/sidebar/ViewContent.ts b/src/pageobjects/sidebar/ViewContent.ts index e1381286..47998350 100644 --- a/src/pageobjects/sidebar/ViewContent.ts +++ b/src/pageobjects/sidebar/ViewContent.ts @@ -5,7 +5,7 @@ import { ExtensionsViewSection } from './extensions/ExtensionsViewSection' import { PageDecorator, IPageDecorator, BasePage, VSCodeLocatorMap } from '../utils' -import { ViewContent as ViewContentLocators } from '../../locators/1.70.0' +import { ViewContent as ViewContentLocators } from '../../locators/1.73.0' export interface ViewContent extends IPageDecorator { } /** diff --git a/src/pageobjects/sidebar/ViewItem.ts b/src/pageobjects/sidebar/ViewItem.ts index 50d0d98a..ec0f1389 100644 --- a/src/pageobjects/sidebar/ViewItem.ts +++ b/src/pageobjects/sidebar/ViewItem.ts @@ -8,7 +8,7 @@ import { CustomTreeItem as CustomTreeItemLocators, DefaultTreeItem as DefaultTreeItemLocators, ExtensionsViewItem as ExtensionsViewItemLocators -} from '../../locators/1.70.0' +} from '../../locators/1.73.0' /** * Abstract representation of a row in the tree inside a view content section diff --git a/src/pageobjects/sidebar/ViewSection.ts b/src/pageobjects/sidebar/ViewSection.ts index 32a6793b..8f2c2634 100644 --- a/src/pageobjects/sidebar/ViewSection.ts +++ b/src/pageobjects/sidebar/ViewSection.ts @@ -11,7 +11,7 @@ import { ExtensionsViewSection as ExtensionsViewSectionLocators, CustomTreeSection as CustomTreeSectionLocators, DefaultTreeSection as DefaultTreeSectionLocators -} from '../../locators/1.70.0' +} from '../../locators/1.73.0' /** * @hidden diff --git a/src/pageobjects/sidebar/ViewTitlePart.ts b/src/pageobjects/sidebar/ViewTitlePart.ts index 6c706569..8ab75ac1 100644 --- a/src/pageobjects/sidebar/ViewTitlePart.ts +++ b/src/pageobjects/sidebar/ViewTitlePart.ts @@ -3,7 +3,7 @@ import { ElementWithContextMenu, PageDecorator, IPageDecorator, BasePage, VSCodeLocatorMap } from '../utils' import { SideBarView } from '..' -import { ViewTitlePart as ViewTitlePartLocators } from '../../locators/1.70.0' +import { ViewTitlePart as ViewTitlePartLocators } from '../../locators/1.73.0' export interface ViewTitlePart extends IPageDecorator { } /** diff --git a/src/pageobjects/sidebar/WelcomeContent.ts b/src/pageobjects/sidebar/WelcomeContent.ts index d916f7ef..671d1a95 100644 --- a/src/pageobjects/sidebar/WelcomeContent.ts +++ b/src/pageobjects/sidebar/WelcomeContent.ts @@ -4,7 +4,7 @@ import { ViewSection } from '..' import { BasePage, PageDecorator, IPageDecorator, VSCodeLocatorMap } from '../utils' -import { WelcomeContent as WelcomeContentLocators } from '../../locators/1.70.0' +import { WelcomeContent as WelcomeContentLocators } from '../../locators/1.73.0' export interface WelcomeContentButton extends IPageDecorator {} /** diff --git a/src/pageobjects/sidebar/debug/DebugView.ts b/src/pageobjects/sidebar/debug/DebugView.ts index 08c1e654..858807c7 100644 --- a/src/pageobjects/sidebar/debug/DebugView.ts +++ b/src/pageobjects/sidebar/debug/DebugView.ts @@ -1,6 +1,6 @@ import { SideBarView } from '../SideBarView' import { PageDecorator, IPageDecorator } from '../../utils' -import { DebugView as DebugViewLocators } from '../../../locators/1.70.0' +import { DebugView as DebugViewLocators } from '../../../locators/1.73.0' export interface DebugView extends IPageDecorator { } /** diff --git a/src/pageobjects/sidebar/extensions/ExtensionsViewItem.ts b/src/pageobjects/sidebar/extensions/ExtensionsViewItem.ts index 6d0bfc24..751c7e68 100644 --- a/src/pageobjects/sidebar/extensions/ExtensionsViewItem.ts +++ b/src/pageobjects/sidebar/extensions/ExtensionsViewItem.ts @@ -8,7 +8,7 @@ import { PageDecorator, IPageDecorator, VSCodeLocatorMap } from '../../utils' import { TreeItem as TreeItemLocators, ExtensionsViewItem as ExtensionsViewItemLocators -} from '../../../locators/1.70.0' +} from '../../../locators/1.73.0' export interface ExtensionsViewItem extends IPageDecorator { } /** diff --git a/src/pageobjects/sidebar/extensions/ExtensionsViewSection.ts b/src/pageobjects/sidebar/extensions/ExtensionsViewSection.ts index 39798364..7a207652 100644 --- a/src/pageobjects/sidebar/extensions/ExtensionsViewSection.ts +++ b/src/pageobjects/sidebar/extensions/ExtensionsViewSection.ts @@ -4,7 +4,7 @@ import { PageDecorator, IPageDecorator } from '../../utils' import { ViewSection as ViewSectionLocators, ExtensionsViewSection as ExtensionsViewSectionLocators -} from '../../../locators/1.70.0' +} from '../../../locators/1.73.0' import { CMD_KEY } from '../../../constants' /** diff --git a/src/pageobjects/sidebar/scm/NewScmView.ts b/src/pageobjects/sidebar/scm/NewScmView.ts index 9b5ab4f5..f8bd30e9 100644 --- a/src/pageobjects/sidebar/scm/NewScmView.ts +++ b/src/pageobjects/sidebar/scm/NewScmView.ts @@ -5,7 +5,7 @@ import { ContextMenu } from '../..' import { PageDecorator, IPageDecorator, ElementWithContextMenu, VSCodeLocatorMap } from '../../utils' -import { ScmView as ScmViewLocators } from '../../../locators/1.70.0' +import { ScmView as ScmViewLocators } from '../../../locators/1.73.0' import { CMD_KEY } from '../../../constants' export interface NewScmView extends IPageDecorator { } diff --git a/src/pageobjects/sidebar/scm/ScmView.ts b/src/pageobjects/sidebar/scm/ScmView.ts index 735b6670..723c9358 100644 --- a/src/pageobjects/sidebar/scm/ScmView.ts +++ b/src/pageobjects/sidebar/scm/ScmView.ts @@ -5,7 +5,7 @@ import { ContextMenu } from '../..' import { ElementWithContextMenu, VSCodeLocatorMap, PageDecorator, IPageDecorator, BasePage } from '../../utils' -import { ScmView as ScmViewLocators } from '../../../locators/1.70.0' +import { ScmView as ScmViewLocators } from '../../../locators/1.73.0' import { CMD_KEY } from '../../../constants' export interface ScmView extends IPageDecorator { } diff --git a/src/pageobjects/sidebar/tree/custom/CustomTreeItem.ts b/src/pageobjects/sidebar/tree/custom/CustomTreeItem.ts index 3b9b4b80..50b09197 100644 --- a/src/pageobjects/sidebar/tree/custom/CustomTreeItem.ts +++ b/src/pageobjects/sidebar/tree/custom/CustomTreeItem.ts @@ -6,7 +6,7 @@ import { PageDecorator, IPageDecorator, VSCodeLocatorMap } from '../../../utils' import { TreeItem as TreeItemLocators, CustomTreeItem as CustomTreeItemLocators -} from '../../../../locators/1.70.0' +} from '../../../../locators/1.73.0' export interface CustomTreeItem extends IPageDecorator { } /** diff --git a/src/pageobjects/sidebar/tree/custom/CustomTreeSection.ts b/src/pageobjects/sidebar/tree/custom/CustomTreeSection.ts index b2b37843..42523bbb 100644 --- a/src/pageobjects/sidebar/tree/custom/CustomTreeSection.ts +++ b/src/pageobjects/sidebar/tree/custom/CustomTreeSection.ts @@ -7,7 +7,7 @@ import { PageDecorator, IPageDecorator } from '../../../utils' import { ViewSection as ViewSectionLocators, CustomTreeSection as CustomTreeSectionLocators -} from '../../../../locators/1.70.0' +} from '../../../../locators/1.73.0' export interface CustomTreeSection extends IPageDecorator { } /** diff --git a/src/pageobjects/sidebar/tree/default/DefaultTreeItem.ts b/src/pageobjects/sidebar/tree/default/DefaultTreeItem.ts index 182dec17..746d6292 100644 --- a/src/pageobjects/sidebar/tree/default/DefaultTreeItem.ts +++ b/src/pageobjects/sidebar/tree/default/DefaultTreeItem.ts @@ -6,7 +6,7 @@ import { PageDecorator, IPageDecorator, VSCodeLocatorMap } from '../../../utils' import { TreeItem as TreeItemLocators, DefaultTreeItem as DefaultTreeItemLocators -} from '../../../../locators/1.70.0' +} from '../../../../locators/1.73.0' export interface DefaultTreeItem extends IPageDecorator { } /** diff --git a/src/pageobjects/sidebar/tree/default/DefaultTreeSection.ts b/src/pageobjects/sidebar/tree/default/DefaultTreeSection.ts index 17f80913..c8b9a6f3 100644 --- a/src/pageobjects/sidebar/tree/default/DefaultTreeSection.ts +++ b/src/pageobjects/sidebar/tree/default/DefaultTreeSection.ts @@ -6,7 +6,7 @@ import { PageDecorator, IPageDecorator } from '../../../utils' import { ViewSection as ViewSectionLocators, DefaultTreeSection as DefaultTreeSectionLocators -} from '../../../../locators/1.70.0' +} from '../../../../locators/1.73.0' export interface DefaultTreeSection extends IPageDecorator { } /** diff --git a/src/pageobjects/statusBar/StatusBar.ts b/src/pageobjects/statusBar/StatusBar.ts index 0b87b500..96501929 100644 --- a/src/pageobjects/statusBar/StatusBar.ts +++ b/src/pageobjects/statusBar/StatusBar.ts @@ -1,5 +1,5 @@ import { PageDecorator, IPageDecorator, BasePage } from '../utils' -import { StatusBar as StatusBarLocators } from '../../locators/1.70.0' +import { StatusBar as StatusBarLocators } from '../../locators/1.73.0' import { NotificationsCenter } from '..' export interface StatusBar extends IPageDecorator {} diff --git a/src/pageobjects/workbench/DebugToolbar.ts b/src/pageobjects/workbench/DebugToolbar.ts index 79f948c0..9b932fa9 100644 --- a/src/pageobjects/workbench/DebugToolbar.ts +++ b/src/pageobjects/workbench/DebugToolbar.ts @@ -1,6 +1,6 @@ import { ChainablePromiseElement } from 'webdriverio' import { BasePage, PageDecorator, IPageDecorator } from '../utils' -import { DebugToolbar as DebugToolbarLocators } from '../../locators/1.70.0' +import { DebugToolbar as DebugToolbarLocators } from '../../locators/1.73.0' export interface DebugToolbar extends IPageDecorator {} /** diff --git a/src/pageobjects/workbench/Input.ts b/src/pageobjects/workbench/Input.ts index a04790cb..47955a31 100644 --- a/src/pageobjects/workbench/Input.ts +++ b/src/pageobjects/workbench/Input.ts @@ -6,7 +6,7 @@ import { Input as InputLocators, InputBox as InputBoxLocators, QuickOpenBox as QuickOpenBoxLocators -} from '../../locators/1.70.0' +} from '../../locators/1.73.0' import { CMD_KEY } from '../../constants' const HOME_KEY = process.platform === 'win32' diff --git a/src/pageobjects/workbench/Notification.ts b/src/pageobjects/workbench/Notification.ts index c0d6daec..33dac421 100644 --- a/src/pageobjects/workbench/Notification.ts +++ b/src/pageobjects/workbench/Notification.ts @@ -2,7 +2,7 @@ import { ChainablePromiseElement } from 'webdriverio' import { BasePage, IPageDecorator, PageDecorator, VSCodeLocatorMap } from '../utils' -import { Notification as NotificationLocators } from '../../locators/1.70.0' +import { Notification as NotificationLocators } from '../../locators/1.73.0' /** * Available types of notifications diff --git a/src/pageobjects/workbench/NotificationsCenter.ts b/src/pageobjects/workbench/NotificationsCenter.ts index b9e6f764..be0c6753 100644 --- a/src/pageobjects/workbench/NotificationsCenter.ts +++ b/src/pageobjects/workbench/NotificationsCenter.ts @@ -1,6 +1,6 @@ import { Notification, CenterNotification, NotificationType } from './Notification' import { BasePage, PageDecorator, IPageDecorator } from '../utils' -import { NotificationsCenter as NotificationsCenterLocator } from '../../locators/1.70.0' +import { NotificationsCenter as NotificationsCenterLocator } from '../../locators/1.73.0' export interface NotificationsCenter extends IPageDecorator {} /** diff --git a/src/pageobjects/workbench/WebView.ts b/src/pageobjects/workbench/WebView.ts index 59f64cdf..2389fe8e 100644 --- a/src/pageobjects/workbench/WebView.ts +++ b/src/pageobjects/workbench/WebView.ts @@ -1,6 +1,6 @@ import { ChainablePromiseElement } from 'webdriverio' import { BasePage, PageDecorator, IPageDecorator } from '../utils' -import { WebView as WebViewLocators } from '../../locators/1.70.0' +import { WebView as WebViewLocators } from '../../locators/1.73.0' import type { VSCodeLocatorMap } from '../utils' export interface WebView extends IPageDecorator { } diff --git a/src/pageobjects/workbench/Workbench.ts b/src/pageobjects/workbench/Workbench.ts index 3d142262..f77ee1f2 100644 --- a/src/pageobjects/workbench/Workbench.ts +++ b/src/pageobjects/workbench/Workbench.ts @@ -13,7 +13,7 @@ import { WebView } from './WebView' import { PageDecorator, IPageDecorator, BasePage, sleep } from '../utils' -import { Workbench as WorkbenchLocators } from '../../locators/1.70.0' +import { Workbench as WorkbenchLocators } from '../../locators/1.73.0' export interface Workbench extends IPageDecorator {} /** diff --git a/test/specs/basic.e2e.ts b/test/specs/basic.e2e.ts index 32e8cc35..4bc64720 100644 --- a/test/specs/basic.e2e.ts +++ b/test/specs/basic.e2e.ts @@ -6,7 +6,8 @@ import path from 'path' import { PageDecorator, IPageDecorator, BasePage, BottomBarPanel, StatusBar, SettingsEditor, TextEditor, FindWidget, MarkerType, - ProblemsView, EditorView, WebView, SideBarView, CustomTreeItem, DefaultTreeItem, ViewSection, TreeItem, sleep + ProblemsView, EditorView, WebView, SideBarView, CustomTreeItem, + DefaultTreeItem, ViewSection, TreeItem, sleep } from '../..' const isWebTest = Boolean(parseInt(process.env.VSCODE_WEB_TESTS || '', 10)) @@ -221,18 +222,16 @@ describe('WDIO VSCode Service', () => { const outputView = await bottomBar.openOutputView() const channels = await outputView.getChannelNames() expect(channels).toContain('Tasks') - expect(channels).toContain('Extensions') + expect(channels).toContain('Markdown Language Server') expect(channels).toContain(await browser.isVSCodeWebSession() ? 'Log (Worker Extension Host)' : 'Log (Extension Host)') - - const currentChannel = await outputView.getCurrentChannel() - expect(currentChannel).toEqual(channels[0]) }) it('can get extension logs', async () => { const outputView = await bottomBar.openOutputView() await outputView.selectChannel('Guinea Pig') + expect(await outputView.getCurrentChannel()).toBe('Guinea Pig') expect(await outputView.getText()).toEqual(['Hello World!']) }) }) @@ -391,7 +390,7 @@ describe('WDIO VSCode Service', () => { const bottomBar = workbench.getBottomBar() problemsView = await bottomBar.openProblemsView() - expect(await problemsView.getAllMarkers()).toHaveLength(0) + expect(await problemsView.getAllVisibleMarkers(MarkerType.Any)).toHaveLength(0) }) it('should create problems @skipWeb', async () => { @@ -412,13 +411,19 @@ describe('WDIO VSCode Service', () => { await tab.setText('I am creating problems') await browser.waitUntil(async () => { - const markers = await problemsView.getAllMarkers() + const markers = await problemsView.getAllVisibleMarkers(MarkerType.Any) return markers.length > 0 }) + + /** + * ensure deprecated command works in the same way + */ + expect((await problemsView.getAllMarkers()).length) + .toEqual((await problemsView.getAllVisibleMarkers(MarkerType.Any)).length) }) it('can access problem information @skipWeb', async () => { - const [marker] = await problemsView.getAllMarkers() + const [marker] = await problemsView.getAllVisibleMarkers(MarkerType.Any) expect(await marker.getFileName()).toBe('wdio.conf.ts') expect(await marker.getText()).toContain('problems in file wdio.conf.ts of folder test') @@ -468,7 +473,6 @@ describe('WDIO VSCode Service', () => { describe('TreeView', () => { let treeViewSection: ViewSection - it('should be able to find the extension tree view', async () => { const workbench = await browser.getWorkbench() @@ -483,16 +487,16 @@ describe('WDIO VSCode Service', () => { treeViewSection = await sidebar.getContent().getSection('TEST EXTENSION TREEVIEW') // eslint-disable-next-line @typescript-eslint/await-thenable - await expect(treeViewSection).toBePresent() + await expect(treeViewSection.elem).toBePresent() expect(await treeViewSection.getTitle()).toBe('Test Extension Treeview') }) let customTreeItem: CustomTreeItem - it('should be able to expand the tree and iterate over the tree items', async () => { await treeViewSection.expand() expect(await treeViewSection.isExpanded()).toBe(true) + await browser.waitUntil(async () => (await treeViewSection.getVisibleItems()).length > 0) const visItems = await treeViewSection.getVisibleItems() visItems.forEach((visItem) => expect(visItem).toBeInstanceOf(TreeItem)) @@ -552,7 +556,7 @@ describe('WDIO VSCode Service', () => { const sectionName = isWebTest ? '/ [TEST FILES]' : 'WDIO-VSCODE-SERVICE' treeViewSection = await sidebar.getContent().getSection(sectionName) // eslint-disable-next-line @typescript-eslint/await-thenable - await expect(treeViewSection).toBePresent() + await expect(treeViewSection.elem).toBePresent() // one would expect 'mount' here (aria-label) const sectionTitle = isWebTest ? 'mount' : 'wdio-vscode-service' diff --git a/yarn.lock b/yarn.lock index 61c1ec10..2f339678 100644 --- a/yarn.lock +++ b/yarn.lock @@ -682,13 +682,13 @@ "@types/node" "*" "@typescript-eslint/eslint-plugin@^5.42.1": - version "5.42.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.42.1.tgz#696b9cc21dfd4749c1c8ad1307f76a36a00aa0e3" - integrity sha512-LyR6x784JCiJ1j6sH5Y0K6cdExqCCm8DJUTcwG5ThNXJj/G8o5E56u5EdG4SLy+bZAwZBswC+GYn3eGdttBVCg== + version "5.43.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.43.0.tgz#4a5248eb31b454715ddfbf8cfbf497529a0a78bc" + integrity sha512-wNPzG+eDR6+hhW4yobEmpR36jrqqQv1vxBq5LJO3fBAktjkvekfr4BRl+3Fn1CM/A+s8/EiGUbOMDoYqWdbtXA== dependencies: - "@typescript-eslint/scope-manager" "5.42.1" - "@typescript-eslint/type-utils" "5.42.1" - "@typescript-eslint/utils" "5.42.1" + "@typescript-eslint/scope-manager" "5.43.0" + "@typescript-eslint/type-utils" "5.43.0" + "@typescript-eslint/utils" "5.43.0" debug "^4.3.4" ignore "^5.2.0" natural-compare-lite "^1.4.0" @@ -697,71 +697,71 @@ tsutils "^3.21.0" "@typescript-eslint/parser@^5.0.0||^4.0.0", "@typescript-eslint/parser@^5.42.1": - version "5.42.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.42.1.tgz#3e66156f2f74b11690b45950d8f5f28a62751d35" - integrity sha512-kAV+NiNBWVQDY9gDJDToTE/NO8BHi4f6b7zTsVAJoTkmB/zlfOpiEVBzHOKtlgTndCKe8vj9F/PuolemZSh50Q== + version "5.43.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.43.0.tgz#9c86581234b88f2ba406f0b99a274a91c11630fd" + integrity sha512-2iHUK2Lh7PwNUlhFxxLI2haSDNyXvebBO9izhjhMoDC+S3XI9qt2DGFUsiJ89m2k7gGYch2aEpYqV5F/+nwZug== dependencies: - "@typescript-eslint/scope-manager" "5.42.1" - "@typescript-eslint/types" "5.42.1" - "@typescript-eslint/typescript-estree" "5.42.1" + "@typescript-eslint/scope-manager" "5.43.0" + "@typescript-eslint/types" "5.43.0" + "@typescript-eslint/typescript-estree" "5.43.0" debug "^4.3.4" -"@typescript-eslint/scope-manager@5.42.1": - version "5.42.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.42.1.tgz#05e5e1351485637d466464237e5259b49f609b18" - integrity sha512-QAZY/CBP1Emx4rzxurgqj3rUinfsh/6mvuKbLNMfJMMKYLRBfweus8brgXF8f64ABkIZ3zdj2/rYYtF8eiuksQ== +"@typescript-eslint/scope-manager@5.43.0": + version "5.43.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.43.0.tgz#566e46303392014d5d163704724872e1f2dd3c15" + integrity sha512-XNWnGaqAtTJsUiZaoiGIrdJYHsUOd3BZ3Qj5zKp9w6km6HsrjPk/TGZv0qMTWyWj0+1QOqpHQ2gZOLXaGA9Ekw== dependencies: - "@typescript-eslint/types" "5.42.1" - "@typescript-eslint/visitor-keys" "5.42.1" + "@typescript-eslint/types" "5.43.0" + "@typescript-eslint/visitor-keys" "5.43.0" -"@typescript-eslint/type-utils@5.42.1": - version "5.42.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.42.1.tgz#21328feb2d4b193c5852b35aabd241ccc1449daa" - integrity sha512-WWiMChneex5w4xPIX56SSnQQo0tEOy5ZV2dqmj8Z371LJ0E+aymWD25JQ/l4FOuuX+Q49A7pzh/CGIQflxMVXg== +"@typescript-eslint/type-utils@5.43.0": + version "5.43.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.43.0.tgz#91110fb827df5161209ecca06f70d19a96030be6" + integrity sha512-K21f+KY2/VvYggLf5Pk4tgBOPs2otTaIHy2zjclo7UZGLyFH86VfUOm5iq+OtDtxq/Zwu2I3ujDBykVW4Xtmtg== dependencies: - "@typescript-eslint/typescript-estree" "5.42.1" - "@typescript-eslint/utils" "5.42.1" + "@typescript-eslint/typescript-estree" "5.43.0" + "@typescript-eslint/utils" "5.43.0" debug "^4.3.4" tsutils "^3.21.0" -"@typescript-eslint/types@5.42.1": - version "5.42.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.42.1.tgz#0d4283c30e9b70d2aa2391c36294413de9106df2" - integrity sha512-Qrco9dsFF5lhalz+lLFtxs3ui1/YfC6NdXu+RAGBa8uSfn01cjO7ssCsjIsUs484vny9Xm699FSKwpkCcqwWwA== +"@typescript-eslint/types@5.43.0": + version "5.43.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.43.0.tgz#e4ddd7846fcbc074325293515fa98e844d8d2578" + integrity sha512-jpsbcD0x6AUvV7tyOlyvon0aUsQpF8W+7TpJntfCUWU1qaIKu2K34pMwQKSzQH8ORgUrGYY6pVIh1Pi8TNeteg== -"@typescript-eslint/typescript-estree@5.42.1": - version "5.42.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.42.1.tgz#f9a223ecb547a781d37e07a5ac6ba9ff681eaef0" - integrity sha512-qElc0bDOuO0B8wDhhW4mYVgi/LZL+igPwXtV87n69/kYC/7NG3MES0jHxJNCr4EP7kY1XVsRy8C/u3DYeTKQmw== +"@typescript-eslint/typescript-estree@5.43.0": + version "5.43.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.43.0.tgz#b6883e58ba236a602c334be116bfc00b58b3b9f2" + integrity sha512-BZ1WVe+QQ+igWal2tDbNg1j2HWUkAa+CVqdU79L4HP9izQY6CNhXfkNwd1SS4+sSZAP/EthI1uiCSY/+H0pROg== dependencies: - "@typescript-eslint/types" "5.42.1" - "@typescript-eslint/visitor-keys" "5.42.1" + "@typescript-eslint/types" "5.43.0" + "@typescript-eslint/visitor-keys" "5.43.0" debug "^4.3.4" globby "^11.1.0" is-glob "^4.0.3" semver "^7.3.7" tsutils "^3.21.0" -"@typescript-eslint/utils@5.42.1", "@typescript-eslint/utils@^5.10.0": - version "5.42.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.42.1.tgz#2789b1cd990f0c07aaa3e462dbe0f18d736d5071" - integrity sha512-Gxvf12xSp3iYZd/fLqiQRD4uKZjDNR01bQ+j8zvhPjpsZ4HmvEFL/tC4amGNyxN9Rq+iqvpHLhlqx6KTxz9ZyQ== +"@typescript-eslint/utils@5.43.0", "@typescript-eslint/utils@^5.10.0": + version "5.43.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.43.0.tgz#00fdeea07811dbdf68774a6f6eacfee17fcc669f" + integrity sha512-8nVpA6yX0sCjf7v/NDfeaOlyaIIqL7OaIGOWSPFqUKK59Gnumd3Wa+2l8oAaYO2lk0sO+SbWFWRSvhu8gLGv4A== dependencies: "@types/json-schema" "^7.0.9" "@types/semver" "^7.3.12" - "@typescript-eslint/scope-manager" "5.42.1" - "@typescript-eslint/types" "5.42.1" - "@typescript-eslint/typescript-estree" "5.42.1" + "@typescript-eslint/scope-manager" "5.43.0" + "@typescript-eslint/types" "5.43.0" + "@typescript-eslint/typescript-estree" "5.43.0" eslint-scope "^5.1.1" eslint-utils "^3.0.0" semver "^7.3.7" -"@typescript-eslint/visitor-keys@5.42.1": - version "5.42.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.42.1.tgz#df10839adf6605e1cdb79174cf21e46df9be4872" - integrity sha512-LOQtSF4z+hejmpUvitPlc4hA7ERGoj2BVkesOcG91HCn8edLGUXbTrErmutmPbl8Bo9HjAvOO/zBKQHExXNA2A== +"@typescript-eslint/visitor-keys@5.43.0": + version "5.43.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.43.0.tgz#cbbdadfdfea385310a20a962afda728ea106befa" + integrity sha512-icl1jNH/d18OVHLfcwdL3bWUKsBeIiKYTGxMJCoGe7xFht+E4QgzOqoWYrU8XSLJWhVw8nTacbm03v23J/hFTg== dependencies: - "@typescript-eslint/types" "5.42.1" + "@typescript-eslint/types" "5.43.0" eslint-visitor-keys "^3.3.0" "@vscode/test-electron@^2.2.0": @@ -775,9 +775,9 @@ unzipper "^0.10.11" "@wdio/cli@^7.25.4": - version "7.25.4" - resolved "https://registry.yarnpkg.com/@wdio/cli/-/cli-7.25.4.tgz#3bb35c6875eb5a10d408a43b2e0f5df65b83287e" - integrity sha512-p6hDvcY7KJhAN6VJmrp6n2VGi5eXVeN4+AtL/1XyaxNR41L9u5w90GxDr1VbJtHWGbvct0cYKdESoBj0Hj6s9w== + version "7.26.0" + resolved "https://registry.yarnpkg.com/@wdio/cli/-/cli-7.26.0.tgz#20c690a5ede4a35cb2f84da9041c250a6013bc54" + integrity sha512-xG+ZIzPqzz/Tvhfrogd8oNvTXzzdE+cbkmTHjMGo1hnmnoAQPeAEcV/QqaX5CHFE9DjaguEeadqjcZikB5U2GQ== dependencies: "@types/ejs" "^3.0.5" "@types/fs-extra" "^9.0.4" @@ -787,11 +787,11 @@ "@types/lodash.union" "^4.6.6" "@types/node" "^18.0.0" "@types/recursive-readdir" "^2.2.0" - "@wdio/config" "7.25.4" - "@wdio/logger" "7.19.0" + "@wdio/config" "7.26.0" + "@wdio/logger" "7.26.0" "@wdio/protocols" "7.22.0" - "@wdio/types" "7.25.4" - "@wdio/utils" "7.25.4" + "@wdio/types" "7.26.0" + "@wdio/utils" "7.26.0" async-exit-hook "^2.0.1" chalk "^4.0.0" chokidar "^3.0.0" @@ -804,39 +804,39 @@ lodash.union "^4.6.0" mkdirp "^1.0.4" recursive-readdir "^2.2.2" - webdriverio "7.25.4" + webdriverio "7.26.0" yargs "^17.0.0" yarn-install "^1.0.0" -"@wdio/config@7.25.4": - version "7.25.4" - resolved "https://registry.yarnpkg.com/@wdio/config/-/config-7.25.4.tgz#7f1b9f1252cf463541ae75613737f36e7b4baf19" - integrity sha512-vb0emDtD9FbFh/yqW6oNdo2iuhQp8XKj6GX9fyy9v4wZgg3B0HPMVJxhIfcoHz7LMBWlHSo9YdvhFI5EQHRLBA== +"@wdio/config@7.26.0": + version "7.26.0" + resolved "https://registry.yarnpkg.com/@wdio/config/-/config-7.26.0.tgz#56710cf7cf2e5a60eafd91d7a399e49a028b6eb8" + integrity sha512-GO6kFGgFrx2Hiq+Ww6V9I7cZfShPjfPVhPy3uXnKN2B4FilX8ilLAp5cIFuMuHPeOQq0crYX9cnLYXka6dCGgg== dependencies: - "@wdio/logger" "7.19.0" - "@wdio/types" "7.25.4" - "@wdio/utils" "7.25.4" + "@wdio/logger" "7.26.0" + "@wdio/types" "7.26.0" + "@wdio/utils" "7.26.0" deepmerge "^4.0.0" glob "^8.0.3" "@wdio/local-runner@^7.25.4": - version "7.25.4" - resolved "https://registry.yarnpkg.com/@wdio/local-runner/-/local-runner-7.25.4.tgz#86ec16c12ae6a8cd912034acb9c03dfbcb1f5a72" - integrity sha512-ZrvrC/5nzSTzpRbmeHndLm/pwfqM4oAmR3V4eCfF87a423h/Xz2qdDI0G2r3NM7PUkhd8ueECQmgQXeW95DkHw== + version "7.26.0" + resolved "https://registry.yarnpkg.com/@wdio/local-runner/-/local-runner-7.26.0.tgz#a056c6e9d73c7f48e54fe3f07ce573a90dae26ab" + integrity sha512-GdCP7Y8s8qvoctC0WaSGBSmTSbVw74WEJm6Y3n3DpoCI8ABFNkQlhFlqJH+taQDs3sRVEM65bHGcU4C4FOVWXQ== dependencies: "@types/stream-buffers" "^3.0.3" - "@wdio/logger" "7.19.0" - "@wdio/repl" "7.25.4" - "@wdio/runner" "7.25.4" - "@wdio/types" "7.25.4" + "@wdio/logger" "7.26.0" + "@wdio/repl" "7.26.0" + "@wdio/runner" "7.26.0" + "@wdio/types" "7.26.0" async-exit-hook "^2.0.1" split2 "^4.0.0" stream-buffers "^3.0.2" -"@wdio/logger@7.19.0", "@wdio/logger@^7.19.0": - version "7.19.0" - resolved "https://registry.yarnpkg.com/@wdio/logger/-/logger-7.19.0.tgz#23697a4b4aaea56c3bd477a0393af2a5c175fc85" - integrity sha512-xR7SN/kGei1QJD1aagzxs3KMuzNxdT/7LYYx+lt6BII49+fqL/SO+5X0FDCZD0Ds93AuQvvz9eGyzrBI2FFXmQ== +"@wdio/logger@7.26.0", "@wdio/logger@^7.19.0": + version "7.26.0" + resolved "https://registry.yarnpkg.com/@wdio/logger/-/logger-7.26.0.tgz#2c105a00f63a81d52de969fef5a54a9035146b2d" + integrity sha512-kQj9s5JudAG9qB+zAAcYGPHVfATl2oqKgqj47yjehOQ1zzG33xmtL1ArFbQKWhDG32y1A8sN6b0pIqBEIwgg8Q== dependencies: chalk "^4.0.0" loglevel "^1.6.0" @@ -844,9 +844,9 @@ strip-ansi "^6.0.0" "@wdio/logger@^8.0.0-alpha.219": - version "8.0.0-alpha.518" - resolved "https://registry.yarnpkg.com/@wdio/logger/-/logger-8.0.0-alpha.518.tgz#455102acdc5177c96ccdd3f10b7b7425bb24bfce" - integrity sha512-2WmXH+6McMUFrkuEF4dQxp2gIgZys4vpoSt7WUx0402YQoIlsthAbc27/BEWZnheNCzmCe/VkNqysn1LE130zg== + version "8.0.0-alpha.547" + resolved "https://registry.yarnpkg.com/@wdio/logger/-/logger-8.0.0-alpha.547.tgz#815abfaf3454608e6778ca5ed0c67a8ed6a5e630" + integrity sha512-aevGmb8Aw8nJeG2/OSRxBugYGaOaVKBUIqxV/lJPpC/WV/FBL88im/SaLL92vvZUQ5y1hJKPTWJ6NCqM8BRCeQ== dependencies: chalk "^5.1.2" loglevel "^1.6.0" @@ -854,14 +854,14 @@ strip-ansi "^6.0.0" "@wdio/mocha-framework@^7.25.4": - version "7.25.4" - resolved "https://registry.yarnpkg.com/@wdio/mocha-framework/-/mocha-framework-7.25.4.tgz#02f7026feeb1368ef0fda8a62067486d87bab55f" - integrity sha512-psEub7fWD5tJj3PXgo73bbSk58B16UPEq0BGzncbw+swIq9BL4HMUEiUtEVoBllkGaUCKlkfAgfd4mPzGGqpsg== + version "7.26.0" + resolved "https://registry.yarnpkg.com/@wdio/mocha-framework/-/mocha-framework-7.26.0.tgz#757be1648c662d5637b1d4522f826613c5647e95" + integrity sha512-iqAVRDc5ECeRUV2sk6AfCH0eryR3GtdDbDHUr4IxPjb9avtuYhHBR20hCV5c6PAyX33h7ZnHCIIej4bUZcCI6g== dependencies: "@types/mocha" "^10.0.0" - "@wdio/logger" "7.19.0" - "@wdio/types" "7.25.4" - "@wdio/utils" "7.25.4" + "@wdio/logger" "7.26.0" + "@wdio/types" "7.26.0" + "@wdio/utils" "7.26.0" expect-webdriverio "^3.0.0" mocha "^10.0.0" @@ -870,70 +870,70 @@ resolved "https://registry.yarnpkg.com/@wdio/protocols/-/protocols-7.22.0.tgz#d89faef687cb08981d734bbc5e5dffc6fb5a064c" integrity sha512-8EXRR+Ymdwousm/VGtW3H1hwxZ/1g1H99A1lF0U4GuJ5cFWHCd0IVE5H31Z52i8ZruouW8jueMkGZPSo2IIUSQ== -"@wdio/repl@7.25.4": - version "7.25.4" - resolved "https://registry.yarnpkg.com/@wdio/repl/-/repl-7.25.4.tgz#daa780d406ae447ece035a6cfbd2965a555711d3" - integrity sha512-kYhj9gLsUk4HmlXLqkVre+gwbfvw9CcnrHjqIjrmMS4mR9D8zvBb5CItb3ZExfPf9jpFzIFREbCAYoE9x/kMwg== +"@wdio/repl@7.26.0": + version "7.26.0" + resolved "https://registry.yarnpkg.com/@wdio/repl/-/repl-7.26.0.tgz#bf0703f46ad379107b9cfc254c3eccbd5cd6d848" + integrity sha512-2YxbXNfYVGVLrffUJzl/l5s8FziDPl917eLP62gkEH/H5IV27Pnwx3Iyu0KOEaBzgntnURANlwhCZFXQ4OPq8Q== dependencies: - "@wdio/utils" "7.25.4" + "@wdio/utils" "7.26.0" -"@wdio/reporter@7.25.4": - version "7.25.4" - resolved "https://registry.yarnpkg.com/@wdio/reporter/-/reporter-7.25.4.tgz#b6a69652dd0c4ec131255000af128eac403a18b9" - integrity sha512-M37qzEmF5qNffyZmRQGjDlrXqWW21EFvgW8wsv1b/NtfpZc0c0MoRpeh6BnvX1KcE4nCXfjXgSJPOqV4ZCzUEQ== +"@wdio/reporter@7.26.0": + version "7.26.0" + resolved "https://registry.yarnpkg.com/@wdio/reporter/-/reporter-7.26.0.tgz#26c0e7114a4c1e7b29a79e4d178e5312e04d7934" + integrity sha512-kEb7i1A4V4E1wJgdyvLsDbap4cEp1fPZslErGtbAbK+9HI8Lt/SlTZCiOpZbvhgzvawEqOV6UqxZT1RsL8wZWw== dependencies: "@types/diff" "^5.0.0" "@types/node" "^18.0.0" "@types/object-inspect" "^1.8.0" "@types/supports-color" "^8.1.0" "@types/tmp" "^0.2.0" - "@wdio/types" "7.25.4" + "@wdio/types" "7.26.0" diff "^5.0.0" fs-extra "^10.0.0" object-inspect "^1.10.3" supports-color "8.1.1" -"@wdio/runner@7.25.4": - version "7.25.4" - resolved "https://registry.yarnpkg.com/@wdio/runner/-/runner-7.25.4.tgz#9bf4fb43bc0c7f3f32a90f53d821962d4d137f63" - integrity sha512-DZBTKwTMb9Fi/IA1vdblEp7qQvPic+OzavqhKlCRsWI9A4BUNLYd3aby9eIF4sqbOSMRF6TVD7JCWnQaCB5Jww== +"@wdio/runner@7.26.0": + version "7.26.0" + resolved "https://registry.yarnpkg.com/@wdio/runner/-/runner-7.26.0.tgz#c0b2848dc885b655e8690d3e0381dfb0ad221af5" + integrity sha512-DhQiOs10oPeLlv7/R+997arPg5OY7iEgespGkn6r+kdx2o+awxa6PFegQrjJmRKUmNv3TTuKXHouP34TbR/8sw== dependencies: - "@wdio/config" "7.25.4" - "@wdio/logger" "7.19.0" - "@wdio/types" "7.25.4" - "@wdio/utils" "7.25.4" + "@wdio/config" "7.26.0" + "@wdio/logger" "7.26.0" + "@wdio/types" "7.26.0" + "@wdio/utils" "7.26.0" deepmerge "^4.0.0" gaze "^1.1.2" - webdriver "7.25.4" - webdriverio "7.25.4" + webdriver "7.26.0" + webdriverio "7.26.0" "@wdio/spec-reporter@^7.25.4": - version "7.25.4" - resolved "https://registry.yarnpkg.com/@wdio/spec-reporter/-/spec-reporter-7.25.4.tgz#5f6364a254db270f97d46676c3f8b89cbac61632" - integrity sha512-ChHQi/d7Z+XXOR6Bzo1yRmAryMZ4KZ5c/XATVYp66F9p8SygbxXhCis3u+XVXS4TN90ymSKz2EV2iBooAXd4Uw== + version "7.26.0" + resolved "https://registry.yarnpkg.com/@wdio/spec-reporter/-/spec-reporter-7.26.0.tgz#13eaa5a0fd089684d4c1bcd8ac11dc8646afb5b7" + integrity sha512-oisyVWn+MRoq0We0qORoDHNk+iKr7CFG4+IE5GCRecR8cgP7dUjVXZcEbn6blgRpry4jOxsAl24frfaPDOsZVA== dependencies: "@types/easy-table" "^1.2.0" - "@wdio/reporter" "7.25.4" - "@wdio/types" "7.25.4" + "@wdio/reporter" "7.26.0" + "@wdio/types" "7.26.0" chalk "^4.0.0" easy-table "^1.1.1" pretty-ms "^7.0.0" -"@wdio/types@7.25.4", "@wdio/types@^7.25.4": - version "7.25.4" - resolved "https://registry.yarnpkg.com/@wdio/types/-/types-7.25.4.tgz#6f8f028e3108dc880de5068264695f1572e65352" - integrity sha512-muvNmq48QZCvocctnbe0URq2FjJjUPIG4iLoeMmyF0AQgdbjaUkMkw3BHYNHVTbSOU9WMsr2z8alhj/I2H6NRQ== +"@wdio/types@7.26.0", "@wdio/types@^7.25.4": + version "7.26.0" + resolved "https://registry.yarnpkg.com/@wdio/types/-/types-7.26.0.tgz#70bc879c5dbe316a0eebbac4a46f0f66430b1d84" + integrity sha512-mOTfWAGQ+iT58iaZhJMwlUkdEn3XEWE4jthysMLXFnSuZ2eaODVAiK31SmlS/eUqgSIaupeGqYUrtCuSNbLefg== dependencies: "@types/node" "^18.0.0" got "^11.8.1" -"@wdio/utils@7.25.4": - version "7.25.4" - resolved "https://registry.yarnpkg.com/@wdio/utils/-/utils-7.25.4.tgz#ea8745a1fe4933f5fd0e2b80283043fd1a371cbd" - integrity sha512-8iwQDk+foUqSzKZKfhLxjlCKOkfRJPNHaezQoevNgnrTq/t0ek+ldZCATezb9B8jprAuP4mgS9xi22akc6RkzA== +"@wdio/utils@7.26.0": + version "7.26.0" + resolved "https://registry.yarnpkg.com/@wdio/utils/-/utils-7.26.0.tgz#e282d072ccbacbe583f6d1b192c0320cede170c1" + integrity sha512-pVq2MPXZAYLkKGKIIHktHejnHqg4TYKoNYSi2EDv+I3GlT8VZKXHazKhci82ov0tD+GdF27+s4DWNDCfGYfBdQ== dependencies: - "@wdio/logger" "7.19.0" - "@wdio/types" "7.25.4" + "@wdio/logger" "7.26.0" + "@wdio/types" "7.26.0" p-iteration "^1.1.8" abstract-logging@^2.0.0: @@ -974,9 +974,9 @@ ajv@^6.10.0, ajv@^6.11.0, ajv@^6.12.4, ajv@^6.12.6: uri-js "^4.2.2" ajv@^8.1.0: - version "8.11.0" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.11.0.tgz#977e91dd96ca669f54a11e23e378e33b884a565f" - integrity sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg== + version "8.11.2" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.11.2.tgz#aecb20b50607acf2569b6382167b65a96008bb78" + integrity sha512-E4bfmKAhGiSTvMfL1Myyycaub+cUEU2/IvpylXkUu7CHBkBj1f/ikdzbD7YQ6FKUbixDxeYvB/xY4fvyroDlQg== dependencies: fast-deep-equal "^3.1.1" json-schema-traverse "^1.0.0" @@ -1595,9 +1595,9 @@ chromedriver@*: tcp-port-used "^1.0.1" ci-info@^3.2.0: - version "3.5.0" - resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.5.0.tgz#bfac2a29263de4c829d806b1ab478e35091e171f" - integrity sha512-yH4RezKOGlOhxkmhbeNuC4eYZKAUsEaGtBuBzDDP1eFUKiccDWzBABxBfOx31IDwDIXMTxWuwAxUGModvkbuVw== + version "3.6.1" + resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.6.1.tgz#7594f1c95cb7fdfddee7af95a13af7dbc67afdcf" + integrity sha512-up5ggbaDqOqJ4UqLKZ2naVkyqSJQgJi5lwD6b6mM748ysrghDBX0bx/qJTUHzw7zu6Mq4gycviSF5hJnwceD8w== cli-boxes@^3.0.0: version "3.0.0" @@ -2105,23 +2105,23 @@ devtools-protocol@0.0.981744: resolved "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.981744.tgz#9960da0370284577d46c28979a0b32651022bacf" integrity sha512-0cuGS8+jhR67Fy7qG3i3Pc7Aw494sb9yG9QgpG97SFVWwolgYjlhJg7n+UaHxOQT30d1TYu/EYe9k01ivLErIg== -devtools-protocol@^0.0.1061995: - version "0.0.1061995" - resolved "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.1061995.tgz#770aabd3e7a01b5ecbdefa4eace7b69319804b03" - integrity sha512-pKZZWTjWa/IF4ENCg6GN8bu/AxSZgdhjSa26uc23wz38Blt2Tnm9icOPcSG3Cht55rMq35in1w3rWVPcZ60ArA== +devtools-protocol@^0.0.1069585: + version "0.0.1069585" + resolved "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.1069585.tgz#c9a9f330462aabf054d581f254b13774297b84f2" + integrity sha512-sHmkZB6immWQWU4Wx3ogXwxjQUvQc92MmUDL52+q1z2hQmvpOcvDmbsjwX7QZOPTA32dMV7fgT6zUytcpPzy4A== -devtools@7.25.4: - version "7.25.4" - resolved "https://registry.yarnpkg.com/devtools/-/devtools-7.25.4.tgz#76c2bdaee916fa28affca3ff9881ea6b79898075" - integrity sha512-R6/S/dCqxoX4Y6PxIGM9JFAuSRZzUeV5r+CoE/frhmno6mTe7dEEgwkJlfit3LkKRoul8n4DsL2A3QtWOvq5IA== +devtools@7.26.0: + version "7.26.0" + resolved "https://registry.yarnpkg.com/devtools/-/devtools-7.26.0.tgz#3d568aea2238d190ad0cd71c00483c07c707124a" + integrity sha512-+8HNbNpzgo4Sn+WcrvXuwsHW9XPJfLo4bs9lgs6DPJHIIDXYJXQGsd7940wMX0Rp0D2vHXA4ibK0oTI5rogM3Q== dependencies: "@types/node" "^18.0.0" "@types/ua-parser-js" "^0.7.33" - "@wdio/config" "7.25.4" - "@wdio/logger" "7.19.0" + "@wdio/config" "7.26.0" + "@wdio/logger" "7.26.0" "@wdio/protocols" "7.22.0" - "@wdio/types" "7.25.4" - "@wdio/utils" "7.25.4" + "@wdio/types" "7.26.0" + "@wdio/utils" "7.26.0" chrome-launcher "^0.15.0" edge-paths "^2.1.0" puppeteer-core "^13.1.3" @@ -2683,9 +2683,9 @@ expand-template@^2.0.3: integrity sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg== expect-webdriverio@^3.0.0: - version "3.5.1" - resolved "https://registry.yarnpkg.com/expect-webdriverio/-/expect-webdriverio-3.5.1.tgz#87dfa9d02e2b32aed93269f35292a99c0b9e96c9" - integrity sha512-gKOOdCaO2QBHzIqJ7R/Q/XJcCCyhqhA00a/S4CP45nnHxPnidzl+DEjUfuipnLld1n1JCJieSlcl2/I+mQNC/Q== + version "3.5.3" + resolved "https://registry.yarnpkg.com/expect-webdriverio/-/expect-webdriverio-3.5.3.tgz#1f233de6f8abd76e1315f1e34d0a8cc5d34f28fc" + integrity sha512-pMecdn7JOde9ko0F6+v/DOAPTYg7FqmpXEx7dn0AST0+Z/RYj9DHqg40PrUBdHi4gsCHEUE6/ryalf0Nfo7bVQ== dependencies: expect "^28.1.0" jest-matcher-utils "^28.1.0" @@ -4051,9 +4051,9 @@ is-wsl@^2.1.1, is-wsl@^2.2.0: is-docker "^2.0.0" is-yarn-global@^0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/is-yarn-global/-/is-yarn-global-0.4.0.tgz#714d94453327db9ea98fbf1a0c5f2b88f59ddd5c" - integrity sha512-HneQBCrXGBy15QnaDfcn6OLoU8AQPAa0Qn0IeJR/QCo4E8dNZaGGwxpCwWyEBQC5QvFonP8d6t60iGpAHVAfNA== + version "0.4.1" + resolved "https://registry.yarnpkg.com/is-yarn-global/-/is-yarn-global-0.4.1.tgz#b312d902b313f81e4eaf98b6361ba2b45cd694bb" + integrity sha512-/kppl+R+LO5VmhYSEWARUFjodS25D68gvj8W7z0I7OWhUla5xWu8KL6CtB2V0R6yqhnRgbcaREMr4EEM6htLPQ== is2@^2.0.6: version "2.0.9" @@ -6617,9 +6617,9 @@ typedarray-to-buffer@^3.1.5: is-typedarray "^1.0.0" typedoc@^0.23.20: - version "0.23.20" - resolved "https://registry.yarnpkg.com/typedoc/-/typedoc-0.23.20.tgz#c6fa221762322837161932990b79416afcdc895c" - integrity sha512-nfb4Mx05ZZZXux3zPcLuc7+3TVePDW3jTdEBqXdQzJUyEILxoprgPIiTChbvci9crkqNJG9YESmfCptuh9Gn3g== + version "0.23.21" + resolved "https://registry.yarnpkg.com/typedoc/-/typedoc-0.23.21.tgz#2a6b0e155f91ffa9689086706ad7e3e4bc11d241" + integrity sha512-VNE9Jv7BgclvyH9moi2mluneSviD43dCE9pY8RWkO88/DrEgJZk9KpUk7WO468c9WWs/+aG6dOnoH7ccjnErhg== dependencies: lunr "^2.3.9" marked "^4.0.19" @@ -6821,40 +6821,40 @@ web-streams-polyfill@^3.0.3: resolved "https://registry.yarnpkg.com/web-streams-polyfill/-/web-streams-polyfill-3.2.1.tgz#71c2718c52b45fd49dbeee88634b3a60ceab42a6" integrity sha512-e0MO3wdXWKrLbL0DgGnUV7WHVuw9OUvL4hjgnPkIeEvESk74gAITi5G606JtZPp39cd8HA9VQzCIvA49LpPN5Q== -webdriver@7.25.4: - version "7.25.4" - resolved "https://registry.yarnpkg.com/webdriver/-/webdriver-7.25.4.tgz#53c0013addd8b9441e673eefdc2dbcccb208d6b7" - integrity sha512-6nVDwenh0bxbtUkHASz9B8T9mB531Fn1PcQjUGj2t5dolLPn6zuK1D7XYVX40hpn6r3SlYzcZnEBs4X0az5Txg== +webdriver@7.26.0: + version "7.26.0" + resolved "https://registry.yarnpkg.com/webdriver/-/webdriver-7.26.0.tgz#cc20640ee9906c0126044449dfe9562b6277d14e" + integrity sha512-T21T31wq29D/rmpFHcAahhdrvfsfXsLs/LBe2su7wL725ptOEoSssuDXjXMkwjf9MSUIXnTcUIz8oJGbKRUMwQ== dependencies: "@types/node" "^18.0.0" - "@wdio/config" "7.25.4" - "@wdio/logger" "7.19.0" + "@wdio/config" "7.26.0" + "@wdio/logger" "7.26.0" "@wdio/protocols" "7.22.0" - "@wdio/types" "7.25.4" - "@wdio/utils" "7.25.4" + "@wdio/types" "7.26.0" + "@wdio/utils" "7.26.0" got "^11.0.2" ky "0.30.0" lodash.merge "^4.6.1" -webdriverio@7.25.4: - version "7.25.4" - resolved "https://registry.yarnpkg.com/webdriverio/-/webdriverio-7.25.4.tgz#3b74155bdcf199592d7f191a59d0b9a50ce1137b" - integrity sha512-agkgwn2SIk5cAJ03uue1GnGZcUZUDN3W4fUMY9/VfO8bVJrPEgWg31bPguEWPu+YhEB/aBJD8ECxJ3OEKdy4qQ== +webdriverio@7.26.0: + version "7.26.0" + resolved "https://registry.yarnpkg.com/webdriverio/-/webdriverio-7.26.0.tgz#d6036d950ef96fb6cc29c6c5c9cfc452fcafa59a" + integrity sha512-7m9TeP871aYxZYKBI4GDh5aQZLN9Fd/PASu5K/jEIT65J4OBB6g5ZaycGFOmfNHCfjWKjwPXZuKiN1f2mcrcRg== dependencies: "@types/aria-query" "^5.0.0" "@types/node" "^18.0.0" - "@wdio/config" "7.25.4" - "@wdio/logger" "7.19.0" + "@wdio/config" "7.26.0" + "@wdio/logger" "7.26.0" "@wdio/protocols" "7.22.0" - "@wdio/repl" "7.25.4" - "@wdio/types" "7.25.4" - "@wdio/utils" "7.25.4" + "@wdio/repl" "7.26.0" + "@wdio/types" "7.26.0" + "@wdio/utils" "7.26.0" archiver "^5.0.0" aria-query "^5.0.0" css-shorthand-properties "^1.1.1" css-value "^0.0.1" - devtools "7.25.4" - devtools-protocol "^0.0.1061995" + devtools "7.26.0" + devtools-protocol "^0.0.1069585" fs-extra "^10.0.0" grapheme-splitter "^1.0.2" lodash.clonedeep "^4.5.0" @@ -6867,7 +6867,7 @@ webdriverio@7.25.4: resq "^1.9.1" rgb2hex "0.2.5" serialize-error "^8.0.0" - webdriver "7.25.4" + webdriver "7.26.0" webidl-conversions@^3.0.0: version "3.0.1"