mirror of
https://github.com/nushell/nushell.git
synced 2024-11-22 16:33:37 +01:00
c7e128eed1
Add `table<key, value>` support to `url join` for the `params` field, and as input to `url build-query` #14162 # Description ```nushell { "scheme": "http", "username": "usr", "password": "pwd", "host": "localhost", "params": [ ["key", "value"]; ["par_1", "aaa"], ["par_2", "bbb"], ["par_1", "ccc"], ["par_2", "ddd"], ], "port": "1234", } | url join ``` ``` http://usr:pwd@localhost:1234?par_1=aaa&par_2=bbb&par_1=ccc&par_2=ddd ``` --- ```nushell [ ["key", "value"]; ["par_1", "aaa"], ["par_2", "bbb"], ["par_1", "ccc"], ["par_2", "ddd"], ] | url build-query ``` ``` par_1=aaa&par_2=bbb&par_1=ccc&par_2=ddd ``` # User-Facing Changes ## `url build-query` - can no longer accept one row table input as if it were a record --------- Co-authored-by: Darren Schroeder <343840+fdncred@users.noreply.github.com>
431 lines
10 KiB
Rust
431 lines
10 KiB
Rust
use nu_test_support::{nu, pipeline};
|
|
|
|
#[test]
|
|
fn url_join_simple() {
|
|
let actual = nu!(pipeline(
|
|
r#"
|
|
{
|
|
"scheme": "http",
|
|
"username": "",
|
|
"password": "",
|
|
"host": "localhost",
|
|
"port": "",
|
|
} | url join
|
|
"#
|
|
));
|
|
|
|
assert_eq!(actual.out, "http://localhost");
|
|
}
|
|
|
|
#[test]
|
|
fn url_join_with_only_user() {
|
|
let actual = nu!(pipeline(
|
|
r#"
|
|
{
|
|
"scheme": "http",
|
|
"username": "usr",
|
|
"password": "",
|
|
"host": "localhost",
|
|
"port": "",
|
|
} | url join
|
|
"#
|
|
));
|
|
|
|
assert_eq!(actual.out, "http://usr@localhost");
|
|
}
|
|
|
|
#[test]
|
|
fn url_join_with_only_pwd() {
|
|
let actual = nu!(pipeline(
|
|
r#"
|
|
{
|
|
"scheme": "http",
|
|
"username": "",
|
|
"password": "pwd",
|
|
"host": "localhost",
|
|
"port": "",
|
|
} | url join
|
|
"#
|
|
));
|
|
|
|
assert_eq!(actual.out, "http://localhost");
|
|
}
|
|
|
|
#[test]
|
|
fn url_join_with_user_and_pwd() {
|
|
let actual = nu!(pipeline(
|
|
r#"
|
|
{
|
|
"scheme": "http",
|
|
"username": "usr",
|
|
"password": "pwd",
|
|
"host": "localhost",
|
|
"port": "",
|
|
} | url join
|
|
"#
|
|
));
|
|
|
|
assert_eq!(actual.out, "http://usr:pwd@localhost");
|
|
}
|
|
|
|
#[test]
|
|
fn url_join_with_query() {
|
|
let actual = nu!(pipeline(
|
|
r#"
|
|
{
|
|
"scheme": "http",
|
|
"username": "usr",
|
|
"password": "pwd",
|
|
"host": "localhost",
|
|
"query": "par_1=aaa&par_2=bbb"
|
|
"port": "",
|
|
} | url join
|
|
"#
|
|
));
|
|
|
|
assert_eq!(actual.out, "http://usr:pwd@localhost?par_1=aaa&par_2=bbb");
|
|
}
|
|
|
|
#[test]
|
|
fn url_join_with_params() {
|
|
let actual = nu!(pipeline(
|
|
r#"
|
|
{
|
|
"scheme": "http",
|
|
"username": "usr",
|
|
"password": "pwd",
|
|
"host": "localhost",
|
|
"params": {
|
|
"par_1": "aaa",
|
|
"par_2": "bbb"
|
|
},
|
|
"port": "1234",
|
|
} | url join
|
|
"#
|
|
));
|
|
|
|
assert_eq!(
|
|
actual.out,
|
|
"http://usr:pwd@localhost:1234?par_1=aaa&par_2=bbb"
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn url_join_with_same_query_and_params() {
|
|
let actual = nu!(pipeline(
|
|
r#"
|
|
{
|
|
"scheme": "http",
|
|
"username": "usr",
|
|
"password": "pwd",
|
|
"host": "localhost",
|
|
"query": "par_1=aaa&par_2=bbb",
|
|
"params": {
|
|
"par_1": "aaa",
|
|
"par_2": "bbb"
|
|
},
|
|
"port": "1234",
|
|
} | url join
|
|
"#
|
|
));
|
|
|
|
assert_eq!(
|
|
actual.out,
|
|
"http://usr:pwd@localhost:1234?par_1=aaa&par_2=bbb"
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn url_join_with_different_query_and_params() {
|
|
let actual = nu!(pipeline(
|
|
r#"
|
|
{
|
|
"scheme": "http",
|
|
"username": "usr",
|
|
"password": "pwd",
|
|
"host": "localhost",
|
|
"query": "par_1=aaa&par_2=bbb",
|
|
"params": {
|
|
"par_1": "aaab",
|
|
"par_2": "bbb"
|
|
},
|
|
"port": "1234",
|
|
} | url join
|
|
"#
|
|
));
|
|
|
|
assert!(actual
|
|
.err
|
|
.contains("Mismatch, query string from params is: ?par_1=aaab&par_2=bbb"));
|
|
assert!(actual
|
|
.err
|
|
.contains("instead query is: ?par_1=aaa&par_2=bbb"));
|
|
|
|
let actual = nu!(pipeline(
|
|
r#"
|
|
{
|
|
"scheme": "http",
|
|
"username": "usr",
|
|
"password": "pwd",
|
|
"host": "localhost",
|
|
"params": {
|
|
"par_1": "aaab",
|
|
"par_2": "bbb"
|
|
},
|
|
"query": "par_1=aaa&par_2=bbb",
|
|
"port": "1234",
|
|
} | url join
|
|
"#
|
|
));
|
|
|
|
assert!(actual
|
|
.err
|
|
.contains("Mismatch, query param is: par_1=aaa&par_2=bbb"));
|
|
assert!(actual
|
|
.err
|
|
.contains("instead query string from params is: ?par_1=aaab&par_2=bbb"));
|
|
}
|
|
|
|
#[test]
|
|
fn url_join_with_invalid_params() {
|
|
let actual = nu!(pipeline(
|
|
r#"
|
|
{
|
|
"scheme": "http",
|
|
"username": "usr",
|
|
"password": "pwd",
|
|
"host": "localhost",
|
|
"params": "aaa",
|
|
"port": "1234",
|
|
} | url join
|
|
"#
|
|
));
|
|
|
|
assert!(actual
|
|
.err
|
|
.contains("Key params has to be a record or a table"));
|
|
}
|
|
|
|
#[test]
|
|
fn url_join_with_port() {
|
|
let actual = nu!(pipeline(
|
|
r#"
|
|
{
|
|
"scheme": "http",
|
|
"host": "localhost",
|
|
"port": "1234",
|
|
} | url join
|
|
"#
|
|
));
|
|
|
|
assert_eq!(actual.out, "http://localhost:1234");
|
|
|
|
let actual = nu!(pipeline(
|
|
r#"
|
|
{
|
|
"scheme": "http",
|
|
"host": "localhost",
|
|
"port": 1234,
|
|
} | url join
|
|
"#
|
|
));
|
|
|
|
assert_eq!(actual.out, "http://localhost:1234");
|
|
}
|
|
|
|
#[test]
|
|
fn url_join_with_invalid_port() {
|
|
let actual = nu!(pipeline(
|
|
r#"
|
|
{
|
|
"scheme": "http",
|
|
"host": "localhost",
|
|
"port": "aaaa",
|
|
} | url join
|
|
"#
|
|
));
|
|
|
|
assert!(actual
|
|
.err
|
|
.contains("Port parameter should represent an unsigned int"));
|
|
|
|
let actual = nu!(pipeline(
|
|
r#"
|
|
{
|
|
"scheme": "http",
|
|
"host": "localhost",
|
|
"port": [],
|
|
} | url join
|
|
"#
|
|
));
|
|
|
|
assert!(actual
|
|
.err
|
|
.contains("Port parameter should be an unsigned int or a string representing it"));
|
|
}
|
|
|
|
#[test]
|
|
fn url_join_with_missing_scheme() {
|
|
let actual = nu!(pipeline(
|
|
r#"
|
|
{
|
|
"host": "localhost"
|
|
} | url join
|
|
"#
|
|
));
|
|
|
|
assert!(actual.err.contains("missing parameter: scheme"));
|
|
}
|
|
|
|
#[test]
|
|
fn url_join_with_missing_host() {
|
|
let actual = nu!(pipeline(
|
|
r#"
|
|
{
|
|
"scheme": "https"
|
|
} | url join
|
|
"#
|
|
));
|
|
|
|
assert!(actual.err.contains("missing parameter: host"));
|
|
}
|
|
|
|
#[test]
|
|
fn url_join_with_fragment() {
|
|
let actual = nu!(pipeline(
|
|
r#"
|
|
{
|
|
"scheme": "http",
|
|
"username": "usr",
|
|
"password": "pwd",
|
|
"host": "localhost",
|
|
"fragment": "frag",
|
|
"port": "1234",
|
|
} | url join
|
|
"#
|
|
));
|
|
|
|
assert_eq!(actual.out, "http://usr:pwd@localhost:1234#frag");
|
|
}
|
|
|
|
#[test]
|
|
fn url_join_with_fragment_and_params() {
|
|
let actual = nu!(pipeline(
|
|
r#"
|
|
{
|
|
"scheme": "http",
|
|
"username": "usr",
|
|
"password": "pwd",
|
|
"host": "localhost",
|
|
"params": {
|
|
"par_1": "aaa",
|
|
"par_2": "bbb"
|
|
},
|
|
"port": "1234",
|
|
"fragment": "frag"
|
|
} | url join
|
|
"#
|
|
));
|
|
|
|
assert_eq!(
|
|
actual.out,
|
|
"http://usr:pwd@localhost:1234?par_1=aaa&par_2=bbb#frag"
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn url_join_with_empty_params() {
|
|
let actual = nu!(pipeline(
|
|
r#"
|
|
{
|
|
"scheme": "https",
|
|
"host": "localhost",
|
|
"path": "/foo",
|
|
"params": {}
|
|
} | url join
|
|
"#
|
|
));
|
|
|
|
assert_eq!(actual.out, "https://localhost/foo");
|
|
}
|
|
|
|
#[test]
|
|
fn url_join_with_list_in_params() {
|
|
let actual = nu!(pipeline(
|
|
r#"
|
|
{
|
|
"scheme": "http",
|
|
"username": "usr",
|
|
"password": "pwd",
|
|
"host": "localhost",
|
|
"params": {
|
|
"par_1": "aaa",
|
|
"par_2": ["bbb", "ccc"]
|
|
},
|
|
"port": "1234",
|
|
} | url join
|
|
"#
|
|
));
|
|
|
|
assert_eq!(
|
|
actual.out,
|
|
"http://usr:pwd@localhost:1234?par_1=aaa&par_2=bbb&par_2=ccc"
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn url_join_with_params_table() {
|
|
let actual = nu!(pipeline(
|
|
r#"
|
|
{
|
|
"scheme": "http",
|
|
"username": "usr",
|
|
"password": "pwd",
|
|
"host": "localhost",
|
|
"params": [
|
|
["key", "value"];
|
|
["par_1", "aaa"],
|
|
["par_2", "bbb"],
|
|
["par_1", "ccc"],
|
|
["par_2", "ddd"],
|
|
],
|
|
"port": "1234",
|
|
} | url join
|
|
"#
|
|
));
|
|
|
|
assert_eq!(
|
|
actual.out,
|
|
"http://usr:pwd@localhost:1234?par_1=aaa&par_2=bbb&par_1=ccc&par_2=ddd"
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn url_join_with_params_invalid_table() {
|
|
let actual = nu!(pipeline(
|
|
r#"
|
|
{
|
|
"scheme": "http",
|
|
"username": "usr",
|
|
"password": "pwd",
|
|
"host": "localhost",
|
|
"params": (
|
|
[
|
|
["key", "value"];
|
|
["par_1", "aaa"],
|
|
["par_2", "bbb"],
|
|
["par_1", "ccc"],
|
|
["par_2", "ddd"],
|
|
] ++ ["not a record"]
|
|
),
|
|
"port": "1234",
|
|
} | url join
|
|
"#
|
|
));
|
|
|
|
assert!(actual.err.contains("expected a table"));
|
|
assert!(actual
|
|
.err
|
|
.contains("not a table, contains non-record values"));
|
|
}
|