From f16ea63a957dcc4f5788c67f8911c649e5f062e1 Mon Sep 17 00:00:00 2001 From: Nathan Sobo Date: Wed, 9 Jul 2014 09:26:34 -0600 Subject: [PATCH] Export ReactEditorView as EditorView from 'atom' module Also, remove a few early requires of 'exports/atom.coffee' in the spec suite that were causing failures. --- exports/atom.coffee | 2 +- spec/jasmine-helper.coffee | 3 ++- spec/spec-suite.coffee | 1 - 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/exports/atom.coffee b/exports/atom.coffee index 773b24f3a..b852d68a7 100644 --- a/exports/atom.coffee +++ b/exports/atom.coffee @@ -15,7 +15,7 @@ unless process.env.ATOM_SHELL_INTERNAL_RUN_AS_NODE module.exports.$ = $ module.exports.$$ = $$ module.exports.$$$ = $$$ - module.exports.EditorView = require '../src/editor-view' + module.exports.EditorView = require '../src/react-editor-view' module.exports.ScrollView = require '../src/scroll-view' module.exports.SelectListView = require '../src/select-list-view' module.exports.Task = require '../src/task' diff --git a/spec/jasmine-helper.coffee b/spec/jasmine-helper.coffee index 87765634c..3de6d065f 100644 --- a/spec/jasmine-helper.coffee +++ b/spec/jasmine-helper.coffee @@ -1,7 +1,8 @@ fs = require 'fs' module.exports.runSpecSuite = (specSuite, logFile, logErrors=true) -> - {$, $$} = require 'atom' + {$, $$} = require '../src/space-pen-extensions' + window[key] = value for key, value of require '../vendor/jasmine' {TerminalReporter} = require 'jasmine-tagged' diff --git a/spec/spec-suite.coffee b/spec/spec-suite.coffee index e0adaf24b..817de7986 100644 --- a/spec/spec-suite.coffee +++ b/spec/spec-suite.coffee @@ -1,6 +1,5 @@ _ = require 'underscore-plus' fs = require 'fs-plus' -{Git} = require 'atom' path = require 'path' require './spec-helper'