diff --git a/platform/commonUI/formats/bundle.json b/platform/commonUI/formats/bundle.json index 798bcc7369..99925657b2 100644 --- a/platform/commonUI/formats/bundle.json +++ b/platform/commonUI/formats/bundle.json @@ -7,7 +7,7 @@ "provides": "formatService", "type": "provider", "implementation": "FormatProvider.js", - "depends": [ "formats[]", "$log" ] + "depends": [ "formats[]" ] } ], "formats": [ diff --git a/platform/commonUI/formats/src/FormatProvider.js b/platform/commonUI/formats/src/FormatProvider.js index 421d9bfd39..bcc0e64157 100644 --- a/platform/commonUI/formats/src/FormatProvider.js +++ b/platform/commonUI/formats/src/FormatProvider.js @@ -85,7 +85,7 @@ define([ * @param {Array.} format constructors, * from the `formats` extension category. */ - function FormatProvider(formats, $log) { + function FormatProvider(formats) { var formatMap = {}; function addToMap(Format) { @@ -97,13 +97,12 @@ define([ formats.forEach(addToMap); this.formatMap = formatMap; - this.$log = $log; } FormatProvider.prototype.getFormat = function (key) { var format = this.formatMap[key]; if (!format) { - this.$log.warn("No format found for " + key); + throw new Error("FormatProvider: No format found for " + key); } return format; }; diff --git a/platform/commonUI/formats/test/FormatProviderSpec.js b/platform/commonUI/formats/test/FormatProviderSpec.js index 2a102909cc..4f68c106f7 100644 --- a/platform/commonUI/formats/test/FormatProviderSpec.js +++ b/platform/commonUI/formats/test/FormatProviderSpec.js @@ -41,14 +41,13 @@ define( [ 'parse', 'validate', 'format' ] ); }); - mockLog = jasmine.createSpyObj('$log', ['error', 'warn']); // Return constructors mockFormats = KEYS.map(function (k, i) { function MockFormat() { return mockFormatInstances[i]; } MockFormat.key = k; return MockFormat; }); - provider = new FormatProvider(mockFormats, mockLog); + provider = new FormatProvider(mockFormats); }); it("looks up formats by key", function () { @@ -58,11 +57,10 @@ define( }); }); - it("warns about unknown formats", function () { - provider.getFormat('a'); // known format - expect(mockLog.warn).not.toHaveBeenCalled(); - provider.getFormat('some-unknown-format'); - expect(mockLog.warn).toHaveBeenCalledWith(jasmine.any(String)); + it("throws an error about unknown formats", function () { + expect(function () { + provider.getFormat('some-unknown-format'); + }).toThrow(); }); });