Skip to content

Commit 3f06917

Browse files
committed
test: fix failing tests on Windows
1 parent 12f23b9 commit 3f06917

File tree

3 files changed

+14
-7
lines changed

3 files changed

+14
-7
lines changed

test/fixtures/dart-sdk/bin/pub

Whitespace-only changes.

test/fixtures/dart-sdk/bin/pub.exe

Whitespace-only changes.

test/lsp-dart-utils-test.el

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
(ert-deftest lsp-dart--flutter-repo-p--true-test ()
2626
(with-mock
2727
(mock (locate-dominating-file * "flutter") => "/sdk/bin")
28-
(mock (file-regular-p (f-join (f-root) "/sdk/bin/flutter")) => t)
29-
(mock (file-directory-p (f-join (f-root) "/sdk/bin/cache/dart-sdk")) => t)
28+
(mock (file-regular-p (f-join (f-root) "sdk/bin/flutter")) => t)
29+
(mock (file-directory-p (f-join (f-root) "sdk/bin/cache/dart-sdk")) => t)
3030
(should (lsp-dart--flutter-repo-p))))
3131

3232
(ert-deftest lsp-dart--flutter-repo-p--not-flutter-executable-test ()
@@ -38,8 +38,8 @@
3838
(ert-deftest lsp-dart--flutter-repo-p--not-flutter-executable-test ()
3939
(with-mock
4040
(mock (locate-dominating-file * "flutter") => "/not-sdk/bin")
41-
(mock (file-regular-p (f-join (f-root) "/not-sdk/bin/flutter")) => t)
42-
(mock (file-directory-p (f-join (f-root) "/not-sdk/bin/cache/dart-sdk")) => nil)
41+
(mock (file-regular-p (f-join (f-root) "not-sdk/bin/flutter")) => t)
42+
(mock (file-directory-p (f-join (f-root) "not-sdk/bin/cache/dart-sdk")) => nil)
4343
(should-not (lsp-dart--flutter-repo-p))))
4444

4545
(ert-deftest lsp-dart-flutter-project-p--flutter-repo-test ()
@@ -73,7 +73,7 @@
7373

7474
(ert-deftest lsp-dart-get-sdk-dir--flutter-project-test ()
7575
(let ((dart-sdk (if (eq system-type 'windows-nt)
76-
(f-join (f-root) "/flutter-sdk/bin/cache/dart-sdk/")
76+
(f-join (f-root) "flutter-sdk/bin/cache/dart-sdk/")
7777
"/flutter-sdk/bin/cache/dart-sdk/")))
7878
(lsp-dart-test-from-flutter-project
7979
(mock (lsp-dart-flutter-project-p) => t)
@@ -108,12 +108,19 @@
108108
(ert-deftest lsp-dart-pub-command--old-version-test ()
109109
(lsp-dart-test-with-dart-sdk
110110
(mock (lsp-dart-get-dart-version) => "2.15.5")
111-
(should (equal (lsp-dart-pub-command) (list (f-expand "bin/pub" dart-sdk))))))
111+
(should (equal (lsp-dart-pub-command) (list (f-expand (if (eq system-type 'windows-nt)
112+
"bin/pub.exe"
113+
"bin/pub")
114+
dart-sdk))))))
112115

113116
(ert-deftest lsp-dart-pub-command--new-version-test ()
114117
(lsp-dart-test-with-dart-sdk
115118
(mock (lsp-dart-get-dart-version) => "2.16.0")
116-
(should (equal (lsp-dart-pub-command) (list (f-expand "bin/dart" dart-sdk) "pub")))))
119+
(should (equal (lsp-dart-pub-command) (list (f-expand (if (eq system-type 'windows-nt)
120+
"bin/dart.bat"
121+
"bin/dart")
122+
dart-sdk)
123+
"pub")))))
117124

118125
(ert-deftest lsp-dart-pub-snapshot-command--test ()
119126
(lsp-dart-test-with-dart-sdk

0 commit comments

Comments
 (0)