From 92ebfe59b1fda57ec4f5acd17d6924d6bd1a3110 Mon Sep 17 00:00:00 2001 From: Ilya Puchka Date: Mon, 13 Aug 2018 23:05:33 +0100 Subject: [PATCH] removed unneeded error reporter references --- Sources/Context.swift | 4 ---- Sources/Environment.swift | 5 +---- Tests/StencilTests/EnvironmentSpec.swift | 9 ++++++--- Tests/StencilTests/FilterSpec.swift | 4 ++-- 4 files changed, 9 insertions(+), 13 deletions(-) diff --git a/Sources/Context.swift b/Sources/Context.swift index a976e1e..157f230 100644 --- a/Sources/Context.swift +++ b/Sources/Context.swift @@ -4,10 +4,6 @@ public class Context { public let environment: Environment - public var errorReporter: ErrorReporter { - return environment.errorReporter - } - init(dictionary: [String: Any]? = nil, environment: Environment? = nil) { if let dictionary = dictionary { dictionaries = [dictionary] diff --git a/Sources/Environment.swift b/Sources/Environment.swift index 5ccbfa5..2778a5d 100644 --- a/Sources/Environment.swift +++ b/Sources/Environment.swift @@ -3,15 +3,12 @@ public struct Environment { public var extensions: [Extension] public var loader: Loader? - public var errorReporter: ErrorReporter public init(loader: Loader? = nil, extensions: [Extension]? = nil, - templateClass: Template.Type = Template.self, - errorReporter: ErrorReporter = SimpleErrorReporter()) { + templateClass: Template.Type = Template.self) { self.templateClass = templateClass - self.errorReporter = errorReporter self.loader = loader self.extensions = (extensions ?? []) + [DefaultExtension()] } diff --git a/Tests/StencilTests/EnvironmentSpec.swift b/Tests/StencilTests/EnvironmentSpec.swift index 8fd4684..5dc6796 100644 --- a/Tests/StencilTests/EnvironmentSpec.swift +++ b/Tests/StencilTests/EnvironmentSpec.swift @@ -54,7 +54,8 @@ func testEnvironment() { let error = try expect(environment.render(template: template, context: ["names": ["Bob", "Alice"], "name": "Bob"]), file: file, line: line, function: function).toThrow() as TemplateSyntaxError - try expect(environment.errorReporter.renderError(error), file: file, line: line, function: function) == environment.errorReporter.renderError(expectedError) + let reporter = SimpleErrorReporter() + try expect(reporter.renderError(error), file: file, line: line, function: function) == reporter.renderError(expectedError) } $0.context("given syntax error") { @@ -209,7 +210,8 @@ func testEnvironment() { let error = try expect(environment.render(template: template, context: ["target": "World"]), file: file, line: line, function: function).toThrow() as TemplateSyntaxError - try expect(environment.errorReporter.renderError(error), file: file, line: line, function: function) == environment.errorReporter.renderError(expectedError) + let reporter = SimpleErrorReporter() + try expect(reporter.renderError(error), file: file, line: line, function: function) == reporter.renderError(expectedError) } $0.it("reports syntax error in included template") { @@ -259,7 +261,8 @@ func testEnvironment() { } let error = try expect(environment.render(template: childTemplate, context: ["target": "World"]), file: file, line: line, function: function).toThrow() as TemplateSyntaxError - try expect(environment.errorReporter.renderError(error), file: file, line: line, function: function) == environment.errorReporter.renderError(expectedError) + let reporter = SimpleErrorReporter() + try expect(reporter.renderError(error), file: file, line: line, function: function) == reporter.renderError(expectedError) } $0.it("reports syntax error in base template") { diff --git a/Tests/StencilTests/FilterSpec.swift b/Tests/StencilTests/FilterSpec.swift index 710d5ae..1de6a8e 100644 --- a/Tests/StencilTests/FilterSpec.swift +++ b/Tests/StencilTests/FilterSpec.swift @@ -232,8 +232,8 @@ func testFilter() { let error = try expect(environment.render(template: template, context: [:]), file: file, line: line, function: function).toThrow() as TemplateSyntaxError - - try expect(environment.errorReporter.renderError(error), file: file, line: line, function: function) == environment.errorReporter.renderError(expectedError) + let reporter = SimpleErrorReporter() + try expect(reporter.renderError(error), file: file, line: line, function: function) == reporter.renderError(expectedError) } $0.it("made for unknown filter") {