Merge branch 'master' into snippets

Conflicts:
	src/app/window.coffee

spec/extensions/autocomplete-spec.coffee

@@ -10,8 +10,7 @@ describe "Autocomplete", ->
   miniEditor = null
 
   beforeEach ->
-    editor = new Editor()
-    editor.setBuffer new Buffer(require.resolve('fixtures/sample.js'))
+    editor = new Editor(editSession: fixturesProject.open('sample.js'))
     autocomplete = new Autocomplete(editor)
     miniEditor = autocomplete.miniEditor
 
@@ -346,13 +345,13 @@ describe "Autocomplete", ->
         autocomplete.attach()
         expect(autocomplete.buildWordList).not.toHaveBeenCalled()
 
-  describe "when a new buffer is assigned on editor", ->
+  describe "when a new edit session is assigned on editor", ->
     it 'creates and uses a new word list based on new buffer', ->
       wordList = autocomplete.wordList
       expect(wordList).toContain "quicksort"
       expect(wordList).not.toContain "Some"
 
-      editor.setBuffer new Buffer(require.resolve('fixtures/sample.txt'))
+      editor.edit(fixturesProject.open('sample.txt'))
 
       wordList = autocomplete.wordList
       expect(wordList).not.toContain "quicksort"
@@ -360,7 +359,7 @@ describe "Autocomplete", ->
 
     it 'stops listening to previous buffers change events', ->
       previousBuffer = editor.buffer
-      editor.setBuffer new Buffer(require.resolve('fixtures/sample.txt'))
+      editor.edit(fixturesProject.open('sample.txt'))
       spyOn(autocomplete, "buildWordList")
 
       previousBuffer.change([[0,0],[0,1]], "sauron")

spec/extensions/command-interpreter-spec.coffee

@@ -1,13 +1,15 @@
 CommandInterpreter = require 'command-interpreter'
 Buffer = require 'buffer'
+EditSession = require 'edit-session'
 Editor = require 'editor'
 
 describe "CommandInterpreter", ->
   [interpreter, editor, buffer] = []
 
   beforeEach ->
-    buffer = new Buffer(require.resolve 'fixtures/sample.js')
-    editor = new Editor({buffer})
+    editSession = fixturesProject.open('sample.js')
+    buffer = editSession.buffer
+    editor = new Editor(editSession: editSession)
     interpreter = new CommandInterpreter()
 
   describe "addresses", ->

spec/extensions/snippets-spec.coffee

@@ -5,7 +5,7 @@ Editor = require 'editor'
 _ = require 'underscore'
 fs = require 'fs'
 
-fdescribe "Snippets extension", ->
+describe "Snippets extension", ->
   [buffer, editor] = []
   beforeEach ->
     rootView = new RootView(require.resolve('fixtures/sample.js'))