Fix order vscode tests

iterative · Sep 21, 2023 · 08bc33d · 08bc33d
1 parent 2380be6
commit 08bc33d
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 5 deletions.
diff --git a/extension/src/test/fixtures/expShow/base/columns.ts b/extension/src/test/fixtures/expShow/base/columns.ts
@@ -10,6 +10,8 @@ const nestedParamsFile = join('nested', 'params.yaml')
 
 export const dataColumnOrder: string[] = [
   'id',
+  'branch',
+  'commit',
   'Created',
   'metrics:summary.json:accuracy',
   'metrics:summary.json:loss',

diff --git a/extension/src/test/suite/experiments/columns/tree.test.ts b/extension/src/test/suite/experiments/columns/tree.test.ts
@@ -363,8 +363,9 @@ suite('Experiments Columns Tree Test Suite', () => {
 
       const firstColumns = []
       const otherColumns = []
+      const defaultColumns = ['id', 'branch', 'commit']
       for (const column of columnsOrder) {
-        if (column === 'id') {
+        if (defaultColumns.includes(column)) {
           continue
         }
         if (
@@ -410,7 +411,7 @@ suite('Experiments Columns Tree Test Suite', () => {
       ])
 
       expect(columnsModel.getColumnOrder()).to.deep.equal([
-        'id',
+        ...defaultColumns,
         ...firstColumns,
         ...otherColumns
       ])

diff --git a/extension/src/test/suite/experiments/index.test.ts b/extension/src/test/suite/experiments/index.test.ts
@@ -1096,9 +1096,12 @@ suite('Experiments Test Suite', () => {
       })
       await messageSent
 
-      const [id, firstColumn] = messageSpy.lastCall.args[0].columnOrder
+      const [id, branch, commit, firstColumn] =
+        messageSpy.lastCall.args[0].columnOrder
 
       expect(id).to.equal('id')
+      expect(commit).to.equal('commit')
+      expect(branch).to.equal('branch')
       expect(firstColumn).to.equal(movedColumn)
     }).timeout(WEBVIEW_TEST_TIMEOUT)
 
@@ -1126,8 +1129,11 @@ suite('Experiments Test Suite', () => {
 
       expect(paramsYamlColumns).to.be.greaterThan(6)
 
-      const [id, ...columns] = messageSpy.lastCall.args[0].columnOrder
+      const [id, branch, commit, ...columns] =
+        messageSpy.lastCall.args[0].columnOrder
       expect(id).to.equal('id')
+      expect(branch).to.equal('branch')
+      expect(commit).to.equal('commit')
 
       let params = 0
       let other = 0

diff --git a/extension/src/test/util/mocha/index.ts b/extension/src/test/util/mocha/index.ts
@@ -29,7 +29,7 @@ export const runMocha = async (
   try {
     // eslint-disable-next-line sonarjs/cognitive-complexity
     await new Promise<void>((resolve, reject) => {
-      glob(`**/**.test.${ext}`, { cwd }, (err, files) => {
+      glob(`**/experiments/**.test.${ext}`, { cwd }, (err, files) => {
         if (err) {
           return reject(err)
         }