 
     beforeEach ->
       util.openPath 'rebase-2way-diff.txt', (editorView) ->
-        conflict = Conflict.all({ isRebase: true }, editorView.getEditor())[0]
+        conflict = Conflict.all({ isRebase: true }, editorView.getModel())[0]
 
     it 'swaps the lines for "ours" and "theirs"', ->
       expect(util.rowRangeFrom conflict.theirs.marker).toEqual([3, 4])


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

    it 'knows its conflict', ->


    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])
