 
   it "finds multiple conflict markings", ->
     util.openPath 'multi-2way-diff.txt', (editorView) ->
-      cs = Conflict.all({}, editorView.getEditor())
+      cs = Conflict.all({}, editorView.getModel())
 
       expect(cs.length).toBe(2)
       expect(util.rowRangeFrom cs[0].ours.marker).toEqual([5, 7])


    beforeEach ->
      util.openPath 'rebase-2way-diff.txt', (editorView) ->
        conflict = Conflict.all({ isRebase: true }, editorView.getEditor())[0]

    it 'swaps the lines for "ours" and "theirs"', ->
      expect(util.rowRangeFrom conflict.theirs.marker).toEqual([3, 4])


    beforeEach ->
      util.openPath 'single-2way-diff.txt', (editorView) ->
        conflict = Conflict.all({ isRebase: false }, editorView.getModel())[0]

    it 'identifies the correct rows', ->
      expect(util.rowRangeFrom conflict.ours.marker).toEqual([1, 2])
