github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-04-28 03:01:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/github/atom

Browse Source
This commit is contained in:
Corey Johnson & Nathan Sobo
2012-12-11 16:51:35 -08:00
parent dc60017c02 339eeac0d8
commit 4e9dc5fe71
10 changed files with 48 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
spec/app/editor-spec.coffee
View File

@@ -1005,12 +1005,12 @@ describe "Editor", ->
editor.addCursorAtBufferPosition([6,50])
[cursor1, cursor2] = editor.getCursors()
spyOn(editor, 'scrollTo')
spyOn(editor, 'scrollToPixelPosition')
cursor1.setScreenPosition([10, 10])
expect(editor.scrollTo).not.toHaveBeenCalled()
expect(editor.scrollToPixelPosition).not.toHaveBeenCalled()
cursor2.setScreenPosition([11, 11])
expect(editor.scrollTo).toHaveBeenCalled()
expect(editor.scrollToPixelPosition).toHaveBeenCalled()
describe "when the last cursor exceeds the upper or lower scroll margins", ->
describe "when the editor is taller than twice the vertical scroll margin", ->
@@ -1396,7 +1396,6 @@ describe "Editor", ->
describe "when lines are added", ->
beforeEach ->
editor.attachToDom(heightInLines: 5)
spyOn(editor, "scrollTo")
describe "when the change precedes the first rendered row", ->
it "inserts and removes rendered lines to account for upstream change", ->
@@ -1448,7 +1447,6 @@ describe "Editor", ->
describe "when lines are removed", ->
beforeEach ->
editor.attachToDom(heightInLines: 5)
spyOn(editor, "scrollTo")
it "sets the rendered screen line's width to either the max line length or the scollView's width (whichever is greater)", ->
maxLineLength = editor.maxScreenLineLength()
@@ -1614,7 +1612,6 @@ describe "Editor", ->
describe "when lines are inserted", ->
it "re-renders the correct line number range in the gutter", ->
spyOn(editor, 'scrollTo')
editor.scrollTop(3 * editor.lineHeight)
expect(editor.gutter.find('.line-number:first').text()).toBe '2'
expect(editor.gutter.find('.line-number:last').text()).toBe '11'

8
spec/app/status-bar-spec.coffee
View File

@@ -158,3 +158,11 @@ describe "StatusBar", ->
fs.write(path, originalPathText)
rootView.getActiveEditor().getBuffer().trigger 'git-status-change'
expect(statusBar.gitStatusIcon).toHaveText('')
it "updates when the window receives focus", ->
fs.write(path, "i've changed for the worse")
rootView.open(path)
expect(statusBar.gitStatusIcon).toHaveText('\uf26d')
fs.write(path, originalPathText)
$(window).trigger 'focus'
expect(statusBar.gitStatusIcon).toHaveText('')