From 9cf34c0e893e3f8b04a90b41c80d6b91806563ac Mon Sep 17 00:00:00 2001 From: Rafael Oleza Date: Mon, 25 Feb 2019 14:52:35 +0100 Subject: [PATCH] Fix git-diff package test --- packages/git-diff/spec/diff-list-view-spec.js | 6 +++--- .../fixtures/working-dir/git.git/COMMIT_EDITMSG | 0 .../spec/fixtures/working-dir/git.git/MERGE_RR | 0 .../spec/fixtures/working-dir/git.git/index | Bin 217 -> 217 bytes .../spec/fixtures/working-dir/git.git/info/refs | 1 - .../spec/fixtures/working-dir/git.git/logs/HEAD | 0 .../working-dir/git.git/logs/refs/heads/master | 0 .../06/5a272b55ec2ee84530dffd60b6869f7bf5d99c | Bin 0 -> 164 bytes .../3e/715502b971d4f8282d1e05a8ccfad6f7037910 | Bin 0 -> 27 bytes .../8e/ab2e81eb8dea81ad08694c7b30ae165af89c8e | Bin 0 -> 81 bytes .../90/820108a054b6f49c0d21031313244b6f7d69dc | 3 +++ .../e7/fd5b055dcdaa93ad8f9d63ca8db5330537105f | Bin 0 -> 236 bytes .../f1/4149b7b38a0a972c46557877caff6c9fe76476 | Bin 0 -> 81 bytes .../fb/33b0b43b20b7f9de1bca79e192fa2e30dbeb6b | Bin 0 -> 227 bytes .../working-dir/git.git/objects/info/packs | 2 -- ...fb30b46ead026befe94c88f5591a6d3dfdca4e95.idx | Bin 1380 -> 0 bytes ...b30b46ead026befe94c88f5591a6d3dfdca4e95.pack | Bin 1127 -> 0 bytes .../fixtures/working-dir/git.git/packed-refs | 2 -- .../working-dir/git.git/refs/heads/master | 1 + packages/git-diff/spec/git-diff-spec.js | 16 ++++++++-------- 20 files changed, 15 insertions(+), 16 deletions(-) delete mode 100644 packages/git-diff/spec/fixtures/working-dir/git.git/COMMIT_EDITMSG delete mode 100644 packages/git-diff/spec/fixtures/working-dir/git.git/MERGE_RR delete mode 100644 packages/git-diff/spec/fixtures/working-dir/git.git/info/refs delete mode 100644 packages/git-diff/spec/fixtures/working-dir/git.git/logs/HEAD delete mode 100644 packages/git-diff/spec/fixtures/working-dir/git.git/logs/refs/heads/master create mode 100644 packages/git-diff/spec/fixtures/working-dir/git.git/objects/06/5a272b55ec2ee84530dffd60b6869f7bf5d99c create mode 100644 packages/git-diff/spec/fixtures/working-dir/git.git/objects/3e/715502b971d4f8282d1e05a8ccfad6f7037910 create mode 100644 packages/git-diff/spec/fixtures/working-dir/git.git/objects/8e/ab2e81eb8dea81ad08694c7b30ae165af89c8e create mode 100644 packages/git-diff/spec/fixtures/working-dir/git.git/objects/90/820108a054b6f49c0d21031313244b6f7d69dc create mode 100644 packages/git-diff/spec/fixtures/working-dir/git.git/objects/e7/fd5b055dcdaa93ad8f9d63ca8db5330537105f create mode 100644 packages/git-diff/spec/fixtures/working-dir/git.git/objects/f1/4149b7b38a0a972c46557877caff6c9fe76476 create mode 100644 packages/git-diff/spec/fixtures/working-dir/git.git/objects/fb/33b0b43b20b7f9de1bca79e192fa2e30dbeb6b delete mode 100644 packages/git-diff/spec/fixtures/working-dir/git.git/objects/info/packs delete mode 100644 packages/git-diff/spec/fixtures/working-dir/git.git/objects/pack/pack-fb30b46ead026befe94c88f5591a6d3dfdca4e95.idx delete mode 100644 packages/git-diff/spec/fixtures/working-dir/git.git/objects/pack/pack-fb30b46ead026befe94c88f5591a6d3dfdca4e95.pack delete mode 100644 packages/git-diff/spec/fixtures/working-dir/git.git/packed-refs create mode 100644 packages/git-diff/spec/fixtures/working-dir/git.git/refs/heads/master diff --git a/packages/git-diff/spec/diff-list-view-spec.js b/packages/git-diff/spec/diff-list-view-spec.js index d78560acc..8f98e68c0 100644 --- a/packages/git-diff/spec/diff-list-view-spec.js +++ b/packages/git-diff/spec/diff-list-view-spec.js @@ -22,7 +22,7 @@ describe('git-diff:toggle-diff-list', () => { runs(() => { editor = atom.workspace.getActiveTextEditor() - editor.setCursorBufferPosition([3, 28]) + editor.setCursorBufferPosition([8, 30]) editor.insertText('a') atom.commands.dispatch(editor.getElement(), 'git-diff:toggle-diff-list') }) @@ -35,7 +35,7 @@ describe('git-diff:toggle-diff-list', () => { it('shows a list of all diff hunks', () => { diffListView = document.querySelector('.diff-list-view ol') - expect(diffListView.textContent).toBe('var pivot = items.shift(a)-4,1 +4,1') + expect(diffListView.textContent).toBe('while (items.length > 0) {a-9,1 +9,1') }) it('moves the cursor to the selected hunk', () => { @@ -44,6 +44,6 @@ describe('git-diff:toggle-diff-list', () => { document.querySelector('.diff-list-view'), 'core:confirm' ) - expect(editor.getCursorBufferPosition()).toEqual([3, 4]) + expect(editor.getCursorBufferPosition()).toEqual([8, 4]) }) }) diff --git a/packages/git-diff/spec/fixtures/working-dir/git.git/COMMIT_EDITMSG b/packages/git-diff/spec/fixtures/working-dir/git.git/COMMIT_EDITMSG deleted file mode 100644 index e69de29bb..000000000 diff --git a/packages/git-diff/spec/fixtures/working-dir/git.git/MERGE_RR b/packages/git-diff/spec/fixtures/working-dir/git.git/MERGE_RR deleted file mode 100644 index e69de29bb..000000000 diff --git a/packages/git-diff/spec/fixtures/working-dir/git.git/index b/packages/git-diff/spec/fixtures/working-dir/git.git/index index 17dcc2005c6d34768d09f5f9580968af969fd734..a15f269aafeb5e4c914ae5df79a4aadb82b636f0 100644 GIT binary patch delta 65 zcmcb~c#~1Z#WTp6fq{Vugky?7`!TUC*#M&%85md@;%3~QsIpMxi`t(vv*s>sv&>NL NFP&mhwR5MMGXRtm7exR7 delta 65 zcmcb~c#~1Z#WTp6fq{Vugky@YO;A~v!VaSu85md@;>4RLsw@;K-KMlQR;VoWgC6tc NFJTo2q!tHE0RU{76_x-1 diff --git a/packages/git-diff/spec/fixtures/working-dir/git.git/info/refs b/packages/git-diff/spec/fixtures/working-dir/git.git/info/refs deleted file mode 100644 index 99f414cef..000000000 --- a/packages/git-diff/spec/fixtures/working-dir/git.git/info/refs +++ /dev/null @@ -1 +0,0 @@ -745ed7547d15a61bc4ee7e182615590f44aca201 refs/heads/master diff --git a/packages/git-diff/spec/fixtures/working-dir/git.git/logs/HEAD b/packages/git-diff/spec/fixtures/working-dir/git.git/logs/HEAD deleted file mode 100644 index e69de29bb..000000000 diff --git a/packages/git-diff/spec/fixtures/working-dir/git.git/logs/refs/heads/master b/packages/git-diff/spec/fixtures/working-dir/git.git/logs/refs/heads/master deleted file mode 100644 index e69de29bb..000000000 diff --git a/packages/git-diff/spec/fixtures/working-dir/git.git/objects/06/5a272b55ec2ee84530dffd60b6869f7bf5d99c b/packages/git-diff/spec/fixtures/working-dir/git.git/objects/06/5a272b55ec2ee84530dffd60b6869f7bf5d99c new file mode 100644 index 0000000000000000000000000000000000000000..03673f8db597f3759be3e9104f9a18584f4299c7 GIT binary patch literal 164 zcmV;V09*ff0iBLP3c@fDMP26<*$ZVRP1^~GcmP5029so}mByAd-FSNA73A+8yw3|u zN>kCs42P0MGzohngyJa*6LJLVoehI;fd%`HM{<+=MNEa|MV>#+KORv+szs7h;Lk$+ru SooeI8X`Q8cZR!gR^G5c${!VrP literal 0 HcmV?d00001 diff --git a/packages/git-diff/spec/fixtures/working-dir/git.git/objects/3e/715502b971d4f8282d1e05a8ccfad6f7037910 b/packages/git-diff/spec/fixtures/working-dir/git.git/objects/3e/715502b971d4f8282d1e05a8ccfad6f7037910 new file mode 100644 index 0000000000000000000000000000000000000000..1cbeb30fc8cafbf2790a34fbf334eea0de778e71 GIT binary patch literal 27 jcmbAWiT`_Ff%bxC{D~R$Vt`9DrR{8H<~r}?5fFY`{yQ~>fLJ0 nYAz6us;H!*gu$*blxb(-l^+_qa;z)P{JQp?xl#ZC*t;KuqQNHb literal 0 HcmV?d00001 diff --git a/packages/git-diff/spec/fixtures/working-dir/git.git/objects/90/820108a054b6f49c0d21031313244b6f7d69dc b/packages/git-diff/spec/fixtures/working-dir/git.git/objects/90/820108a054b6f49c0d21031313244b6f7d69dc new file mode 100644 index 000000000..718602204 --- /dev/null +++ b/packages/git-diff/spec/fixtures/working-dir/git.git/objects/90/820108a054b6f49c0d21031313244b6f7d69dc @@ -0,0 +1,3 @@ +xM0a=\@B;Sbt +bL<]|RJi6yJ-e5N1dP +4?'~FGhq(ܔv*Lk]ANx)xmC \ No newline at end of file diff --git a/packages/git-diff/spec/fixtures/working-dir/git.git/objects/e7/fd5b055dcdaa93ad8f9d63ca8db5330537105f b/packages/git-diff/spec/fixtures/working-dir/git.git/objects/e7/fd5b055dcdaa93ad8f9d63ca8db5330537105f new file mode 100644 index 0000000000000000000000000000000000000000..05ab754216dda8a7378997be54992e844cbacaf8 GIT binary patch literal 236 zcmVAWiT`_Ff%bxC{D~R$Vt`9DrWd?ykU#A!uFr{q)$~oob*f2 n;P&fmR7E8fB@A|jp-ejqul&%^m1A9T=GV3F%#{KFDZn9!hz}*T literal 0 HcmV?d00001 diff --git a/packages/git-diff/spec/fixtures/working-dir/git.git/objects/fb/33b0b43b20b7f9de1bca79e192fa2e30dbeb6b b/packages/git-diff/spec/fixtures/working-dir/git.git/objects/fb/33b0b43b20b7f9de1bca79e192fa2e30dbeb6b new file mode 100644 index 0000000000000000000000000000000000000000..e9ffee6407bbb200388e6ccbecf97457892a94e9 GIT binary patch literal 227 zcmV<90382#0bNkbP6Htnb=|KxOGqZ9OmjwG%cPIItCLU@jpTP(vxu>8wO-@v-dBxlIWm2!4c3W8{g~4?p^1@WLCCf* zb9fb*g@skT^J_EjtlV%oX`@Wvo~b2E(@oNre1Ev#@aX#W=QB?1V*lf8=Djo1`Rv@K zJ6k3{{~OI3dv?|2wf%FGPxWp!W;GXx|LEwseRCJrbRDQ4 zxZ7T-V`(Q_ws=00y!`UF@rEtd3fq6)lRj1XaMCY5gWIpOZT?98e{WFD6cP}xQoE+* zek*tO*~S&ir52h53TziV^il4`13jJIEqnz+0&{`cYc{Yr0EG_^ki8zrHUMTLcOd&W zki84YZUoA00MciF8*Is2%ar~8rBBD#NU2=gzo-1Bx@O6&*vWDE=!E@FAHr_=dGV}zx*WUY&swrE}GOGZ--2d3<%)5qLB zq8!)X+VXReqUHQW3-;PgQ_7#xsa`qvhwrBdjp8MrYuEJKmK4tP4~krUKsvqGW{W|G z+w+ZK|88$R_V~Q$^o_N5GUC+V&71v$L2|Y8{r4;lDiw38&-|DXxP6I+X{e&1uA#2w z*)vKvl{7CNu+hDFP3^2mku4dRI%t?j3>7hZF=H9@;LS!F|Jl+t|dgcU^2%lP2rYY1c&lSniV&=6~?1x;s4V zy`sk2lH0-eBc|O6dTS!(Jncjw$BSDJI87Hmh_=+%mic3QuHcD#Npj2EABq36%DrTk zpVD2)d^I99%Vo=ki7HDgu8Vko{4al`PC}u0m*2i!DGz=w|D^MXb@ytA*_&i4=HyQB z%{#0h(E8o-sE*^RfX!!WZrcB84 zYob91ChM=*X(#nY=<({+Mia|2YoqT@ebj$=mB6=Uo}t##TYf426P-8xVuIs8>B{2r z+zs2MG@bg|O#2U?p7SeuZNtWSxfefquGykruy9YX(Z;Sik?hi^pOSi0=T={^p16lg zvT5(86a%})C3gJ5C3B>Xo#mguwl~bWVh;DY^S+@Po@+HOK4xN&P-5P+nx$fnv5A3! zv0xz6rB(bhpJn>(&8m~xzn`nke|0zOOqQNNe#fE}OBS^pTxT#PGyUOI zd8u7RYqZb(+4XJi&L9Q`m1 z#6Q$-&KK|V55B$5!Rw0BLV2GToXx@@SJ*T|U9tb4OSQAx>rU39TUJ~rm%6&HtW>q) zg1g0v%XQ{UNr7#q)0qUOq^CSv;%Ae8B*S**#ETb2l_I#+x`VvEx<83@eeU)$aZt;6 zrTYB2s`|7Hk(6mql`9e|H*B0WOX2O-Ym?OtUu}vgz8b~Mux_!Q?QerEd25-n-@o+f O_!=pdYy0<<-&6o5ToB9v diff --git a/packages/git-diff/spec/fixtures/working-dir/git.git/packed-refs b/packages/git-diff/spec/fixtures/working-dir/git.git/packed-refs deleted file mode 100644 index 1a97c394d..000000000 --- a/packages/git-diff/spec/fixtures/working-dir/git.git/packed-refs +++ /dev/null @@ -1,2 +0,0 @@ -# pack-refs with: peeled fully-peeled sorted -745ed7547d15a61bc4ee7e182615590f44aca201 refs/heads/master diff --git a/packages/git-diff/spec/fixtures/working-dir/git.git/refs/heads/master b/packages/git-diff/spec/fixtures/working-dir/git.git/refs/heads/master new file mode 100644 index 000000000..83fe7393f --- /dev/null +++ b/packages/git-diff/spec/fixtures/working-dir/git.git/refs/heads/master @@ -0,0 +1 @@ +065a272b55ec2ee84530dffd60b6869f7bf5d99c diff --git a/packages/git-diff/spec/git-diff-spec.js b/packages/git-diff/spec/git-diff-spec.js index 950fec71d..badb15f76 100644 --- a/packages/git-diff/spec/git-diff-spec.js +++ b/packages/git-diff/spec/git-diff-spec.js @@ -156,13 +156,13 @@ describe('GitDiff package', () => { describe('move-to-next-diff/move-to-previous-diff events', () => { it('moves the cursor to first character of the next/previous diff line', () => { editor.insertText('a') - editor.setCursorBufferPosition([9]) + editor.setCursorBufferPosition([5]) editor.deleteLine() advanceClock(editor.getBuffer().stoppedChangingDelay) editor.setCursorBufferPosition([0]) atom.commands.dispatch(editorElement, 'git-diff:move-to-next-diff') - expect(editor.getCursorBufferPosition()).toEqual([8, 4]) + expect(editor.getCursorBufferPosition()).toEqual([4, 4]) atom.commands.dispatch(editorElement, 'git-diff:move-to-previous-diff') expect(editor.getCursorBufferPosition()).toEqual([0, 0]) @@ -170,19 +170,19 @@ describe('GitDiff package', () => { it('wraps around to the first/last diff in the file', () => { editor.insertText('a') - editor.setCursorBufferPosition([9]) + editor.setCursorBufferPosition([5]) editor.deleteLine() advanceClock(editor.getBuffer().stoppedChangingDelay) editor.setCursorBufferPosition([0]) atom.commands.dispatch(editorElement, 'git-diff:move-to-next-diff') - expect(editor.getCursorBufferPosition()).toEqual([8, 4]) + expect(editor.getCursorBufferPosition()).toEqual([4, 4]) atom.commands.dispatch(editorElement, 'git-diff:move-to-next-diff') expect(editor.getCursorBufferPosition()).toEqual([0, 0]) atom.commands.dispatch(editorElement, 'git-diff:move-to-previous-diff') - expect(editor.getCursorBufferPosition()).toEqual([8, 4]) + expect(editor.getCursorBufferPosition()).toEqual([4, 4]) }) describe('when the wrapAroundOnMoveToDiff config option is false', () => { @@ -192,16 +192,16 @@ describe('GitDiff package', () => { it('does not wraps around to the first/last diff in the file', () => { editor.insertText('a') - editor.setCursorBufferPosition([9]) + editor.setCursorBufferPosition([5]) editor.deleteLine() advanceClock(editor.getBuffer().stoppedChangingDelay) editor.setCursorBufferPosition([0]) atom.commands.dispatch(editorElement, 'git-diff:move-to-next-diff') - expect(editor.getCursorBufferPosition()).toEqual([8, 4]) + expect(editor.getCursorBufferPosition()).toEqual([4, 4]) atom.commands.dispatch(editorElement, 'git-diff:move-to-next-diff') - expect(editor.getCursorBufferPosition()).toEqual([8, 4]) + expect(editor.getCursorBufferPosition()).toEqual([4, 4]) atom.commands.dispatch(editorElement, 'git-diff:move-to-previous-diff') expect(editor.getCursorBufferPosition()).toEqual([0, 0])