@@ -42,6 +42,42 @@ const runtime = Layer.mergeAll(Layer.mock(ForgejoCli)({ api }), VcsProcess.layer
4242
4343afterEach ( ( ) => api . mockReset ( ) ) ;
4444
45+ it . effect ( "emits ordinary rename paths without literal quotes" , ( ) =>
46+ Effect . gen ( function * ( ) {
47+ api . mockImplementation ( ( request ) => {
48+ if ( request . path . endsWith ( "/pulls/1" ) ) return json ( pull ) ;
49+ if ( request . path . includes ( "/files?" ) )
50+ return json ( [
51+ {
52+ filename : "new.ts" ,
53+ previous_filename : "old.ts" ,
54+ status : "renamed" ,
55+ additions : 0 ,
56+ deletions : 0 ,
57+ } ,
58+ ] ) ;
59+ if ( request . path . includes ( "/git/trees/" ) )
60+ return json ( {
61+ truncated : false ,
62+ tree : [
63+ {
64+ path : request . path . includes ( "/head?" ) ? "new.ts" : "old.ts" ,
65+ mode : "100644" ,
66+ sha : "blob" ,
67+ } ,
68+ ] ,
69+ } ) ;
70+ return json ( { encoding : "base64" , content : Buffer . from ( "unchanged\n" ) . toString ( "base64" ) } ) ;
71+ } ) ;
72+ const provider = yield * Provider . make ;
73+ const result = yield * provider . getDiff ( { ...input , cursor : "1" } ) ;
74+ expect ( result . patch ) . toBe (
75+ "diff --git a/old.ts b/new.ts\nrename from old.ts\nrename to new.ts\n--- a/old.ts\n+++ b/new.ts\n" ,
76+ ) ;
77+ expect ( result . omittedFileStats ) . toBeUndefined ( ) ;
78+ } ) . pipe ( Effect . provide ( runtime ) ) ,
79+ ) ;
80+
4581it . effect ( "marks non-UTF-8 blobs as omitted instead of losing byte-only changes" , ( ) =>
4682 Effect . gen ( function * ( ) {
4783 api . mockImplementation ( ( request ) => {
@@ -69,7 +105,7 @@ it.effect("marks non-UTF-8 blobs as omitted instead of losing byte-only changes"
69105 const provider = yield * Provider . make ;
70106 const result = yield * provider . getDiff ( { ...input , cursor : "1" } ) ;
71107 expect ( result . truncated ) . toBe ( true ) ;
72- expect ( result . patch ) . toContain ( ' diff --git " a/legacy.txt" " b/legacy.txt" \nBinary files differ' ) ;
108+ expect ( result . patch ) . toContain ( " diff --git a/legacy.txt b/legacy.txt\nBinary files differ" ) ;
73109 expect ( result . omittedFileStats ) . toEqual ( [ { path : "legacy.txt" , additions : 1 , deletions : 1 } ] ) ;
74110 } ) . pipe ( Effect . provide ( runtime ) ) ,
75111) ;
@@ -144,13 +180,9 @@ it.effect(
144180 expect ( first . patch ) . toContain ( 'rename to " new.ts"' ) ;
145181 expect ( first . patch ) . toContain ( "-before\n+after\n" ) ;
146182 expect ( first . patch ) . toContain ( "new file mode 100644\n--- /dev/null" ) ;
147- expect ( first . patch ) . toContain ( ' deleted file mode 100644\n--- " a/deleted.ts" \n+++ /dev/null' ) ;
183+ expect ( first . patch ) . toContain ( " deleted file mode 100644\n--- a/deleted.ts\n+++ /dev/null" ) ;
148184 expect ( first . patch ) . toContain ( "Binary files differ" ) ;
149- expect ( first . omittedFileStats ) . toContainEqual ( {
150- path : " new.ts" ,
151- additions : 1 ,
152- deletions : 1 ,
153- } ) ;
185+ expect ( first . omittedFileStats ) . toEqual ( [ { path : "binary.bin" , additions : 0 , deletions : 0 } ] ) ;
154186 const last = yield * provider . getDiff ( { ...input , cursor : "2" } ) ;
155187 expect ( last . nextCursor ) . toBeNull ( ) ;
156188 expect ( last . patch ) . toBe ( "" ) ;
@@ -180,7 +212,7 @@ it.effect("keeps later files reachable when tea truncates a file-content respons
180212 const provider = yield * Provider . make ;
181213 const first = yield * provider . getDiff ( input ) ;
182214 expect ( first . truncated ) . toBe ( true ) ;
183- expect ( first . patch ) . toContain ( ' "b/large.ts"' ) ;
215+ expect ( first . patch ) . toContain ( "b/large.ts" ) ;
184216 expect ( first . omittedFileStats ) . toEqual ( [
185217 { path : "large.ts" , additions : 100000 , deletions : 10 } ,
186218 ] ) ;
@@ -252,7 +284,7 @@ it.effect("preserves executable, symlink, and submodule changes in rebuilt previ
252284 expect ( result . patch ) . toContain ( "old mode 100644\nnew mode 100755" ) ;
253285 expect ( result . patch ) . toContain ( "old mode 100644\nnew mode 120000" ) ;
254286 expect ( result . patch ) . toContain ( "-Subproject commit old-commit\n+Subproject commit new-commit" ) ;
255- expect ( result . omittedFileStats ) . toHaveLength ( 3 ) ;
287+ expect ( result . omittedFileStats ) . toBeUndefined ( ) ;
256288 } ) . pipe ( Effect . provide ( runtime ) ) ,
257289) ;
258290
0 commit comments