Skip to content

Commit e716617

Browse files
committed
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.
1 parent 0f7f1a5 commit e716617

File tree

1 file changed

+38
-0
lines changed

1 file changed

+38
-0
lines changed

pkg/integration/tests/filter_by_path/show_diffs_for_renamed_file.go

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,5 +107,43 @@ var ShowDiffsForRenamedFile = NewIntegrationTest(NewIntegrationTestArgs{
107107
Equals(" b"),
108108
Equals(" c"),
109109
)
110+
111+
t.Views().Commits().
112+
Press(keys.Universal.RangeSelectUp).
113+
Press(keys.Universal.RangeSelectUp)
114+
115+
t.Views().Main().ContainsLines(
116+
/* EXPECTED:
117+
Contains("Showing diff for range"),
118+
Equals(""),
119+
Equals(" oldFile => newFile | 2 +-"),
120+
Equals(" 1 file changed, 1 insertion(+), 1 deletion(-)"),
121+
Equals(""),
122+
Equals("diff --git a/oldFile b/newFile"),
123+
Equals("similarity index 66%"),
124+
Equals("rename from oldFile"),
125+
Equals("rename to newFile"),
126+
Contains("index"),
127+
Equals("--- a/oldFile"),
128+
Equals("+++ b/newFile"),
129+
Equals("@@ -1,3 +1,3 @@"),
130+
Equals("-a"),
131+
Equals("+y"),
132+
Equals(" b"),
133+
Equals(" c"),
134+
ACTUAL: */
135+
Equals(" newFile | 3 +++"),
136+
Equals(" 1 file changed, 3 insertions(+)"),
137+
Equals(""),
138+
Equals("diff --git a/newFile b/newFile"),
139+
Equals("new file mode 100644"),
140+
Contains("index"),
141+
Equals("--- /dev/null"),
142+
Equals("+++ b/newFile"),
143+
Equals("@@ -0,0 +1,3 @@"),
144+
Equals("+y"),
145+
Equals("+b"),
146+
Equals("+c"),
147+
)
110148
},
111149
})

0 commit comments

Comments
 (0)