From 66d618a41cdee1e7f3944c32a3349451619baeb5 Mon Sep 17 00:00:00 2001
From: Corey Johnson <cj@github.com>
Date: Wed, 6 Feb 2013 15:52:35 -0800
Subject: [PATCH] Fix snippet specs

---
 src/packages/snippets/spec/snippets-spec.coffee     | 11 ++++-------
 src/packages/snippets/src/load-snippets-task.coffee |  2 +-
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/packages/snippets/spec/snippets-spec.coffee b/src/packages/snippets/spec/snippets-spec.coffee
index e8499248b..d07fc9d4e 100644
--- a/src/packages/snippets/spec/snippets-spec.coffee
+++ b/src/packages/snippets/spec/snippets-spec.coffee
@@ -12,7 +12,10 @@ describe "Snippets extension", ->
   beforeEach ->
     rootView = new RootView(require.resolve('fixtures/sample.js'))
     spyOn(LoadSnippetsTask.prototype, 'start')
+
+    atom.loadPackage("package-with-snippets")
     atom.loadPackage("snippets")
+
     editor = rootView.getActiveEditor()
     editSession = rootView.getActiveEditSession()
     buffer = editor.getBuffer()
@@ -20,7 +23,7 @@ describe "Snippets extension", ->
     rootView.enableKeymap()
 
   afterEach ->
-    rootView.remove()
+    rootView.deactivate()
     delete window.snippets
 
   describe "when 'tab' is triggered on the editor", ->
@@ -232,7 +235,6 @@ describe "Snippets extension", ->
 
   describe "snippet loading", ->
     beforeEach ->
-      atom.packages = null
       jasmine.unspy(LoadSnippetsTask.prototype, 'start')
       spyOn(LoadSnippetsTask.prototype, 'loadAtomSnippets').andCallFake -> @snippetsLoaded({})
       spyOn(LoadSnippetsTask.prototype, 'loadTextMateSnippets').andCallFake -> @snippetsLoaded({})
@@ -254,7 +256,6 @@ describe "Snippets extension", ->
 
     it "loads snippets from all TextMate packages with snippets", ->
       jasmine.unspy(LoadSnippetsTask.prototype, 'loadTextMateSnippets')
-      spyOn(console, 'warn')
       snippets.loaded = false
       snippets.loadAll()
 
@@ -271,10 +272,6 @@ describe "Snippets extension", ->
           }
         """
 
-        # warn about junk-file, but don't even try to parse a hidden file
-        expect(console.warn).toHaveBeenCalled()
-        expect(console.warn.calls.length).toBe 1
-
     it "terminates the worker when loading completes", ->
       jasmine.unspy(LoadSnippetsTask.prototype, 'loadAtomSnippets')
       spyOn(console, "warn")
diff --git a/src/packages/snippets/src/load-snippets-task.coffee b/src/packages/snippets/src/load-snippets-task.coffee
index e32d70dde..9a20b5416 100644
--- a/src/packages/snippets/src/load-snippets-task.coffee
+++ b/src/packages/snippets/src/load-snippets-task.coffee
@@ -5,7 +5,7 @@ module.exports =
 class LoadSnippetsTask extends Task
   constructor: (@snippets) ->
     super('snippets/src/load-snippets-handler')
-    @packages = atom.getPackages()
+    @packages = atom.getLoadedPackages()
     @packages.push(path: config.configDirPath)
 
   started: ->