Spy on Task::terminate instead of passing an obj through

This commit is contained in:
Ben Ogle
2015-07-29 11:48:49 -07:00
parent f77fe8acab
commit 591db01067
2 changed files with 3 additions and 6 deletions

View File

@@ -1,7 +1,6 @@
DefaultDirectorySearcher = require "../src/default-directory-searcher"
Task = require "../src/task"
path = require "path"
fs = require 'fs-plus'
temp = require "temp"
describe "DefaultDirectorySearcher", ->
[searcher, dirPath] = []
@@ -21,10 +20,9 @@ describe "DefaultDirectorySearcher", ->
didError: ->
didSearchPaths: ->
searchPromise = searcher.search([{getPath: -> dirPath}], /abcdefg/, options)
spyOn(searchPromise.directorySearch.task, 'terminate').andCallThrough()
spyOn(Task::, 'terminate').andCallThrough()
waitsForPromise -> searchPromise
runs ->
expect(searchPromise.directorySearch.task.terminate).toHaveBeenCalled()
expect(searchPromise.directorySearch.task.childProcess).toBe null
expect(Task::terminate).toHaveBeenCalled()

View File

@@ -92,7 +92,6 @@ class DefaultDirectorySearcher
return {
then: promise.then.bind(promise)
catch: promise.catch.bind(promise)
directorySearch: directorySearch
cancel: ->
isCancelled = true
directorySearch.cancel()