From 68f749196e89942d8f62a1291caaae606ebe1c09 Mon Sep 17 00:00:00 2001 From: James Couball Date: Mon, 5 Jul 2021 17:03:45 -0700 Subject: [PATCH] Fix worktree test when git dir includes symlinks Signed-off-by: James Couball --- tests/units/test_worktree.rb | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/tests/units/test_worktree.rb b/tests/units/test_worktree.rb index 2b509726..f5141c8d 100644 --- a/tests/units/test_worktree.rb +++ b/tests/units/test_worktree.rb @@ -32,23 +32,24 @@ def create_temp_repo(clone_path) def setup @git = Git.open(git_working_dir) - + @commit = @git.object('1cc8667014381') @tree = @git.object('1cc8667014381^{tree}') @blob = @git.object('v2.5:example.txt') - + @worktrees = @git.worktrees end - + def test_worktrees_all assert(@git.worktrees.is_a?(Git::Worktrees)) assert(@git.worktrees.first.is_a?(Git::Worktree)) assert_equal(@git.worktrees.size, 2) end - + def test_worktrees_single worktree = @git.worktrees.first - assert_equal(worktree.dir, @git.dir.to_s) + git_dir = Pathname.new(@git.dir.to_s).realpath.to_s + assert_equal(worktree.dir, git_dir) assert_equal(worktree.gcommit, SAMPLE_LAST_COMMIT) end