fix test pipeline builders

iterative · Jul 13, 2023 · 4399389 · 4399389
1 parent ad619be
commit 4399389
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 24 deletions.
diff --git a/extension/src/test/suite/experiments/index.test.ts b/extension/src/test/suite/experiments/index.test.ts
@@ -1517,8 +1517,10 @@ suite('Experiments Test Suite', () => {
       const resourceLocator = disposable.track(
         new ResourceLocator(extensionUri)
       )
+      stub(dvcReader, 'stageList').resolves('train')
+      stub(dvcReader, 'dag').resolves('')
+
       const pipeline = buildExperimentsPipeline({
-        dvcReader,
         disposer: disposable,
         dvcRoot: dvcDemoPath,
         internalCommands

diff --git a/extension/src/test/suite/experiments/util.ts b/extension/src/test/suite/experiments/util.ts
@@ -64,12 +64,13 @@ export const buildExperiments = ({
     mockUpdateExperimentsData
   )
 
+  stub(dvcReader, 'stageList').resolves(stageList ?? undefined)
+  stub(dvcReader, 'dag').resolves('')
+
   const pipeline = buildExperimentsPipeline({
     disposer,
-    dvcReader,
     dvcRoot,
-    internalCommands,
-    stageList
+    internalCommands
   })
   const mockCheckOrAddPipeline = stub(pipeline, 'checkOrAddPipeline')
   const mockSelectBranches = stub().resolves(['main', 'other'])
@@ -126,10 +127,9 @@ export const buildExperiments = ({
 
 export const buildMultiRepoExperiments = (disposer: SafeWatcherDisposer) => {
   const {
-    dvcReader,
-    internalCommands,
     experiments: mockExperiments,
     gitReader,
+    internalCommands,
     messageSpy,
     resourceLocator
   } = buildExperiments({
@@ -147,7 +147,6 @@ export const buildMultiRepoExperiments = (disposer: SafeWatcherDisposer) => {
 
   const pipeline = buildExperimentsPipeline({
     disposer,
-    dvcReader,
     dvcRoot: dvcDemoPath,
     internalCommands
   })
@@ -177,9 +176,11 @@ export const buildSingleRepoExperiments = (disposer: SafeWatcherDisposer) => {
   const workspaceExperiments = disposer.track(
     new WorkspaceExperiments(internalCommands, buildMockMemento())
   )
+  stub(dvcReader, 'stageList').resolves('train')
+  stub(dvcReader, 'dag').resolves('')
+
   const pipeline = buildExperimentsPipeline({
     disposer,
-    dvcReader,
     dvcRoot: dvcDemoPath,
     internalCommands
   })

diff --git a/extension/src/test/suite/pipeline/util.ts b/extension/src/test/suite/pipeline/util.ts
@@ -5,30 +5,20 @@ import { Disposer } from '../../../extension'
 import { Pipeline } from '../../../pipeline'
 import { PipelineData } from '../../../pipeline/data'
 import { dvcDemoPath } from '../../util'
-import { DvcReader } from '../../../cli/dvc/reader'
 import { buildDependencies } from '../util'
 import { PipelineModel } from '../../../pipeline/model'
 
 export const buildExperimentsPipeline = ({
-  dag = '',
   disposer,
   dvcRoot = dvcDemoPath,
   dvcYamls,
-  dvcReader,
-  internalCommands,
-  stageList = 'train'
+  internalCommands
 }: {
-  dag?: string
   disposer: Disposer
   dvcRoot?: string
   dvcYamls?: string[]
-  dvcReader: DvcReader
   internalCommands: InternalCommands
-  stageList?: string | null
 }): Pipeline => {
-  stub(dvcReader, 'stageList').resolves(stageList ?? undefined)
-  stub(dvcReader, 'dag').resolves(dag)
-
   const data = new PipelineData(dvcRoot, internalCommands)
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   stub(data as any, 'findDvcYamls').resolves(
@@ -54,14 +44,14 @@ export const buildPipeline = ({
   stageList?: string | null
 }) => {
   const { dvcReader, internalCommands } = buildDependencies(disposer)
+  stub(dvcReader, 'stageList').resolves(stageList ?? undefined)
+  stub(dvcReader, 'dag').resolves(dag)
+
   const pipeline = buildExperimentsPipeline({
-    dag,
     disposer,
-    dvcReader,
     dvcRoot,
     dvcYamls,
-    internalCommands,
-    stageList
+    internalCommands
   })
   return {
     dvcReader,

diff --git a/extension/src/test/suite/plots/util.ts b/extension/src/test/suite/plots/util.ts
@@ -56,9 +56,11 @@ export const buildPlots = async ({
     MOCK_IMAGE_MTIME
   )
 
+  stub(dvcReader, 'stageList').resolves('train')
+  stub(dvcReader, 'dag').resolves('')
+
   const pipeline = buildExperimentsPipeline({
     disposer,
-    dvcReader,
     dvcRoot: dvcDemoPath,
     internalCommands
   })