Skip to content

Commit

Permalink
test: Fix incorrect path
Browse files Browse the repository at this point in the history
  • Loading branch information
jpedroh committed Dec 5, 2023
1 parent 9dc92a0 commit 63a8051
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions bin/tests/cli.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,21 @@ use assert_cmd::prelude::*;
#[test]
fn if_there_is_a_conflict_it_returns_valid_exit_code() {
let mut cmd = Command::cargo_bin("generic-merge").unwrap();
cmd.arg("--base-path=tests/samples/smoke_java/base.java")
.arg("--left-path=tests/samples/smoke_java/left.java")
.arg("--right-path=tests/samples/smoke_java/right.java")
.arg("--merge-path=tests/samples/smoke_java/merge.java")
cmd.arg("--base-path=tests/scenarios/smoke_java/base.java")
.arg("--left-path=tests/scenarios/smoke_java/left.java")
.arg("--right-path=tests/scenarios/smoke_java/right.java")
.arg("--merge-path=tests/scenarios/smoke_java/merge.java")
.assert()
.code(bin::SUCCESS_WITH_CONFLICTS);
}

#[test]
fn if_there_is_no_conflict_it_returns_valid_exit_code() {
let mut cmd = Command::cargo_bin("generic-merge").unwrap();
cmd.arg("--base-path=tests/samples/no_conflicts/base.java")
.arg("--left-path=tests/samples/no_conflicts/left.java")
.arg("--right-path=tests/samples/no_conflicts/right.java")
.arg("--merge-path=tests/samples/no_conflicts/merge.java")
cmd.arg("--base-path=tests/scenarios/no_conflicts/base.java")
.arg("--left-path=tests/scenarios/no_conflicts/left.java")
.arg("--right-path=tests/scenarios/no_conflicts/right.java")
.arg("--merge-path=tests/scenarios/no_conflicts/merge.java")
.assert()
.code(bin::SUCCESS_WITHOUT_CONFLICTS);
}

0 comments on commit 63a8051

Please sign in to comment.