Switch to Swift 2.0

This commit is contained in:
Kyle Fuller
2015-09-08 18:42:54 -07:00
parent c1a485c429
commit dcf2611ac2
21 changed files with 162 additions and 171 deletions

View File

@@ -20,7 +20,7 @@ class IncludeTests: NodeTests {
let tokens = [ Token.Block(value: "include") ]
let parser = TokenParser(tokens: tokens)
assertFailure(parser.parse(), "include: Tag takes one argument, the template file to be included")
assertFailure(parser.parse(), description: "include: Tag takes one argument, the template file to be included")
}
func testParse() {
@@ -41,7 +41,7 @@ class IncludeTests: NodeTests {
let result = node.render(Context())
switch result {
case .Success(let string):
case .Success:
XCTAssert(false, "Unexpected error")
case .Error(let error):
XCTAssertEqual("\(error)", "Template loader not in context")
@@ -53,7 +53,7 @@ class IncludeTests: NodeTests {
let result = node.render(Context(dictionary:["loader":loader]))
switch result {
case .Success(let string):
case .Success:
XCTAssert(false, "Unexpected error")
case .Error(let error):
XCTAssertTrue("\(error)".hasPrefix("Template 'unknown.html' not found"))