@@ -20,8 +20,7 @@ import { FolderContext } from "../../../src/FolderContext";
2020import { WorkspaceContext } from "../../../src/WorkspaceContext" ;
2121import { Commands } from "../../../src/commands" ;
2222import { activateExtensionForSuite , findWorkspaceFolder } from "../utilities/testutilities" ;
23- import { executeTaskAndWaitForResult , waitForNoRunningTasks } from "../../utilities/tasks" ;
24- import { createBuildAllTask } from "../../../src/tasks/SwiftTaskProvider" ;
23+ import { waitForNoRunningTasks } from "../../utilities/tasks" ;
2524
2625suite ( "Dependency Commmands Test Suite @slow" , function ( ) {
2726 // full workflow's interaction with spm is longer than the default timeout
@@ -59,7 +58,6 @@ suite("Dependency Commmands Test Suite @slow", function () {
5958 setup ( async ( ) => {
6059 await waitForNoRunningTasks ( ) ;
6160 treeProvider = new ProjectPanelProvider ( workspaceContext ) ;
62- await executeTaskAndWaitForResult ( await createBuildAllTask ( depsContext ) ) ;
6361 } ) ;
6462
6563 teardown ( ( ) => {
@@ -69,7 +67,9 @@ suite("Dependency Commmands Test Suite @slow", function () {
6967 async function getDependency ( ) {
7068 const headers = await treeProvider . getChildren ( ) ;
7169 const header = headers . find ( n => n . name === "Dependencies" ) as PackageNode ;
72- expect ( header ) . to . not . be . undefined ;
70+ if ( ! header ) {
71+ return ;
72+ }
7373 const children = await header . getChildren ( ) ;
7474 return children . find (
7575 n => n . name . toLocaleLowerCase ( ) === "swift-markdown"
@@ -83,7 +83,7 @@ suite("Dependency Commmands Test Suite @slow", function () {
8383 async function getDependencyInState ( state : "remote" | "editing" ) {
8484 for ( let i = 0 ; i < 10 ; i ++ ) {
8585 const dep = await getDependency ( ) ;
86- if ( dep . type === state ) {
86+ if ( dep ? .type === state ) {
8787 return dep ;
8888 }
8989 await new Promise ( resolve => setTimeout ( resolve , 1000 ) ) ;
@@ -98,7 +98,8 @@ suite("Dependency Commmands Test Suite @slow", function () {
9898 const result = await vscode . commands . executeCommand (
9999 Commands . USE_LOCAL_DEPENDENCY ,
100100 item ,
101- localDep
101+ localDep ,
102+ depsContext
102103 ) ;
103104 expect ( result ) . to . be . true ;
104105
@@ -112,7 +113,10 @@ suite("Dependency Commmands Test Suite @slow", function () {
112113 await useLocalDependencyTest ( ) ;
113114
114115 // spm reset
115- const result = await vscode . commands . executeCommand ( Commands . RESET_PACKAGE ) ;
116+ const result = await vscode . commands . executeCommand (
117+ Commands . RESET_PACKAGE ,
118+ depsContext
119+ ) ;
116120 expect ( result ) . to . be . true ;
117121
118122 const dep = await getDependencyInState ( "remote" ) ;
@@ -125,7 +129,8 @@ suite("Dependency Commmands Test Suite @slow", function () {
125129
126130 const result = await vscode . commands . executeCommand (
127131 Commands . UNEDIT_DEPENDENCY ,
128- await getDependency ( )
132+ await getDependencyInState ( "editing" ) ,
133+ depsContext
129134 ) ;
130135 expect ( result ) . to . be . true ;
131136
0 commit comments