mirror of
https://github.com/jesseduffield/lazygit.git
synced 2025-08-06 22:33:07 +02:00
Add test for range diff across rename
When shift-selecting a range of commits across a file rename in filtering-by-path mode, the diff currently shows an added file rather than a renamed file. Add a test that demonstrates this, we'll fix this in the next commit.
This commit is contained in:
@ -107,5 +107,43 @@ var ShowDiffsForRenamedFile = NewIntegrationTest(NewIntegrationTestArgs{
|
|||||||
Equals(" b"),
|
Equals(" b"),
|
||||||
Equals(" c"),
|
Equals(" c"),
|
||||||
)
|
)
|
||||||
|
|
||||||
|
t.Views().Commits().
|
||||||
|
Press(keys.Universal.RangeSelectUp).
|
||||||
|
Press(keys.Universal.RangeSelectUp)
|
||||||
|
|
||||||
|
t.Views().Main().ContainsLines(
|
||||||
|
/* EXPECTED:
|
||||||
|
Contains("Showing diff for range"),
|
||||||
|
Equals(""),
|
||||||
|
Equals(" oldFile => newFile | 2 +-"),
|
||||||
|
Equals(" 1 file changed, 1 insertion(+), 1 deletion(-)"),
|
||||||
|
Equals(""),
|
||||||
|
Equals("diff --git a/oldFile b/newFile"),
|
||||||
|
Equals("similarity index 66%"),
|
||||||
|
Equals("rename from oldFile"),
|
||||||
|
Equals("rename to newFile"),
|
||||||
|
Contains("index"),
|
||||||
|
Equals("--- a/oldFile"),
|
||||||
|
Equals("+++ b/newFile"),
|
||||||
|
Equals("@@ -1,3 +1,3 @@"),
|
||||||
|
Equals("-a"),
|
||||||
|
Equals("+y"),
|
||||||
|
Equals(" b"),
|
||||||
|
Equals(" c"),
|
||||||
|
ACTUAL: */
|
||||||
|
Equals(" newFile | 3 +++"),
|
||||||
|
Equals(" 1 file changed, 3 insertions(+)"),
|
||||||
|
Equals(""),
|
||||||
|
Equals("diff --git a/newFile b/newFile"),
|
||||||
|
Equals("new file mode 100644"),
|
||||||
|
Contains("index"),
|
||||||
|
Equals("--- /dev/null"),
|
||||||
|
Equals("+++ b/newFile"),
|
||||||
|
Equals("@@ -0,0 +1,3 @@"),
|
||||||
|
Equals("+y"),
|
||||||
|
Equals("+b"),
|
||||||
|
Equals("+c"),
|
||||||
|
)
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
Reference in New Issue
Block a user