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 17dcc2005..a15f269aa 100644 Binary files a/packages/git-diff/spec/fixtures/working-dir/git.git/index and b/packages/git-diff/spec/fixtures/working-dir/git.git/index differ 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 000000000..03673f8db Binary files /dev/null and b/packages/git-diff/spec/fixtures/working-dir/git.git/objects/06/5a272b55ec2ee84530dffd60b6869f7bf5d99c differ 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 000000000..1cbeb30fc Binary files /dev/null and b/packages/git-diff/spec/fixtures/working-dir/git.git/objects/3e/715502b971d4f8282d1e05a8ccfad6f7037910 differ diff --git a/packages/git-diff/spec/fixtures/working-dir/git.git/objects/8e/ab2e81eb8dea81ad08694c7b30ae165af89c8e b/packages/git-diff/spec/fixtures/working-dir/git.git/objects/8e/ab2e81eb8dea81ad08694c7b30ae165af89c8e new file mode 100644 index 000000000..edb8b87fa Binary files /dev/null and b/packages/git-diff/spec/fixtures/working-dir/git.git/objects/8e/ab2e81eb8dea81ad08694c7b30ae165af89c8e differ 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 000000000..05ab75421 Binary files /dev/null and b/packages/git-diff/spec/fixtures/working-dir/git.git/objects/e7/fd5b055dcdaa93ad8f9d63ca8db5330537105f differ diff --git a/packages/git-diff/spec/fixtures/working-dir/git.git/objects/f1/4149b7b38a0a972c46557877caff6c9fe76476 b/packages/git-diff/spec/fixtures/working-dir/git.git/objects/f1/4149b7b38a0a972c46557877caff6c9fe76476 new file mode 100644 index 000000000..32ea766a5 Binary files /dev/null and b/packages/git-diff/spec/fixtures/working-dir/git.git/objects/f1/4149b7b38a0a972c46557877caff6c9fe76476 differ 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 000000000..e9ffee640 Binary files /dev/null and b/packages/git-diff/spec/fixtures/working-dir/git.git/objects/fb/33b0b43b20b7f9de1bca79e192fa2e30dbeb6b differ diff --git a/packages/git-diff/spec/fixtures/working-dir/git.git/objects/info/packs b/packages/git-diff/spec/fixtures/working-dir/git.git/objects/info/packs deleted file mode 100644 index 0aee1c359..000000000 --- a/packages/git-diff/spec/fixtures/working-dir/git.git/objects/info/packs +++ /dev/null @@ -1,2 +0,0 @@ -P pack-fb30b46ead026befe94c88f5591a6d3dfdca4e95.pack - diff --git a/packages/git-diff/spec/fixtures/working-dir/git.git/objects/pack/pack-fb30b46ead026befe94c88f5591a6d3dfdca4e95.idx b/packages/git-diff/spec/fixtures/working-dir/git.git/objects/pack/pack-fb30b46ead026befe94c88f5591a6d3dfdca4e95.idx deleted file mode 100644 index b6c4d9c61..000000000 Binary files a/packages/git-diff/spec/fixtures/working-dir/git.git/objects/pack/pack-fb30b46ead026befe94c88f5591a6d3dfdca4e95.idx and /dev/null differ diff --git a/packages/git-diff/spec/fixtures/working-dir/git.git/objects/pack/pack-fb30b46ead026befe94c88f5591a6d3dfdca4e95.pack b/packages/git-diff/spec/fixtures/working-dir/git.git/objects/pack/pack-fb30b46ead026befe94c88f5591a6d3dfdca4e95.pack deleted file mode 100644 index 2496e7718..000000000 Binary files a/packages/git-diff/spec/fixtures/working-dir/git.git/objects/pack/pack-fb30b46ead026befe94c88f5591a6d3dfdca4e95.pack and /dev/null differ 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])