Skip to content

Commit

Permalink
✅(core): Handle CRLF output on windows platform
Browse files Browse the repository at this point in the history
Signed-off-by: Alexandre Nicolaie <xunleii@users.noreply.github.com>
  • Loading branch information
xunleii committed Aug 4, 2024
1 parent 74ae9f6 commit 25ea200
Show file tree
Hide file tree
Showing 3 changed files with 64 additions and 8 deletions.
45 changes: 45 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -44,3 +44,4 @@ walkdir = "2.3.2"
assert_cmd = { version = "2.0.15", features = ["color-auto"] }
assert_fs = "1.1.2"
predicates = "3.1.2"
similar-asserts = "1.5.0"
26 changes: 18 additions & 8 deletions tests/cli.rs
Original file line number Diff line number Diff line change
Expand Up @@ -49,30 +49,40 @@ fn generate_with_empty_namespace() -> Result<(), Box<dyn std::error::Error>> {
#[test]
fn generate_on_stdout() -> Result<(), Box<dyn std::error::Error>> {
let mut cmd = Command::cargo_bin("kubevault")?;
let expect = fs::read_to_string("tests/fixtures/manifests.yaml")?;

cmd.arg("generate")
let assert = cmd
.arg("generate")
.arg("--vault-dir")
.arg("tests/fixtures/vault")
.assert()
.success()
.stdout(predicate::str::diff(expect));
.success();

let expect = fs::read_to_string("tests/fixtures/manifests.yaml")?;
#[cfg(windows)]
let expect = expect.replace("\r\n", "\n");
let actual = std::str::from_utf8(&assert.get_output().stdout)?;
similar_asserts::assert_eq!(expect, actual);
Ok(())
}

#[test]
fn generate_on_stdout_with_custom_namespace() -> Result<(), Box<dyn std::error::Error>> {
let mut cmd = Command::cargo_bin("kubevault")?;
let expect = fs::read_to_string("tests/fixtures/manifests_default.yaml")?;

cmd.arg("generate")
let assert = cmd
.arg("generate")
.arg("--vault-dir")
.arg("tests/fixtures/vault")
.arg("--namespace")
.arg("default")
.assert()
.success()
.stdout(predicate::str::diff(expect));
.success();

let expect = fs::read_to_string("tests/fixtures/manifests_default.yaml")?;
#[cfg(windows)]
let expect = expect.replace("\r\n", "\n");
let actual = std::str::from_utf8(&assert.get_output().stdout)?;
similar_asserts::assert_eq!(expect, actual);
Ok(())
}

Expand Down

0 comments on commit 25ea200

Please sign in to comment.