 
     beforeEach ->
       util.openPath 'single-2way-diff.txt', (editorView) ->
-        conflict = Conflict.all({ isRebase: false }, editorView.getEditor())[0]
+        conflict = Conflict.all({ isRebase: false }, editorView.getModel())[0]
 
     it 'identifies the correct rows', ->
       expect(util.rowRangeFrom conflict.ours.marker).toEqual([1, 2])


    beforeEach ->
      util.openPath 'triple-2way-diff.txt', (editorView) ->
        conflicts = Conflict.all({}, editorView.getEditor())
        navigator = conflicts[1].navigator

    it 'knows its conflict', ->


  it "finds multiple conflict markings", ->
    util.openPath 'multi-2way-diff.txt', (editorView) ->
      cs = Conflict.all({}, editorView.getModel())

      expect(cs.length).toBe(2)
      expect(util.rowRangeFrom cs[0].ours.marker).toEqual([5, 7])
