mirror of
https://github.com/atom/atom.git
synced 2026-02-06 04:34:55 -05:00
Eliminate fixturesProject global. Use project global instead.
This commit is contained in:
committed by
probablycorey
parent
9f7b804a6c
commit
54fc9efdcb
@@ -40,7 +40,7 @@ describe "AutocompleteView", ->
|
||||
|
||||
beforeEach ->
|
||||
window.rootView = new RootView
|
||||
editor = new Editor(editSession: fixturesProject.buildEditSession('sample.js'))
|
||||
editor = new Editor(editSession: project.buildEditSession('sample.js'))
|
||||
window.loadPackage('autocomplete')
|
||||
autocomplete = new AutocompleteView(editor)
|
||||
miniEditor = autocomplete.miniEditor
|
||||
|
||||
@@ -6,12 +6,11 @@ EditSession = require 'edit-session'
|
||||
_ = require 'underscore'
|
||||
|
||||
describe "CommandInterpreter", ->
|
||||
[project, interpreter, editSession, buffer] = []
|
||||
[interpreter, editSession, buffer] = []
|
||||
|
||||
beforeEach ->
|
||||
project = new Project(fixturesProject.resolve('dir/'))
|
||||
interpreter = new CommandInterpreter(fixturesProject)
|
||||
editSession = fixturesProject.buildEditSession('sample.js')
|
||||
interpreter = new CommandInterpreter(project)
|
||||
editSession = project.buildEditSession('sample.js')
|
||||
buffer = editSession.buffer
|
||||
|
||||
afterEach ->
|
||||
@@ -418,7 +417,7 @@ describe "CommandInterpreter", ->
|
||||
describe "X x/regex/", ->
|
||||
it "returns selection operations for all regex matches in all the project's files", ->
|
||||
editSession.destroy()
|
||||
project = new Project(fixturesProject.resolve('dir/'))
|
||||
project.setPath(project.resolve('dir'))
|
||||
interpreter = new CommandInterpreter(project)
|
||||
|
||||
operationsToPreview = null
|
||||
|
||||
@@ -78,7 +78,7 @@ describe 'FuzzyFinder', ->
|
||||
rootView.trigger 'fuzzy-finder:toggle-file-finder'
|
||||
|
||||
finderView.confirmed('dir/a')
|
||||
expectedPath = fixturesProject.resolve('dir/a')
|
||||
expectedPath = project.resolve('dir/a')
|
||||
|
||||
expect(finderView.hasParent()).toBeFalsy()
|
||||
expect(editor1.getPath()).not.toBe expectedPath
|
||||
@@ -179,7 +179,7 @@ describe 'FuzzyFinder', ->
|
||||
|
||||
describe "when the active pane has an item for the selected path", ->
|
||||
it "switches to the item for the selected path", ->
|
||||
expectedPath = fixturesProject.resolve('sample.txt')
|
||||
expectedPath = project.resolve('sample.txt')
|
||||
finderView.confirmed('sample.txt')
|
||||
|
||||
expect(finderView.hasParent()).toBeFalsy()
|
||||
@@ -195,7 +195,7 @@ describe 'FuzzyFinder', ->
|
||||
|
||||
expect(rootView.getActiveView()).toBe editor1
|
||||
|
||||
expectedPath = fixturesProject.resolve('sample.txt')
|
||||
expectedPath = project.resolve('sample.txt')
|
||||
finderView.confirmed('sample.txt')
|
||||
|
||||
expect(finderView.hasParent()).toBeFalsy()
|
||||
|
||||
@@ -136,6 +136,6 @@ describe "GitHub Flavored Markdown grammar", ->
|
||||
describe "auto indent", ->
|
||||
it "indents newlines entered after list lines", ->
|
||||
config.set('editor.autoIndent', true)
|
||||
editSession = fixturesProject.buildEditSession('gfm.md')
|
||||
editSession = project.buildEditSession('gfm.md')
|
||||
editSession.insertNewlineBelow()
|
||||
expect(editSession.buffer.lineForRow(1)).toBe ' '
|
||||
|
||||
@@ -300,7 +300,7 @@ describe "Snippets extension", ->
|
||||
jasmine.unspy(LoadSnippetsTask.prototype, 'loadTextMateSnippets')
|
||||
snippets.loaded = false
|
||||
task = new LoadSnippetsTask(snippets)
|
||||
task.packages = [Package.build(fixturesProject.resolve('packages/package-with-a-cson-grammar.tmbundle'))]
|
||||
task.packages = [Package.build(project.resolve('packages/package-with-a-cson-grammar.tmbundle'))]
|
||||
task.start()
|
||||
|
||||
waitsFor "CSON snippets to load", 5000, -> snippets.loaded
|
||||
|
||||
Reference in New Issue
Block a user