forked from extern/nushell
Replace the old encode base64
and decode base64
with new-base64 commands (#14018)
<!-- if this PR closes one or more issues, you can automatically link the PR with them by using one of the [*linking keywords*](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword), e.g. - this PR should close #xxxx - fixes #xxxx you can also mention related issues, PRs or discussions! --> # Description <!-- Thank you for improving Nushell. Please, check our [contributing guide](../CONTRIBUTING.md) and talk to the core team before making major changes. Description of your pull request goes here. **Provide examples and/or screenshots** if your changes affect the user experience. --> Maybe we can deprecate `encode new-base64` and `decode new-base64` first, to make the code clean and simple I'd rather remove the old `encode base64` and `decode base64` and replace them with the `* new-base64` commands. Related PR: https://github.com/nushell/nushell/pull/13428 # User-Facing Changes <!-- List of all changes that impact the user experience here. This helps us keep track of breaking changes. --> - `encode new-base64` --> `encode base64` - `decode new-base64` --> `decode base64` # Tests + Formatting <!-- Don't forget to add tests that cover your changes. Make sure you've run and fixed any issues with these commands: - `cargo fmt --all -- --check` to check standard code formatting (`cargo fmt --all` applies these changes) - `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used` to check that you're using the standard code style - `cargo test --workspace` to check that all tests pass (on Windows make sure to [enable developer mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging)) - `cargo run -- -c "use toolkit.nu; toolkit test stdlib"` to run the tests for the standard library > **Note** > from `nushell` you can also use the `toolkit` as follows > ```bash > use toolkit.nu # or use an `env_change` hook to activate it automatically > toolkit check pr > ``` --> # After Submitting <!-- If your PR had any user-facing changes, update [the documentation](https://github.com/nushell/nushell.github.io) after the PR is merged, if necessary. This will help us keep the docs up to date. --> It's a breaking change
This commit is contained in:
@ -2,18 +2,18 @@ use nu_test_support::nu;
|
||||
|
||||
#[test]
|
||||
fn canonical() {
|
||||
super::test_canonical("new-base64");
|
||||
super::test_canonical("new-base64 --url");
|
||||
super::test_canonical("new-base64 --nopad");
|
||||
super::test_canonical("new-base64 --url --nopad");
|
||||
super::test_canonical("base64");
|
||||
super::test_canonical("base64 --url");
|
||||
super::test_canonical("base64 --nopad");
|
||||
super::test_canonical("base64 --url --nopad");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn const_() {
|
||||
super::test_const("new-base64");
|
||||
super::test_const("new-base64 --url");
|
||||
super::test_const("new-base64 --nopad");
|
||||
super::test_const("new-base64 --url --nopad");
|
||||
super::test_const("base64");
|
||||
super::test_const("base64 --url");
|
||||
super::test_const("base64 --nopad");
|
||||
super::test_const("base64 --url --nopad");
|
||||
}
|
||||
|
||||
#[test]
|
||||
@ -21,7 +21,7 @@ fn encode() {
|
||||
let text = "Ș̗͙̂̏o̲̲̗͗̌͊m̝̊̓́͂ë̡̦̞̤́̌̈́̀ ̥̝̪̎̿ͅf̧̪̻͉͗̈́̍̆u̮̝͌̈́ͅn̹̞̈́̊k̮͇̟͎̂͘y̧̲̠̾̆̕ͅ ̙͖̭͔̂̐t̞́́͘e̢̨͕̽x̥͋t͍̑̔͝";
|
||||
let encoded = "U8yCzI/MpsyXzZlvzZfMjM2KzLLMssyXbcyKzJPMgc2CzJ1lzYTMjM2EzIDMpsyhzJ7MpCDMjsy/zYXMpcydzKpmzZfNhMyNzIbMqsy7zKfNiXXNjM2EzK7Mnc2Fbs2EzIrMucyea82YzILMrs2HzJ/NjnnMvsyVzIbNhcyyzKfMoCDMgsyQzJnNlsytzZR0zIHNmMyBzJ5lzL3Mos2VzKh4zYvMpXTMkcyUzZ3NjQ==";
|
||||
|
||||
let outcome = nu!("'{}' | encode new-base64", text);
|
||||
let outcome = nu!("'{}' | encode base64", text);
|
||||
assert_eq!(outcome.out, encoded);
|
||||
}
|
||||
|
||||
@ -30,7 +30,7 @@ fn decode_string() {
|
||||
let text = "Very important data";
|
||||
let encoded = "VmVyeSBpbXBvcnRhbnQgZGF0YQ==";
|
||||
|
||||
let outcome = nu!("'{}' | decode new-base64 | decode", encoded);
|
||||
let outcome = nu!("'{}' | decode base64 | decode", encoded);
|
||||
assert_eq!(outcome.out, text);
|
||||
}
|
||||
|
||||
@ -40,10 +40,10 @@ fn decode_pad_nopad() {
|
||||
let encoded_pad = "4oCdwqUuw6RAwrBiWsO2wqI=";
|
||||
let encoded_nopad = "4oCdwqUuw6RAwrBiWsO2wqI";
|
||||
|
||||
let outcome = nu!("'{}' | decode new-base64 | decode", encoded_pad);
|
||||
let outcome = nu!("'{}' | decode base64 | decode", encoded_pad);
|
||||
assert_eq!(outcome.out, text);
|
||||
|
||||
let outcome = nu!("'{}' | decode new-base64 --nopad | decode", encoded_nopad);
|
||||
let outcome = nu!("'{}' | decode base64 --nopad | decode", encoded_nopad);
|
||||
assert_eq!(outcome.out, text);
|
||||
}
|
||||
|
||||
@ -53,10 +53,10 @@ fn decode_url() {
|
||||
let encoded = "cDpn15jdvt+rdCs/";
|
||||
let encoded_url = "cDpn15jdvt-rdCs_";
|
||||
|
||||
let outcome = nu!("'{}' | decode new-base64 | decode", encoded);
|
||||
let outcome = nu!("'{}' | decode base64 | decode", encoded);
|
||||
assert_eq!(outcome.out, text);
|
||||
|
||||
let outcome = nu!("'{}' | decode new-base64 --url | decode", encoded_url);
|
||||
let outcome = nu!("'{}' | decode base64 --url | decode", encoded_url);
|
||||
assert_eq!(outcome.out, text);
|
||||
}
|
||||
|
||||
@ -65,9 +65,9 @@ fn reject_pad_nopad() {
|
||||
let encoded_nopad = "YQ";
|
||||
let encoded_pad = "YQ==";
|
||||
|
||||
let outcome = nu!("'{}' | decode new-base64", encoded_nopad);
|
||||
let outcome = nu!("'{}' | decode base64", encoded_nopad);
|
||||
assert!(!outcome.err.is_empty());
|
||||
|
||||
let outcome = nu!("'{}' | decode new-base64 --nopad", encoded_pad);
|
||||
let outcome = nu!("'{}' | decode base64 --nopad", encoded_pad);
|
||||
assert!(!outcome.err.is_empty())
|
||||
}
|
||||
|
@ -10,43 +10,48 @@ fn base64_defaults_to_encoding_with_standard_character_type() {
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn base64_encode_characterset_binhex() {
|
||||
fn base64_defaults_to_encoding_with_nopad() {
|
||||
let actual = nu!(r#"
|
||||
echo 'username:password' | encode base64 --character-set binhex
|
||||
echo 'username:password' | encode base64 --nopad
|
||||
"#);
|
||||
|
||||
assert_eq!(actual.out, "GA0PFQjKE@8kF'&cFhG[FQ3");
|
||||
assert_eq!(actual.out, "dXNlcm5hbWU6cGFzc3dvcmQ");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn error_when_invalid_character_set_given() {
|
||||
fn base64_decode_value() {
|
||||
let actual = nu!(r#"
|
||||
echo 'username:password' | encode base64 --character-set 'this is invalid'
|
||||
echo 'YWJjeHl6' | decode base64 | decode
|
||||
"#);
|
||||
|
||||
assert!(actual
|
||||
.err
|
||||
.contains("this is invalid is not a valid character-set"));
|
||||
assert_eq!(actual.out, "abcxyz");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn base64_decode_characterset_binhex() {
|
||||
let actual = nu!(
|
||||
r#""GA0PFQjKE@8kF'&cFhG[FQ3" | decode base64 --character-set binhex --binary | decode utf-8"#
|
||||
);
|
||||
fn base64_decode_with_nopad() {
|
||||
let actual = nu!(r#"
|
||||
echo 'R29vZCBsdWNrIHRvIHlvdQ' | decode base64 --nopad | decode
|
||||
"#);
|
||||
|
||||
assert_eq!(actual.out, "username:password");
|
||||
assert_eq!(actual.out, "Good luck to you");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn base64_decode_with_url() {
|
||||
let actual = nu!(r#"
|
||||
echo 'vu7_' | decode base64 --url | decode
|
||||
"#);
|
||||
|
||||
assert_eq!(actual.out, "¾îÿ");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn error_invalid_decode_value() {
|
||||
let actual = nu!(r#"
|
||||
echo "this should not be a valid encoded value" | decode base64 --character-set url-safe
|
||||
echo "this should not be a valid encoded value" | decode base64
|
||||
"#);
|
||||
|
||||
assert!(actual
|
||||
.err
|
||||
.contains("invalid base64 input for character set url-safe"));
|
||||
assert!(actual.err.contains("nu::shell::incorrect_value"));
|
||||
}
|
||||
|
||||
#[test]
|
||||
|
Reference in New Issue
Block a user