@@ -20,8 +20,7 @@ import { FolderContext } from "../../../src/FolderContext";
20
20
import { WorkspaceContext } from "../../../src/WorkspaceContext" ;
21
21
import { Commands } from "../../../src/commands" ;
22
22
import { 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" ;
25
24
26
25
suite ( "Dependency Commmands Test Suite @slow" , function ( ) {
27
26
// full workflow's interaction with spm is longer than the default timeout
@@ -59,7 +58,6 @@ suite("Dependency Commmands Test Suite @slow", function () {
59
58
setup ( async ( ) => {
60
59
await waitForNoRunningTasks ( ) ;
61
60
treeProvider = new ProjectPanelProvider ( workspaceContext ) ;
62
- await executeTaskAndWaitForResult ( await createBuildAllTask ( depsContext ) ) ;
63
61
} ) ;
64
62
65
63
teardown ( ( ) => {
@@ -69,7 +67,9 @@ suite("Dependency Commmands Test Suite @slow", function () {
69
67
async function getDependency ( ) {
70
68
const headers = await treeProvider . getChildren ( ) ;
71
69
const header = headers . find ( n => n . name === "Dependencies" ) as PackageNode ;
72
- expect ( header ) . to . not . be . undefined ;
70
+ if ( ! header ) {
71
+ return ;
72
+ }
73
73
const children = await header . getChildren ( ) ;
74
74
return children . find (
75
75
n => n . name . toLocaleLowerCase ( ) === "swift-markdown"
@@ -83,7 +83,7 @@ suite("Dependency Commmands Test Suite @slow", function () {
83
83
async function getDependencyInState ( state : "remote" | "editing" ) {
84
84
for ( let i = 0 ; i < 10 ; i ++ ) {
85
85
const dep = await getDependency ( ) ;
86
- if ( dep . type === state ) {
86
+ if ( dep ? .type === state ) {
87
87
return dep ;
88
88
}
89
89
await new Promise ( resolve => setTimeout ( resolve , 1000 ) ) ;
@@ -98,7 +98,8 @@ suite("Dependency Commmands Test Suite @slow", function () {
98
98
const result = await vscode . commands . executeCommand (
99
99
Commands . USE_LOCAL_DEPENDENCY ,
100
100
item ,
101
- localDep
101
+ localDep ,
102
+ depsContext
102
103
) ;
103
104
expect ( result ) . to . be . true ;
104
105
@@ -112,7 +113,10 @@ suite("Dependency Commmands Test Suite @slow", function () {
112
113
await useLocalDependencyTest ( ) ;
113
114
114
115
// 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
+ ) ;
116
120
expect ( result ) . to . be . true ;
117
121
118
122
const dep = await getDependencyInState ( "remote" ) ;
@@ -125,7 +129,8 @@ suite("Dependency Commmands Test Suite @slow", function () {
125
129
126
130
const result = await vscode . commands . executeCommand (
127
131
Commands . UNEDIT_DEPENDENCY ,
128
- await getDependency ( )
132
+ await getDependencyInState ( "editing" ) ,
133
+ depsContext
129
134
) ;
130
135
expect ( result ) . to . be . true ;
131
136
0 commit comments