Merge branch 'master' into ns-mb-detangle-editor

spec/git-repository-spec.coffee

@@ -199,7 +199,7 @@ describe "GitRepository", ->
 
     beforeEach ->
       workingDirectory = copyRepository()
-      repo = new GitRepository(workingDirectory)
+      repo = new GitRepository(workingDirectory, {project: atom.project, config: atom.config})
       modifiedPath = path.join(workingDirectory, 'file.txt')
       newPath = path.join(workingDirectory, 'untracked.txt')
       cleanPath = path.join(workingDirectory, 'other.txt')
@@ -249,6 +249,22 @@ describe "GitRepository", ->
         expect(repo.isStatusModified(status)).toBe false
         expect(repo.isStatusNew(status)).toBe false
 
+    it "works correctly when the project has multiple folders (regression)", ->
+      atom.project.addPath(workingDirectory)
+      atom.project.addPath(path.join(__dirname, 'fixtures', 'dir'))
+      statusHandler = jasmine.createSpy('statusHandler')
+      repo.onDidChangeStatuses statusHandler
+
+      repo.refreshStatus()
+
+      waitsFor ->
+        statusHandler.callCount > 0
+
+      runs ->
+        expect(repo.getCachedPathStatus(cleanPath)).toBeUndefined()
+        expect(repo.isStatusNew(repo.getCachedPathStatus(newPath))).toBeTruthy()
+        expect(repo.isStatusModified(repo.getCachedPathStatus(modifiedPath))).toBeTruthy()
+
     it 'caches statuses that were looked up synchronously', ->
       originalContent = 'undefined'
       fs.writeFileSync(modifiedPath, 'making this path modified')

spec/text-editor-component-spec.js

@@ -2252,6 +2252,17 @@ describe('TextEditorComponent', function () {
 
         expect(overlay.style.left).toBe(windowWidth - itemWidth + 'px')
         expect(overlay.style.top).toBe(position.top + editor.getLineHeightInPixels() + 'px')
+
+        // window size change
+
+        windowWidth = Math.round(gutterWidth + 29 * editor.getDefaultCharWidth())
+        await atom.setWindowDimensions({
+          width: windowWidth,
+          height: windowHeight,
+        })
+        atom.views.performDocumentPoll()
+        expect(overlay.style.left).toBe(windowWidth - itemWidth + 'px')
+        expect(overlay.style.top).toBe(position.top + editor.getLineHeightInPixels() + 'px')
       })
     })
   })