         waitsFor "second change event", ->
           changeHandler.callCount > 0
 
-    describe "when the file is removed", ->
-      it "triggers 'remove' event handlers", ->
-        removeHandler = jasmine.createSpy('removeHandler')
-        file.on 'removed', removeHandler
+    describe "when the file is deleted", ->
+      it "notifies ::onDidDelete observers", ->
+        deleteHandler = jasmine.createSpy('deleteHandler')
+        file.onDidDelete(deleteHandler)
         fs.removeSync(file.getPath())
 
         waitsFor "remove event", ->
-          removeHandler.callCount > 0
+          deleteHandler.callCount > 0
 
     describe "when a file is moved (via the filesystem)", ->
       newPath = null

          changeHandler.callCount == 1

        runs ->
          expect(removeHandler).not.toHaveBeenCalled()
          fs.writeFileSync(filePath, "Hallelujah!")
          changeHandler.reset()


      afterEach ->
        if fs.existsSync(newPath)
          fs.removeSync(newPath)
          deleteHandler = jasmine.createSpy('deleteHandler')
          file.onDidDelete(deleteHandler)
          waitsFor "remove event", 30000, -> deleteHandler.callCount > 0

      it "it updates its path", ->
        moveHandler = jasmine.createSpy('moveHandler')
