Skip to content

Commit c784da7

Browse files
committed
Added method to get cli download dir
1 parent 0fd789d commit c784da7

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

Diff for: internal/integrationtest/arduino-cli.go

+5
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,11 @@ func (cli *ArduinoCLI) WorkingDir() *paths.Path {
137137
return cli.workingDir
138138
}
139139

140+
// DownloadDir returns the download directory
141+
func (cli *ArduinoCLI) DownloadDir() *paths.Path {
142+
return cli.stagingDir
143+
}
144+
140145
// CopySketch copies a sketch inside the testing environment and returns its path
141146
func (cli *ArduinoCLI) CopySketch(sketchName string) *paths.Path {
142147
p, err := paths.Getwd()

Diff for: internal/integrationtest/config/config_test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ func TestInitWithExistingCustomConfig(t *testing.T) {
5050
require.Equal(t, config["board_manager"]["additional_urls"].([]interface{})[0].(string), "https://example.com")
5151
require.Equal(t, config["daemon"]["port"].(string), "50051")
5252
require.Equal(t, config["directories"]["data"].(string), cli.DataDir().String())
53-
require.Equal(t, config["directories"]["downloads"].(string), env.SharedDownloadsDir().String())
53+
require.Equal(t, config["directories"]["downloads"].(string), cli.DownloadDir().String())
5454
require.Equal(t, config["directories"]["user"].(string), cli.SketchbookDir().String())
5555
require.Empty(t, config["logging"]["file"])
5656
require.Equal(t, config["logging"]["format"].(string), "text")
@@ -71,7 +71,7 @@ func TestInitWithExistingCustomConfig(t *testing.T) {
7171
require.Empty(t, config["board_manager"]["additional_urls"])
7272
require.Equal(t, config["daemon"]["port"].(string), "50051")
7373
require.Equal(t, config["directories"]["data"].(string), cli.DataDir().String())
74-
require.Equal(t, config["directories"]["downloads"].(string), env.SharedDownloadsDir().String())
74+
require.Equal(t, config["directories"]["downloads"].(string), cli.DownloadDir().String())
7575
require.Equal(t, config["directories"]["user"].(string), cli.SketchbookDir().String())
7676
require.Empty(t, config["logging"]["file"])
7777
require.Equal(t, config["logging"]["format"].(string), "text")
@@ -96,7 +96,7 @@ func TestInitOverwriteExistingCustomFile(t *testing.T) {
9696
require.Equal(t, config["board_manager"]["additional_urls"].([]interface{})[0].(string), "https://example.com")
9797
require.Equal(t, config["daemon"]["port"].(string), "50051")
9898
require.Equal(t, config["directories"]["data"].(string), cli.DataDir().String())
99-
require.Equal(t, config["directories"]["downloads"].(string), env.SharedDownloadsDir().String())
99+
require.Equal(t, config["directories"]["downloads"].(string), cli.DownloadDir().String())
100100
require.Equal(t, config["directories"]["user"].(string), cli.SketchbookDir().String())
101101
require.Empty(t, config["logging"]["file"])
102102
require.Equal(t, config["logging"]["format"].(string), "text")
@@ -115,7 +115,7 @@ func TestInitOverwriteExistingCustomFile(t *testing.T) {
115115
require.Empty(t, config["board_manager"]["additional_urls"])
116116
require.Equal(t, config["daemon"]["port"].(string), "50051")
117117
require.Equal(t, config["directories"]["data"].(string), cli.DataDir().String())
118-
require.Equal(t, config["directories"]["downloads"].(string), env.SharedDownloadsDir().String())
118+
require.Equal(t, config["directories"]["downloads"].(string), cli.DownloadDir().String())
119119
require.Equal(t, config["directories"]["user"].(string), cli.SketchbookDir().String())
120120
require.Empty(t, config["logging"]["file"])
121121
require.Equal(t, config["logging"]["format"].(string), "text")

0 commit comments

Comments
 (0)