Skip to content

Disable external git diff tool in tests #1124

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ericmj merged 1 commit into from
Mar 29, 2026
Merged

Disable external git diff tool in tests #1124

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions test/mix/tasks/hex.package_test.exs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
defmodule Mix.Tasks.Hex.PackageTest do
use HexTest.IntegrationCase

@git_diff_command "git diff --no-index --no-color --no-ext-diff __PATH1__ __PATH2__"

defp in_diff_fixture(fun) do
in_fixture("diff", fn ->
Mix.Project.push(ReleaseDeps.MixProject)
Expand Down Expand Up @@ -107,7 +109,7 @@ defmodule Mix.Tasks.Hex.PackageTest do

test "diff: success with version number" do
in_diff_fixture(fn ->
Hex.State.put(:diff_command, "git diff --no-index --no-color __PATH1__ __PATH2__")
Hex.State.put(:diff_command, @git_diff_command)

assert catch_throw(Mix.Tasks.Hex.Package.run(["diff", "ex_doc", "0.1.0"])) ==
{:exit_code, 1}
Expand Down Expand Up @@ -152,7 +154,7 @@ defmodule Mix.Tasks.Hex.PackageTest do

test "diff: success with version range" do
in_diff_fixture(fn ->
Hex.State.put(:diff_command, "git diff --no-index --no-color __PATH1__ __PATH2__")
Hex.State.put(:diff_command, @git_diff_command)

assert catch_throw(Mix.Tasks.Hex.Package.run(["diff", "ex_doc", "0.0.1..0.1.0"])) ==
{:exit_code, 1}
Expand All @@ -167,7 +169,7 @@ defmodule Mix.Tasks.Hex.PackageTest do

test "diff: success (variant args)" do
in_diff_fixture(fn ->
Hex.State.put(:diff_command, "git diff --no-index --no-color __PATH1__ __PATH2__")
Hex.State.put(:diff_command, @git_diff_command)

assert catch_throw(Mix.Tasks.Hex.Package.run(["diff", "ex_doc", "0.0.1", "0.1.0"])) ==
{:exit_code, 1}
Expand Down
Loading