From e5506276dbd6570b2cfb19e25cc572d64bf50014 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Thu, 7 Feb 2013 20:14:28 -0800
Subject: [PATCH] Don't toggle events in beforeEach to activate package

Instead find the view after the event in the spec has
been triggered that causes it to activate.
---
 src/packages/symbols-view/lib/symbols-view.coffee |  2 +-
 src/packages/symbols-view/package.cson            |  9 ++++-----
 .../symbols-view/spec/symbols-view-spec.coffee    | 15 ++++++++-------
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/packages/symbols-view/lib/symbols-view.coffee b/src/packages/symbols-view/lib/symbols-view.coffee
index d5079890f..c539eb5fe 100644
--- a/src/packages/symbols-view/lib/symbols-view.coffee
+++ b/src/packages/symbols-view/lib/symbols-view.coffee
@@ -10,7 +10,7 @@ module.exports =
 class SymbolsView extends SelectList
 
   @activate: ->
-    @instance = new SymbolsView
+    new SymbolsView
 
   @viewClass: -> "#{super} symbols-view overlay from-top"
 
diff --git a/src/packages/symbols-view/package.cson b/src/packages/symbols-view/package.cson
index 73ee76e89..ceffedd45 100644
--- a/src/packages/symbols-view/package.cson
+++ b/src/packages/symbols-view/package.cson
@@ -1,6 +1,5 @@
 'main': 'lib/symbols-view'
-'activationEvents': [
-  'symbols-view:toggle-file-symbols'
-  'symbols-view:toggle-project-symbols'
-  'symbols-view:go-to-declaration'
-]
+'activationEvents':
+  'symbols-view:toggle-file-symbols': '.editor'
+  'symbols-view:toggle-project-symbols': null
+  'symbols-view:go-to-declaration': '.editor'
diff --git a/src/packages/symbols-view/spec/symbols-view-spec.coffee b/src/packages/symbols-view/spec/symbols-view-spec.coffee
index ac9b14b65..5a8eff02c 100644
--- a/src/packages/symbols-view/spec/symbols-view-spec.coffee
+++ b/src/packages/symbols-view/spec/symbols-view-spec.coffee
@@ -9,12 +9,9 @@ describe "SymbolsView", ->
   beforeEach ->
     rootView = new RootView(require.resolve('fixtures'))
     atom.loadPackage("symbols-view")
-    rootView.trigger "symbols-view:toggle-project-symbols"
-    symbolsView = rootView.find('.symbols-view').view()
-    rootView.trigger "symbols-view:toggle-project-symbols"
 
     rootView.attachToDom()
-    setArraySpy = spyOn(symbolsView, 'setArray').andCallThrough()
+    setArraySpy = spyOn(SymbolsView.prototype, 'setArray').andCallThrough()
 
   afterEach ->
     rootView.deactivate()
@@ -23,8 +20,8 @@ describe "SymbolsView", ->
   describe "when tags can be generated for a file", ->
     it "initially displays all JavaScript functions with line numbers", ->
       rootView.open('sample.js')
-      expect(rootView.find('.symbols-view')).not.toExist()
       rootView.getActiveEditor().trigger "symbols-view:toggle-file-symbols"
+      symbolsView = rootView.find('.symbols-view').view()
       expect(symbolsView.find('.loading')).toHaveText 'Generating symbols...'
 
       waitsFor ->
@@ -43,8 +40,8 @@ describe "SymbolsView", ->
 
     it "displays error when no tags match text in mini-editor", ->
       rootView.open('sample.js')
-      expect(rootView.find('.symbols-view')).not.toExist()
       rootView.getActiveEditor().trigger "symbols-view:toggle-file-symbols"
+      symbolsView = rootView.find('.symbols-view').view()
 
       waitsFor ->
         setArraySpy.callCount > 0
@@ -70,8 +67,8 @@ describe "SymbolsView", ->
   describe "when tags can't be generated for a file", ->
     it "shows an error message when no matching tags are found", ->
       rootView.open('sample.txt')
-      expect(rootView.find('.symbols-view')).not.toExist()
       rootView.getActiveEditor().trigger "symbols-view:toggle-file-symbols"
+      symbolsView = rootView.find('.symbols-view').view()
       setErrorSpy = spyOn(symbolsView, "setError").andCallThrough()
 
       waitsFor ->
@@ -99,6 +96,7 @@ describe "SymbolsView", ->
       rootView.open('sample.js')
       expect(rootView.getActiveEditor().getCursorBufferPosition()).toEqual [0,0]
       expect(rootView.find('.symbols-view')).not.toExist()
+      symbolsView = SymbolsView.activate()
       symbolsView.setArray(tags)
       symbolsView.attach()
       expect(rootView.find('.symbols-view')).toExist()
@@ -150,6 +148,7 @@ describe "SymbolsView", ->
       editor = rootView.getActiveEditor()
       editor.setCursorBufferPosition([8,14])
       editor.trigger 'symbols-view:go-to-declaration'
+      symbolsView = rootView.find('.symbols-view').view()
       expect(symbolsView.list.children('li').length).toBe 2
       expect(symbolsView).toBeVisible()
       symbolsView.confirmed(symbolsView.array[0])
@@ -168,6 +167,7 @@ describe "SymbolsView", ->
         editor = rootView.getActiveEditor()
         editor.setCursorBufferPosition([8,14])
         editor.trigger 'symbols-view:go-to-declaration'
+        symbolsView = rootView.find('.symbols-view').view()
         expect(symbolsView.list.children('li').length).toBe 1
         expect(symbolsView.list.children('li:first').find('.label')).toHaveText 'tagged.js'
 
@@ -176,6 +176,7 @@ describe "SymbolsView", ->
       rootView.open("tagged.js")
       expect(rootView.find('.symbols-view')).not.toExist()
       rootView.trigger "symbols-view:toggle-project-symbols"
+      symbolsView = rootView.find('.symbols-view').view()
       expect(symbolsView.find('.loading')).toHaveText 'Loading symbols...'
 
       waitsFor ->