From c27de893276fc78cca35e6d0e7ce8a3c465df707 Mon Sep 17 00:00:00 2001
From: Nathan Sobo <nathan@github.com>
Date: Sun, 27 Jan 2013 13:25:59 -0700
Subject: [PATCH] Eliminate warning messages from snippets-spec

Mock loading of TextMate snippets or Atom snippets and only enable
loading for the type of snippet being currently tested. This limits
logging of warning to the single warning we expect for each type, which
allows us to not call through on the mocking of `console.warn` and
explicitly check for the single expected call.
---
 src/packages/snippets/spec/snippets-spec.coffee | 17 +++++++++++------
 .../snippets/src/load-snippets-handler.coffee   |  2 +-
 .../snippets/src/load-snippets-task.coffee      | 11 ++++++++---
 3 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/src/packages/snippets/spec/snippets-spec.coffee b/src/packages/snippets/spec/snippets-spec.coffee
index 3aa6a8ea7..367fcd07b 100644
--- a/src/packages/snippets/spec/snippets-spec.coffee
+++ b/src/packages/snippets/spec/snippets-spec.coffee
@@ -212,9 +212,14 @@ describe "Snippets extension", ->
         expect(editor.getSelectedBufferRange()).toEqual [[1, 6], [1, 36]]
 
   describe "snippet loading", ->
-    it "loads non-hidden snippet files from all atom packages with snippets directories, logging a warning if a file can't be parsed", ->
-      spyOn(console, 'warn').andCallThrough()
+    beforeEach ->
       jasmine.unspy(LoadSnippetsTask.prototype, 'start')
+      spyOn(LoadSnippetsTask.prototype, 'loadAtomSnippets').andCallFake -> @snippetsLoaded({})
+      spyOn(LoadSnippetsTask.prototype, 'loadTextMateSnippets').andCallFake -> @snippetsLoaded({})
+
+    it "loads non-hidden snippet files from all atom packages with snippets directories, logging a warning if a file can't be parsed", ->
+      jasmine.unspy(LoadSnippetsTask.prototype, 'loadAtomSnippets')
+      spyOn(console, 'warn')
       snippets.loaded = false
       snippets.loadAll()
 
@@ -225,11 +230,11 @@ 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).toBeGreaterThan 0
+        expect(console.warn.calls.length).toBe 1
 
     it "loads snippets from all TextMate packages with snippets", ->
-      spyOn(console, 'warn').andCallThrough()
-      jasmine.unspy(LoadSnippetsTask.prototype, 'start')
+      jasmine.unspy(LoadSnippetsTask.prototype, 'loadTextMateSnippets')
+      spyOn(console, 'warn')
       snippets.loaded = false
       snippets.loadAll()
 
@@ -248,7 +253,7 @@ 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).toBeGreaterThan 0
+        expect(console.warn.calls.length).toBe 1
 
   describe "Snippet body parser", ->
     it "breaks a snippet body into lines, with each line containing tab stops at the appropriate position", ->
diff --git a/src/packages/snippets/src/load-snippets-handler.coffee b/src/packages/snippets/src/load-snippets-handler.coffee
index ee38825c5..ba4f16c13 100644
--- a/src/packages/snippets/src/load-snippets-handler.coffee
+++ b/src/packages/snippets/src/load-snippets-handler.coffee
@@ -10,7 +10,7 @@ module.exports =
           attributes.bodyTree = SnippetBodyParser.parse(attributes.body)
     callTaskMethod('snippetsLoaded', snippets)
 
-  loadTextmateSnippets: (path) ->
+  loadTextMateSnippets: (path) ->
     snippetsDirPath = fs.join(path, 'Snippets')
     snippets = []
 
diff --git a/src/packages/snippets/src/load-snippets-task.coffee b/src/packages/snippets/src/load-snippets-task.coffee
index 8e277e456..17c24a993 100644
--- a/src/packages/snippets/src/load-snippets-task.coffee
+++ b/src/packages/snippets/src/load-snippets-task.coffee
@@ -18,10 +18,15 @@ class LoadSnippetsTask extends Task
 
     @packageBeingLoaded = @packages.shift()
     if @packageBeingLoaded instanceof TextMatePackage
-      method = 'loadTextmateSnippets'
+      @loadTextMateSnippets(@packageBeingLoaded.path)
     else
-      method = 'loadAtomSnippets'
-    @callWorkerMethod(method, @packageBeingLoaded.path)
+      @loadAtomSnippets(@packageBeingLoaded.path)
+
+  loadAtomSnippets: (path) ->
+    @callWorkerMethod('loadAtomSnippets', path)
+
+  loadTextMateSnippets: (path) ->
+    @callWorkerMethod('loadTextMateSnippets', path)
 
   snippetsLoaded: (snippets) ->
     @snippets.add(snippet) for snippet in snippets