         editorView.getFirstVisibleScreenRow = -> 0
         editorView.getLastVisibleScreenRow = -> 999
 
-        editor = editorView.getEditor()
+        editor = editorView.getModel()
         state =
           isRebase: true
 


      it 'no-ops the resolution commands', ->
        for e in ['accept-current', 'accept-ours', 'accept-theirs', 'revert-current']
          editorView.trigger "merge-conflicts:#{e}"
          expect(m.active()).toEqual([])
          for c in m.conflicts
            expect(c.isResolved()).toBe(false)

      it 'jumps to the next unresolved on merge-conflicts:next-unresolved', ->
        expect(m.active()).toEqual([])
        editorView.trigger 'merge-conflicts:next-unresolved'
        expect(cursors()).toEqual([[14, 0]])

      it 'jumps to the previous unresolved on merge-conflicts:next-unresolved', ->
        editorView.trigger 'merge-conflicts:previous-unresolved'
        expect(cursors()).toEqual([[5, 0]])

    describe 'when the resolution is complete', ->

      beforeEach -> c.ours.resolve() for c in m.conflicts

      it 'removes all of the CoveringViews', ->
        expect($(editorView).find('.overlayer .side').length).toBe(0)
        expect($(editorView).find('.overlayer .navigation').length).toBe(0)

      it 'removes the .conflicted class', ->
        expect($(editorView).hasClass 'conflicted').toBe(false)

      it 'appends a ResolverView to the workspace', ->
        workspaceView = atom.views.getView atom.workspace
