Remove telepath from Project, WorkspaceView, and Pane*

This commit is contained in:
Nathan Sobo
2014-01-03 16:23:23 -07:00
parent 821debcb85
commit bc65137911
16 changed files with 97 additions and 190 deletions

View File

@@ -257,7 +257,7 @@ describe "Git", ->
it "subscribes to all the serialized buffers in the project", ->
atom.project.openSync('sample.js')
project2 = atom.project.testPersistence()
project2 = atom.project.testSerialization()
buffer = project2.getBuffers()[0]
waitsFor ->

View File

@@ -677,12 +677,12 @@ describe "Pane", ->
describe "serialization", ->
it "can serialize and deserialize the pane and all its items", ->
newPane = atom.deserializers.deserialize(pane.serialize().testPersistence())
newPane = pane.testSerialization()
expect(newPane.getItems()).toEqual [view1, editor1, view2, editor2]
it "restores the active item on deserialization", ->
pane.showItem(editor2)
newPane = atom.deserializers.deserialize(pane.serialize().testPersistence())
newPane = pane.testSerialization()
expect(newPane.activeItem).toEqual editor2
it "does not show items that cannot be deserialized", ->
@@ -693,7 +693,7 @@ describe "Pane", ->
pane.showItem(new Unserializable)
state = pane.serialize().testPersistence()
state = pane.testSerialization()
newPane = atom.deserializers.deserialize(state)
expect(newPane.activeItem).toEqual pane.items[0]
expect(newPane.items.length).toBe pane.items.length - 1
@@ -702,13 +702,13 @@ describe "Pane", ->
container.attachToDom()
pane.focus()
container2 = atom.deserializers.deserialize(container.serialize().testPersistence())
container2 = container.testSerialization()
pane2 = container2.getRoot()
container2.attachToDom()
expect(pane2).toMatchSelector(':has(:focus)')
$(document.activeElement).blur()
container3 = atom.deserializers.deserialize(container.serialize().testPersistence())
container3 = container.testSerialization()
pane3 = container3.getRoot()
container3.attachToDom()
expect(pane3).not.toMatchSelector(':has(:focus)')

View File

@@ -16,21 +16,17 @@ describe "Project", ->
afterEach ->
deserializedProject?.destroy()
it "destroys unretained buffers and does not include them in the serialized state", ->
it "does not include unretained buffers in the serialized state", ->
atom.project.bufferForPathSync('a')
expect(atom.project.getBuffers().length).toBe 1
atom.project.getState().serializeForPersistence()
deserializedProject = atom.project.testPersistence()
deserializedProject = atom.project.testSerialization()
expect(deserializedProject.getBuffers().length).toBe 0
expect(atom.project.getBuffers().length).toBe 0
it "listens for destroyed events on deserialized buffers and removes them when they are destroyed", ->
atom.project.openSync('a')
expect(atom.project.getBuffers().length).toBe 1
atom.project.getState().serializeForPersistence()
deserializedProject = atom.project.testPersistence()
deserializedProject = atom.project.testSerialization()
expect(deserializedProject.getBuffers().length).toBe 1
deserializedProject.getBuffers()[0].destroy()

View File

@@ -7,7 +7,7 @@ path = require 'path'
{_, $, File, WorkspaceView, fs} = require 'atom'
Keymap = require '../src/keymap'
Config = require '../src/config'
{Point} = require 'telepath'
{Point} = require 'text-buffer'
Project = require '../src/project'
Editor = require '../src/editor'
EditorView = require '../src/editor-view'

View File

@@ -1,7 +1,6 @@
{_, fs} = require 'atom'
path = require 'path'
temp = require 'temp'
{Site} = require 'telepath'
TextBuffer = require '../src/text-buffer'
describe 'TextBuffer', ->

View File

@@ -93,7 +93,7 @@ describe "Window", ->
atom.unloadEditorWindow()
expect(atom.state.getObject('workspaceView')).toEqual workspaceViewState.toObject()
expect(atom.state.getObject('workspaceView')).toEqual workspaceViewState
expect(atom.state.getObject('syntax')).toEqual syntaxState
expect(atom.saveSync).toHaveBeenCalled()

View File

@@ -19,9 +19,11 @@ describe "WorkspaceView", ->
viewState = null
simulateReload = ->
state = atom.workspaceView.serialize().testPersistence()
workspaceState = atom.workspaceView.serialize()
projectState = atom.project.serialize()
atom.workspaceView.remove()
atom.workspaceView = WorkspaceView.deserialize(state)
atom.project = atom.deserializers.deserialize(projectState)
atom.workspaceView = WorkspaceView.deserialize(workspaceState)
atom.workspaceView.attachToDom()
describe "when the serialized WorkspaceView has an unsaved buffer", ->