From c8b9622bf4f1660408ea32391d0615cefb0ebccb Mon Sep 17 00:00:00 2001 From: Corey Johnson & Nathan Sobo Date: Tue, 26 Mar 2013 12:12:47 -0600 Subject: [PATCH] Move specs for loading config defaults to atom-spec --- spec/app/atom-package-spec.coffee | 8 -------- spec/app/atom-spec.coffee | 6 ++++++ .../packages/package-with-config-defaults/index.coffee | 3 +++ .../packages/package-with-serialization/index.coffee | 3 --- 4 files changed, 9 insertions(+), 11 deletions(-) create mode 100644 spec/fixtures/packages/package-with-config-defaults/index.coffee diff --git a/spec/app/atom-package-spec.coffee b/spec/app/atom-package-spec.coffee index 0f17e4b90..fdf298f51 100644 --- a/spec/app/atom-package-spec.coffee +++ b/spec/app/atom-package-spec.coffee @@ -48,14 +48,6 @@ describe "AtomPackage", -> expect(eventHandler.callCount).toBe 2 expect(packageMainModule.activate.callCount).toBe 1 - - describe "when a package is activated", -> - it "loads config defaults based on the `configDefaults` key", -> - expect(config.get('package-with-module.numbers.one')).toBeUndefined() - atom.activatePackage("package-with-module") - expect(config.get('package-with-module.numbers.one')).toBe 1 - expect(config.get('package-with-module.numbers.two')).toBe 2 - describe "when the package has a scoped properties directory", -> it "loads the scoped properties", -> spyOn(syntax, 'addProperties') diff --git a/spec/app/atom-spec.coffee b/spec/app/atom-spec.coffee index 04a8d6d17..40c450a1d 100644 --- a/spec/app/atom-spec.coffee +++ b/spec/app/atom-spec.coffee @@ -27,6 +27,12 @@ describe "the `atom` global", -> expect(indexModule.activate).toHaveBeenCalled() expect(pack.mainModule).toBe indexModule + it "assigns config defaults from the module", -> + expect(config.get('package-with-config-defaults.numbers.one')).toBeUndefined() + atom.activatePackage('package-with-config-defaults') + expect(config.get('package-with-config-defaults.numbers.one')).toBe 1 + expect(config.get('package-with-config-defaults.numbers.two')).toBe 2 + describe "when the package has no main module", -> it "does not throw an exception", -> spyOn(console, "error") diff --git a/spec/fixtures/packages/package-with-config-defaults/index.coffee b/spec/fixtures/packages/package-with-config-defaults/index.coffee new file mode 100644 index 000000000..5e0b1eed6 --- /dev/null +++ b/spec/fixtures/packages/package-with-config-defaults/index.coffee @@ -0,0 +1,3 @@ +module.exports = + configDefaults: + numbers: { one: 1, two: 2 } diff --git a/spec/fixtures/packages/package-with-serialization/index.coffee b/spec/fixtures/packages/package-with-serialization/index.coffee index 3756508da..54949113c 100644 --- a/spec/fixtures/packages/package-with-serialization/index.coffee +++ b/spec/fixtures/packages/package-with-serialization/index.coffee @@ -1,7 +1,4 @@ module.exports = - configDefaults: - numbers: { one: 1, two: 2 } - activate: ({@someNumber}) -> @someNumber ?= 1