         active = m.conflicts[1]
 
       it 'accepts the current side with merge-conflicts:accept-current', ->
-        editorView.trigger 'merge-conflicts:accept-current'
+        atom.commands.dispatch editorView, 'merge-conflicts:accept-current'
         expect(active.resolution).toBe(active.ours)
 
       it "does nothing if you have cursors in both sides", ->
         editor.addCursorAtBufferPosition [16, 2]
-        editorView.trigger 'merge-conflicts:accept-current'
+        atom.commands.dispatch editorView, 'merge-conflicts:accept-current'
         expect(active.resolution).toBeNull()
 
       it 'accepts "ours" on merge-conflicts:accept-ours', ->
-        editorView.trigger 'merge-conflicts:accept-ours'
+        atom.commands.dispatch editorView, 'merge-conflicts:accept-current'
         expect(active.resolution).toBe(active.ours)
 
       it 'accepts "theirs" on merge-conflicts:accept-theirs', ->
-        editorView.trigger 'merge-conflicts:accept-theirs'
+        atom.commands.dispatch editorView, 'merge-conflicts:accept-theirs'
         expect(active.resolution).toBe(active.theirs)
 
       it 'jumps to the next unresolved on merge-conflicts:next-unresolved', ->
-        editorView.trigger 'merge-conflicts:next-unresolved'
+        atom.commands.dispatch editorView, 'merge-conflicts:next-unresolved'
         expect(cursors()).toEqual([[22, 0]])
 
       it 'jumps to the previous unresolved on merge-conflicts:previous-unresolved', ->
-        editorView.trigger 'merge-conflicts:previous-unresolved'
+        atom.commands.dispatch editorView, 'merge-conflicts:previous-unresolved'
         expect(cursors()).toEqual([[5, 0]])
 
       it 'reverts a dirty hunk on merge-conflicts:revert-current', ->

        editorView.getFirstVisibleScreenRow = -> 0
        editorView.getLastVisibleScreenRow = -> 999

        editor = editorView.getEditor()
        state =
          isRebase: true


        active = m.conflicts[0]

    it 'accepts theirs-then-ours on merge-conflicts:theirs-then-ours', ->
      atom.commands.dispatch editorView, 'merge-conflicts:theirs-then-ours'
      expect(active.resolution).toBe(active.theirs)
      t = editor.getTextInBufferRange active.resolution.marker.getBufferRange()
      expect(t).toBe("These are your changes\nThese are my changes\n")

    it 'accepts ours-then-theirs on merge-conflicts:ours-then-theirs', ->
      atom.commands.dispatch editorView, 'merge-conflicts:ours-then-theirs'
      expect(active.resolution).toBe(active.ours)
      t = editor.getTextInBufferRange active.resolution.marker.getBufferRange()
      expect(t).toBe("These are my changes\nThese are your changes\n")
