Merge branch 'master' into ns-switch-to-display-layers

# Conflicts:
#	src/text-editor.coffee

spec/git-repository-async-spec.js

@@ -3,7 +3,6 @@
 import fs from 'fs-plus'
 import path from 'path'
 import temp from 'temp'
-import Git from 'nodegit'
 
 import {it, beforeEach, afterEach} from './async-spec-helpers'
 
@@ -47,7 +46,7 @@ describe('GitRepositoryAsync', () => {
 
       let threw = false
       try {
-        await repo.repoPromise
+        await repo.getRepo()
       } catch (e) {
         threw = true
       }
@@ -64,19 +63,19 @@ describe('GitRepositoryAsync', () => {
     })
 
     it('returns the repository when not given a path', async () => {
-      const nodeGitRepo1 = await repo.repoPromise
+      const nodeGitRepo1 = await repo.getRepo()
       const nodeGitRepo2 = await repo.getRepo()
       expect(nodeGitRepo1.workdir()).toBe(nodeGitRepo2.workdir())
     })
 
     it('returns the repository when given a non-submodule path', async () => {
-      const nodeGitRepo1 = await repo.repoPromise
+      const nodeGitRepo1 = await repo.getRepo()
       const nodeGitRepo2 = await repo.getRepo('README')
       expect(nodeGitRepo1.workdir()).toBe(nodeGitRepo2.workdir())
     })
 
     it('returns the submodule repository when given a submodule path', async () => {
-      const nodeGitRepo1 = await repo.repoPromise
+      const nodeGitRepo1 = await repo.getRepo()
       const nodeGitRepo2 = await repo.getRepo('jstips')
       expect(nodeGitRepo1.workdir()).not.toBe(nodeGitRepo2.workdir())
 
@@ -303,7 +302,7 @@ describe('GitRepositoryAsync', () => {
       await repo.getPathStatus(filePath)
 
       expect(statusHandler.callCount).toBe(1)
-      const status = Git.Status.STATUS.WT_MODIFIED
+      const status = GitRepositoryAsync.Git.Status.STATUS.WT_MODIFIED
       expect(statusHandler.argsForCall[0][0]).toEqual({path: filePath, pathStatus: status})
       fs.writeFileSync(filePath, 'abc')
 

spec/resource-pool-spec.js

@@ -1,66 +0,0 @@
-/** @babel */
-
-import ResourcePool from '../src/resource-pool'
-
-import {it} from './async-spec-helpers'
-
-describe('ResourcePool', () => {
-  let queue
-
-  beforeEach(() => {
-    queue = new ResourcePool([{}])
-  })
-
-  describe('.enqueue', () => {
-    it('calls the enqueued function', async () => {
-      let called = false
-      await queue.enqueue(() => {
-        called = true
-        return Promise.resolve()
-      })
-      expect(called).toBe(true)
-    })
-
-    it('forwards values from the inner promise', async () => {
-      const result = await queue.enqueue(() => Promise.resolve(42))
-      expect(result).toBe(42)
-    })
-
-    it('forwards errors from the inner promise', async () => {
-      let threw = false
-      try {
-        await queue.enqueue(() => Promise.reject(new Error('down with the sickness')))
-      } catch (e) {
-        threw = true
-      }
-      expect(threw).toBe(true)
-    })
-
-    it('continues to dequeue work after a promise has been rejected', async () => {
-      try {
-        await queue.enqueue(() => Promise.reject(new Error('down with the sickness')))
-      } catch (e) {}
-
-      const result = await queue.enqueue(() => Promise.resolve(42))
-      expect(result).toBe(42)
-    })
-
-    it('queues up work', async () => {
-      let resolve = null
-      queue.enqueue(() => {
-        return new Promise((resolve_, reject) => {
-          resolve = resolve_
-        })
-      })
-
-      expect(queue.getQueueDepth()).toBe(0)
-
-      queue.enqueue(() => new Promise((resolve, reject) => {}))
-
-      expect(queue.getQueueDepth()).toBe(1)
-      resolve()
-
-      waitsFor(() => queue.getQueueDepth() === 0)
-    })
-  })
-})

spec/text-editor-spec.coffee

@@ -1186,14 +1186,10 @@ describe "TextEditor", ->
           cursor2 = editor.addCursorAtBufferPosition([1, 4])
           expect(cursor2.marker).toBe cursor1.marker
 
-    describe '.logCursorScope()', ->
-      beforeEach ->
-        spyOn(atom.notifications, 'addInfo')
-
-      it 'opens a notification', ->
-        editor.logCursorScope()
-
-        expect(atom.notifications.addInfo).toHaveBeenCalled()
+    describe '.getCursorScope()', ->
+      it 'returns the current scope', ->
+        descriptor = editor.getCursorScope()
+        expect(descriptor.scopes).toContain('source.js')
 
   describe "selection", ->
     selection = null