From 759d64501d1b1b80611b29a435ef14ef45f9919e Mon Sep 17 00:00:00 2001
From: joshaber <joshaber@gmail.com>
Date: Mon, 25 Apr 2016 16:07:49 -0400
Subject: [PATCH] Better test.

---
 spec/workspace-spec.coffee | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/spec/workspace-spec.coffee b/spec/workspace-spec.coffee
index c61a57bf4..b84e873da 100644
--- a/spec/workspace-spec.coffee
+++ b/spec/workspace-spec.coffee
@@ -1617,17 +1617,21 @@ describe "Workspace", ->
       runs ->
         expect(pane.getPendingItem()).toBeFalsy()
 
-  escapeStringRegex = (str) ->
-    str.replace(/[|\\{}()[\]^$+*?.]/g, '\\$&')
-
   describe "grammar activation", ->
-    it "activates grammars", ->
+    beforeEach ->
+      waitsForPromise ->
+        atom.packages.activatePackage('language-javascript')
+
+    it "notifies the workspace of which grammar is used", ->
       editor = null
 
-      atom.workspace.handleGrammarUsed = jasmine.createSpy()
+      grammarUsed = jasmine.createSpy()
+      atom.workspace.handleGrammarUsed = grammarUsed
 
       waitsForPromise -> atom.workspace.open('sample-with-comments.js').then (o) -> editor = o
+      waitsFor -> grammarUsed.callCount is 1
       runs ->
-        atom.grammars.setGrammarOverrideForPath(editor.getPath(), 'source.coffee')
-        editor.reloadGrammar()
-      waitsFor -> atom.workspace.handleGrammarUsed.callCount is 1
+        expect(grammarUsed.argsForCall[0][0].name).toBe 'JavaScript'
+
+  escapeStringRegex = (str) ->
+    str.replace(/[|\\{}()[\]^$+*?.]/g, '\\$&')