diff --git a/spec/select-list-spec.coffee b/spec/select-list-spec.coffee index 9c1c64555..152ba64ef 100644 --- a/spec/select-list-spec.coffee +++ b/spec/select-list-spec.coffee @@ -33,7 +33,7 @@ describe "SelectList", -> selectList.attachToDom() it "filters the elements in the list based on the scoreElement function and selects the first item", -> - miniEditor.insertText('la') + miniEditor.getEditor().insertText('la') window.advanceClock(selectList.inputThrottle) expect(list.find('li').length).toBe 2 @@ -43,13 +43,13 @@ describe "SelectList", -> expect(selectList.error).not.toBeVisible() it "displays an error if there are no matches, removes error when there are matches", -> - miniEditor.insertText('nothing will match this') + miniEditor.getEditor().insertText('nothing will match this') window.advanceClock(selectList.inputThrottle) expect(list.find('li').length).toBe 0 expect(selectList.error).not.toBeHidden() - miniEditor.setText('la') + miniEditor.getEditor().setText('la') window.advanceClock(selectList.inputThrottle) expect(list.find('li').length).toBe 2 @@ -58,7 +58,7 @@ describe "SelectList", -> it "displays no elements until the array has been set on the list", -> selectList.array = null selectList.list.empty() - miniEditor.insertText('la') + miniEditor.getEditor().insertText('la') window.advanceClock(selectList.inputThrottle) expect(list.find('li').length).toBe 0 @@ -124,7 +124,7 @@ describe "SelectList", -> selectList.attachToDom() it "does not trigger the confirmed hook", -> - miniEditor.insertText("i will never match anything") + miniEditor.getEditor().insertText("i will never match anything") window.advanceClock(selectList.inputThrottle) expect(list.find('li')).not.toExist() @@ -132,7 +132,7 @@ describe "SelectList", -> expect(selectList.confirmed).not.toHaveBeenCalled() it "does trigger the cancelled hook", -> - miniEditor.insertText("i will never match anything") + miniEditor.getEditor().insertText("i will never match anything") window.advanceClock(selectList.inputThrottle) expect(list.find('li')).not.toExist() diff --git a/spec/workspace-view-spec.coffee b/spec/workspace-view-spec.coffee index 216466aee..c7daf9f8d 100644 --- a/spec/workspace-view-spec.coffee +++ b/spec/workspace-view-spec.coffee @@ -30,9 +30,9 @@ describe "WorkspaceView", -> it "constructs the view with the same panes", -> atom.workspaceView.attachToDom() atom.workspaceView.openSync() - editor1 = atom.workspaceView.getActiveView() - buffer = editor1.getBuffer() - editor1.splitRight() + editorView1 = atom.workspaceView.getActiveView() + buffer = editorView1.getEditor().getBuffer() + editorView1.splitRight() expect(atom.workspaceView.getActivePane()).toBe atom.workspaceView.getPanes()[1] simulateReload() @@ -58,31 +58,31 @@ describe "WorkspaceView", -> simulateReload() expect(atom.workspaceView.getEditorViews().length).toBe 4 - editor1 = atom.workspaceView.panes.find('.row > .pane .editor:eq(0)').view() - editor3 = atom.workspaceView.panes.find('.row > .pane .editor:eq(1)').view() - editor2 = atom.workspaceView.panes.find('.row > .column > .pane .editor:eq(0)').view() - editor4 = atom.workspaceView.panes.find('.row > .column > .pane .editor:eq(1)').view() + editorView1 = atom.workspaceView.panes.find('.row > .pane .editor:eq(0)').view() + editorView3 = atom.workspaceView.panes.find('.row > .pane .editor:eq(1)').view() + editorView2 = atom.workspaceView.panes.find('.row > .column > .pane .editor:eq(0)').view() + editorView4 = atom.workspaceView.panes.find('.row > .column > .pane .editor:eq(1)').view() - expect(editor1.getPath()).toBe atom.project.resolve('a') - expect(editor2.getPath()).toBe atom.project.resolve('b') - expect(editor3.getPath()).toBe atom.project.resolve('../sample.js') - expect(editor3.getCursorScreenPosition()).toEqual [2, 4] - expect(editor4.getPath()).toBe atom.project.resolve('../sample.txt') - expect(editor4.getCursorScreenPosition()).toEqual [0, 2] + expect(editorView1.getEditor().getPath()).toBe atom.project.resolve('a') + expect(editorView2.getEditor().getPath()).toBe atom.project.resolve('b') + expect(editorView3.getEditor().getPath()).toBe atom.project.resolve('../sample.js') + expect(editorView3.getEditor().getCursorScreenPosition()).toEqual [2, 4] + expect(editorView4.getEditor().getPath()).toBe atom.project.resolve('../sample.txt') + expect(editorView4.getEditor().getCursorScreenPosition()).toEqual [0, 2] # ensure adjust pane dimensions is called - expect(editor1.width()).toBeGreaterThan 0 - expect(editor2.width()).toBeGreaterThan 0 - expect(editor3.width()).toBeGreaterThan 0 - expect(editor4.width()).toBeGreaterThan 0 + expect(editorView1.width()).toBeGreaterThan 0 + expect(editorView2.width()).toBeGreaterThan 0 + expect(editorView3.width()).toBeGreaterThan 0 + expect(editorView4.width()).toBeGreaterThan 0 - # ensure correct editor is focused again - expect(editor2.isFocused).toBeTruthy() - expect(editor1.isFocused).toBeFalsy() - expect(editor3.isFocused).toBeFalsy() - expect(editor4.isFocused).toBeFalsy() + # ensure correct editorView is focused again + expect(editorView2.isFocused).toBeTruthy() + expect(editorView1.isFocused).toBeFalsy() + expect(editorView3.isFocused).toBeFalsy() + expect(editorView4.isFocused).toBeFalsy() - expect(atom.workspaceView.title).toBe "#{path.basename(editor2.getPath())} - #{atom.project.getPath()}" + expect(atom.workspaceView.title).toBe "#{path.basename(editorView2.getEditor().getPath())} - #{atom.project.getPath()}" describe "where there are no open editors", -> it "constructs the view with no open editors", -> @@ -463,27 +463,27 @@ describe "WorkspaceView", -> it "shows/hides invisibles in all open and future editors", -> atom.workspaceView.height(200) atom.workspaceView.attachToDom() - rightEditor = atom.workspaceView.getActiveView() - rightEditor.setText(" \t ") - leftEditor = rightEditor.splitLeft() - expect(rightEditor.find(".line:first").text()).toBe " " - expect(leftEditor.find(".line:first").text()).toBe " " + rightEditorView = atom.workspaceView.getActiveView() + rightEditorView.getEditor().setText(" \t ") + leftEditorView = rightEditorView.splitLeft() + expect(rightEditorView.find(".line:first").text()).toBe " " + expect(leftEditorView.find(".line:first").text()).toBe " " - withInvisiblesShowing = "#{rightEditor.invisibles.space}#{rightEditor.invisibles.tab} #{rightEditor.invisibles.space}#{rightEditor.invisibles.eol}" + withInvisiblesShowing = "#{rightEditorView.invisibles.space}#{rightEditorView.invisibles.tab} #{rightEditorView.invisibles.space}#{rightEditorView.invisibles.eol}" atom.workspaceView.trigger "window:toggle-invisibles" - expect(rightEditor.find(".line:first").text()).toBe withInvisiblesShowing - expect(leftEditor.find(".line:first").text()).toBe withInvisiblesShowing + expect(rightEditorView.find(".line:first").text()).toBe withInvisiblesShowing + expect(leftEditorView.find(".line:first").text()).toBe withInvisiblesShowing - lowerLeftEditor = leftEditor.splitDown() - expect(lowerLeftEditor.find(".line:first").text()).toBe withInvisiblesShowing + lowerLeftEditorView = leftEditorView.splitDown() + expect(lowerLeftEditorView.find(".line:first").text()).toBe withInvisiblesShowing atom.workspaceView.trigger "window:toggle-invisibles" - expect(rightEditor.find(".line:first").text()).toBe " " - expect(leftEditor.find(".line:first").text()).toBe " " + expect(rightEditorView.find(".line:first").text()).toBe " " + expect(leftEditorView.find(".line:first").text()).toBe " " - lowerRightEditor = rightEditor.splitDown() - expect(lowerRightEditor.find(".line:first").text()).toBe " " + lowerRightEditorView = rightEditorView.splitDown() + expect(lowerRightEditorView.find(".line:first").text()).toBe " " describe ".eachEditorView(callback)", -> beforeEach -> diff --git a/src/select-list.coffee b/src/select-list.coffee index 21cb270de..415560aed 100644 --- a/src/select-list.coffee +++ b/src/select-list.coffee @@ -30,7 +30,7 @@ class SelectList extends View # This method can be overridden by subclasses but `super` should always # be called. initialize: -> - @miniEditor.getBuffer().on 'changed', => @schedulePopulateList() + @miniEditor.getEditor().getBuffer().on 'changed', => @schedulePopulateList() @miniEditor.hiddenInput.on 'focusout', => @cancel() unless @cancelling @on 'core:move-up', => @selectPreviousItem() @on 'core:move-down', => @selectNextItem() @@ -98,7 +98,7 @@ class SelectList extends View # # Returns a {String} to use when fuzzy filtering the elements to display. getFilterQuery: -> - @miniEditor.getText() + @miniEditor.getEditor().getText() # Public: Build the DOM elements using the array from the last call to # {.setArray}. @@ -207,7 +207,7 @@ class SelectList extends View # Private: cancelled: -> - @miniEditor.setText('') + @miniEditor.getEditor().setText('') @miniEditor.updateDisplay() # Public: Cancel and close the select list dialog.