Fix e2e tests (SCM entry removed by insiders) (#4955)

Author: mattseddon

extension/src/test/e2e/extension.test.ts

@@ -192,7 +192,6 @@ describe('Source Control View', function () {
   // eslint-disable-next-line sonarjs/cognitive-complexity
   it('should show the expected changes after running an experiment', async function () {
     const expectedScmItemLabels = [
-      'demo DVC',
       'hist.csv',
       'model.pt',
       'plots, training',
@@ -216,19 +215,19 @@ describe('Source Control View', function () {
     const expectedScmSet = new Set(expectedScmItemLabels)
     let dvcTreeItemLabels: string[] = []
 
+    let openView = true
+
     await browser.waitUntil(
       async () => {
         dvcTreeItemLabels = []
-        const treeItems = await findScmTreeItems()
+        const treeItems = await findScmTreeItems(openView)
+        openView = false
         for (const treeItem of treeItems) {
           const treeItemLabel = await getLabel(treeItem)
           if (!expectedScmSet.has(treeItemLabel)) {
             continue
           }
           dvcTreeItemLabels.push(treeItemLabel)
-          if (treeItemLabel === 'demo DVC') {
-            continue
-          }
 
           const tooltip = await findDecorationTooltip(treeItem)
           expect(tooltip).toBeTruthy()

extension/src/test/e2e/util.ts

@@ -220,18 +220,24 @@ export const expectAllPlotsToBeFilled = async (webview: PlotsWebview) => {
   }
 }
 
-export const findScmTreeItems = async () => {
-  const workbench = await browser.getWorkbench()
-  const activityBar = workbench.getActivityBar()
-  const sourceControlIcon = await activityBar.getViewControl('Source Control')
-
-  await sourceControlIcon?.openView()
-
-  const visibleItems = await findCurrentTreeItems()
-
-  await visibleItems[visibleItems.length - 1].click()
+export const findScmTreeItems = async (openView: boolean) => {
+  if (openView) {
+    await browser
+      .action('key')
+      .down(Key.Control)
+      .down(Key.Shift)
+      .down('g')
+      .up(Key.Control)
+      .up(Key.Shift)
+      .up('g')
+      .pause(100)
+      .down(Key.Tab)
+      .up(Key.Tab)
+      .pause(100)
+      .perform()
+  }
 
-  for (let i = 0; i < 20; i++) {
+  for (let i = 0; i < 30; i++) {
     await browser.keys('ArrowDown')
   }
 

extension/src/test/e2e/wdio.conf.ts

@@ -51,7 +51,8 @@ export const config: Options.Testrunner = {
       'wdio:vscodeOptions': {
         extensionPath,
         userSettings: {
-          'dvc.pythonPath': getVenvBinPath(dvcDemoPath, '.env', 'python')
+          'dvc.pythonPath': getVenvBinPath(dvcDemoPath, '.env', 'python'),
+          'window.commandCenter': false
         },
         verboseLogging: false,
         workspacePath: dvcDemoPath