Better test.

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, '\\$&')