Remove atom.services global

Signed-off-by: Nathan Sobo <nathan@github.com>
Esse commit está contido em:
Max Brunsfeld
2015-02-02 10:01:34 -08:00
commit de Nathan Sobo
commit 5638c7fb6a
6 arquivos alterados com 18 adições e 114 exclusões
+12 -12
Ver Arquivo
@@ -449,23 +449,23 @@ describe "PackageManager", ->
describe "service registration", ->
it "registers the package's service providers", ->
service1V3 = null
atom.services.consume "service-1", "^0.3", (service) ->
atom.packages.serviceHub.consume "service-1", "^0.3", (service) ->
service1V3 = service
new Disposable -> service1V3 = 'deactivated'
service1V4 = null
atom.services.consume "service-1", "^0.4", (service) ->
atom.packages.serviceHub.consume "service-1", "^0.4", (service) ->
service1V4 = service
new Disposable -> service1V4 = 'deactivated'
service2V5 = null
atom.services.consume "service-2", "^0.5", (service) ->
atom.packages.serviceHub.consume "service-2", "^0.5", (service) ->
service2V5 = service
new Disposable -> service2V5 = 'deactivated'
# Incompatible
service2V6 = null
atom.services.consume "service-2", "^0.6", (service) ->
atom.packages.serviceHub.consume "service-2", "^0.6", (service) ->
service2V6 = service
new Disposable -> service2V6 = 'deactivated'
@@ -495,10 +495,10 @@ describe "PackageManager", ->
service2V5Spy = jasmine.createSpy('service2V5')
service2V6Spy = jasmine.createSpy('service2V6')
atom.services.provide "service-1", "0.3.1", service1V3Spy
atom.services.provide "service-1", "0.4.1", service1V4Spy
atom.services.provide "service-2", "0.5.1", service2V5Spy
atom.services.provide "service-2", "0.6.1", service2V5Spy # incompatible
atom.packages.serviceHub.provide "service-1", "0.3.1", service1V3Spy
atom.packages.serviceHub.provide "service-1", "0.4.1", service1V4Spy
atom.packages.serviceHub.provide "service-2", "0.5.1", service2V5Spy
atom.packages.serviceHub.provide "service-2", "0.6.1", service2V5Spy # incompatible
expect(service1V3Spy).toHaveBeenCalledWith('first-service-v3-used')
expect(service1V4Spy).toHaveBeenCalledWith('first-service-v4-used')
@@ -512,10 +512,10 @@ describe "PackageManager", ->
service2V5Spy.reset()
service2V6Spy.reset()
atom.services.provide "service-1", "0.3.1", service1V3Spy
atom.services.provide "service-1", "0.4.1", service1V4Spy
atom.services.provide "service-2", "0.5.1", service2V5Spy
atom.services.provide "service-2", "0.6.1", service2V5Spy # incompatible
atom.packages.serviceHub.provide "service-1", "0.3.1", service1V3Spy
atom.packages.serviceHub.provide "service-1", "0.4.1", service1V4Spy
atom.packages.serviceHub.provide "service-2", "0.5.1", service2V5Spy
atom.packages.serviceHub.provide "service-2", "0.6.1", service2V5Spy # incompatible
expect(service1V3Spy).not.toHaveBeenCalled()
expect(service1V4Spy).not.toHaveBeenCalled()
+2 -2
Ver Arquivo
@@ -17,7 +17,7 @@ Config = require '../src/config'
{Point} = require 'text-buffer'
Project = require '../src/project'
Workspace = require '../src/workspace'
ServiceHub = require '../src/service-hub'
ServiceHub = require 'service-hub'
TextEditor = require '../src/text-editor'
TextEditorView = require '../src/text-editor-view'
TextEditorElement = require '../src/text-editor-element'
@@ -78,7 +78,7 @@ beforeEach ->
projectPath = specProjectPath ? path.join(@specDirectory, 'fixtures')
atom.project = new Project(paths: [projectPath])
atom.workspace = new Workspace()
atom.services = new ServiceHub
atom.packages.serviceHub = new ServiceHub
atom.keymaps.keyBindings = _.clone(keyBindingsToRestore)
atom.commands.restoreSnapshot(commandsToRestore)
atom.styles.restoreSnapshot(styleElementsToRestore)