haskal
/
starship
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix(test): do NOT quote argument values for mocked invocations (#1527) 

Co-authored-by: Thomas O'Donnell <andytom@users.noreply.github.com>
This commit is contained in:
Dario Vladović 2020-08-24 19:05:43 +02:00 committed by GitHub
parent 46a51d7941
commit faba2d104d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/modules/erlang.rs
View File

@ -57,10 +57,10 @@ fn get_erlang_version() -> Option<String> {
&[ &[
"-noshell", "-noshell",
"-eval", "-eval",
"'Fn=filename:join([code:root_dir(),\"releases\",erlang:system_info(otp_release),\"OTP_VERSION\"]),\ "Fn=filename:join([code:root_dir(),\"releases\",erlang:system_info(otp_release),\"OTP_VERSION\"]),\
{ok,Content}=file:read_file(Fn),\ {ok,Content}=file:read_file(Fn),\
io:format(\"~s\",[Content]),\ io:format(\"~s\",[Content]),\
halt(0).'" halt(0)."
] ]
)?.stdout.trim().to_string()) )?.stdout.trim().to_string())
} }

2
src/modules/php.rs
View File

@ -24,7 +24,7 @@ pub fn module<'a>(context: &'a Context) -> Option<Module<'a>> {
"php", "php",
&[ &[
"-nr", "-nr",
"'echo PHP_MAJOR_VERSION.\".\".PHP_MINOR_VERSION.\".\".PHP_RELEASE_VERSION;'", "echo PHP_MAJOR_VERSION.\".\".PHP_MINOR_VERSION.\".\".PHP_RELEASE_VERSION;",
], ],
) { ) {
Some(php_cmd_output) => { Some(php_cmd_output) => {

2
src/utils.rs
View File

@ -115,7 +115,7 @@ active boot switches: -d:release\n",
stdout: String::from("5.26.1"), stdout: String::from("5.26.1"),
stderr: String::default(), stderr: String::default(),
}), }),
"php -nr 'echo PHP_MAJOR_VERSION.\".\".PHP_MINOR_VERSION.\".\".PHP_RELEASE_VERSION;'" => { "php -nr echo PHP_MAJOR_VERSION.\".\".PHP_MINOR_VERSION.\".\".PHP_RELEASE_VERSION;" => {
Some(CommandOutput { Some(CommandOutput {
stdout: String::from("7.3.8"), stdout: String::from("7.3.8"),
stderr: String::default(), stderr: String::default(),