@@ -1510,42 +1510,41 @@ func TestLibQueryParameters(t *testing.T) {
1510
1510
require .NoError (t , err )
1511
1511
1512
1512
// Check query=install when a library is installed
1513
- stdout ,
_ ,
err := cli .
Run (
"lib" ,
"install" ,
"[email protected] " ,
"-v" ,
"--log-level" ,
"debug" )
1513
+ stdout ,
_ ,
err := cli .
Run (
"lib" ,
"install" ,
"[email protected] " ,
"-v" ,
"--log-level" ,
"debug" , "--log-format" , "json" )
1514
1514
require .NoError (t , err )
1515
- require .Contains (t , string (stdout ),
1516
- "Starting download \x1b [36murl\x1b [0m=\" https://downloads.arduino.cc/libraries/github.com/arduino-libraries/USBHost-1.0.0.zip?query=install\" \n " )
1515
+ require .Contains (t , string (stdout ), `"url":"https://downloads.arduino.cc/libraries/github.com/arduino-libraries/USBHost-1.0.0.zip?query=install"` )
1517
1516
1518
1517
// Check query=upgrade when a library is upgraded
1519
- stdout , _ , err = cli .Run ("lib" , "upgrade" , "USBHost" , "-v" , "--log-level" , "debug" )
1518
+ stdout , _ , err = cli .Run ("lib" , "upgrade" , "USBHost" , "-v" , "--log-level" , "debug" , "--log-format" , "json" )
1520
1519
require .NoError (t , err )
1521
- require .Contains (t , string (stdout ),
1522
- "Starting download \x1b [36murl\x1b [0m=\" https://downloads.arduino.cc/libraries/github.com/arduino-libraries/USBHost-1.0.5.zip?query=upgrade\" \n " )
1520
+ require .Contains (t , string (stdout ), `"url":"https://downloads.arduino.cc/libraries/github.com/arduino-libraries/USBHost-1.0.5.zip?query=upgrade"` )
1523
1521
1524
1522
// Check query=depends when a library dependency is installed
1525
- stdout ,
_ ,
err = cli .
Run (
"lib" ,
"install " ,
"[email protected] " ,
"-v" , "--log-level ",
"debug " )
1523
+ stdout ,
_ ,
err = cli .
Run (
"lib" ,
"deps " ,
"[email protected] " ,
"--format " ,
"json " )
1526
1524
require .NoError (t , err )
1527
- require .Contains (t , string (stdout ),
1528
- "Starting download \x1b [36murl\x1b [0m=\" https://downloads.arduino.cc/libraries/github.com/MajicDesigns/MD_MAX72XX-3.3.1.zip?query=depends\" \n " )
1525
+ // determine the version installed as dependency
1526
+ MDMAX72XXversion := strings .Trim (requirejson .Parse (t , stdout ).Query (`.dependencies[0].version_required` ).String (), `"` )
1527
+
1528
+ stdout ,
_ ,
err = cli .
Run (
"lib" ,
"install" ,
"[email protected] " ,
"-v" ,
"--log-level" ,
"debug" ,
"--log-format" ,
"json" )
1529
+ require .NoError (t , err )
1530
+ require .Contains (t , string (stdout ), `"url":"https://downloads.arduino.cc/libraries/github.com/MajicDesigns/MD_MAX72XX-` + MDMAX72XXversion + `.zip?query=depends"` )
1529
1531
1530
1532
// Check query=download when a library is downloaded
1531
- stdout ,
_ ,
err = cli .
Run (
"lib" ,
"download" ,
"[email protected] " ,
"-v" ,
"--log-level" ,
"debug" )
1533
+ stdout ,
_ ,
err = cli .
Run (
"lib" ,
"download" ,
"[email protected] " ,
"-v" ,
"--log-level" ,
"debug" , "--log-format" , "json" )
1532
1534
require .NoError (t , err )
1533
- require .Contains (t , string (stdout ),
1534
- "Starting download \x1b [36murl\x1b [0m=\" https://downloads.arduino.cc/libraries/github.com/arduino-libraries/WiFi101-0.16.1.zip?query=download\" \n " )
1535
+ require .Contains (t , string (stdout ), `"url":"https://downloads.arduino.cc/libraries/github.com/arduino-libraries/WiFi101-0.16.1.zip?query=download"` )
1535
1536
1536
1537
// Check query=install-builtin when a library dependency is installed in builtin-directory
1537
1538
cliEnv := cli .GetDefaultEnv ()
1538
1539
cliEnv ["ARDUINO_DIRECTORIES_BUILTIN_LIBRARIES" ] = cli .DataDir ().Join ("libraries" ).String ()
1539
- stdout ,
_ ,
err = cli .
RunWithCustomEnv (
cliEnv ,
"lib" ,
"install" ,
"[email protected] " ,
"--install-in-builtin-dir" ,
"-v" ,
"--log-level" ,
"debug" )
1540
+ stdout ,
_ ,
err = cli .
RunWithCustomEnv (
cliEnv ,
"lib" ,
"install" ,
"[email protected] " ,
"--install-in-builtin-dir" ,
"-v" ,
"--log-level" ,
"debug" , "--log-format" , "json" )
1540
1541
require .NoError (t , err )
1541
- require .Contains (t , string (stdout ),
1542
- "Starting download \x1b [36murl\x1b [0m=\" https://downloads.arduino.cc/libraries/github.com/firmata/Firmata-2.5.3.zip?query=install-builtin\" \n " )
1542
+ require .Contains (t , string (stdout ), `"url":"https://downloads.arduino.cc/libraries/github.com/firmata/Firmata-2.5.3.zip?query=install-builtin` )
1543
1543
1544
1544
// Check query=update-builtin when a library dependency is updated in builtin-directory
1545
- stdout ,
_ ,
err = cli .
RunWithCustomEnv (
cliEnv ,
"lib" ,
"install" ,
"[email protected] " ,
"--install-in-builtin-dir" ,
"-v" ,
"--log-level" ,
"debug" )
1545
+ stdout ,
_ ,
err = cli .
RunWithCustomEnv (
cliEnv ,
"lib" ,
"install" ,
"[email protected] " ,
"--install-in-builtin-dir" ,
"-v" ,
"--log-level" ,
"debug" , "--log-format" , "json" )
1546
1546
require .NoError (t , err )
1547
- require .Contains (t , string (stdout ),
1548
- "Starting download \x1b [36murl\x1b [0m=\" https://downloads.arduino.cc/libraries/github.com/firmata/Firmata-2.5.9.zip?query=upgrade-builtin\" \n " )
1547
+ require .Contains (t , string (stdout ), `"url":"https://downloads.arduino.cc/libraries/github.com/firmata/Firmata-2.5.9.zip?query=upgrade-builtin"` )
1549
1548
}
1550
1549
1551
1550
func TestLibBundlesWhenLibWithTheSameNameIsInstalledGlobally (t * testing.T ) {
0 commit comments