From 591db010670190c2982870178dc5a9ddf278af43 Mon Sep 17 00:00:00 2001 From: Ben Ogle Date: Wed, 29 Jul 2015 11:48:49 -0700 Subject: [PATCH] Spy on Task::terminate instead of passing an obj through --- spec/default-directory-searcher-spec.coffee | 8 +++----- src/default-directory-searcher.coffee | 1 - 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/spec/default-directory-searcher-spec.coffee b/spec/default-directory-searcher-spec.coffee index 08cf441d6..4e0b7321d 100644 --- a/spec/default-directory-searcher-spec.coffee +++ b/spec/default-directory-searcher-spec.coffee @@ -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() diff --git a/src/default-directory-searcher.coffee b/src/default-directory-searcher.coffee index 6fba05bcf..1c9b40312 100644 --- a/src/default-directory-searcher.coffee +++ b/src/default-directory-searcher.coffee @@ -92,7 +92,6 @@ class DefaultDirectorySearcher return { then: promise.then.bind(promise) catch: promise.catch.bind(promise) - directorySearch: directorySearch cancel: -> isCancelled = true directorySearch.cancel()