[Travis CI] Test on Swift 2.2

2016-06-07 09:56:53 -07:00
parent 80427a51e6
commit df650c6b20
11 changed files with 12 additions and 16 deletions
--- a/Tests/Nodes/ForNodeSpec.swift
+++ b/Tests/Nodes/ForNodeSpec.swift
--- a/Tests/Nodes/IfNodeSpec.swift
+++ b/Tests/Nodes/IfNodeSpec.swift
--- a/Tests/TemplateLoader/IncludeSpec.swift
+++ b/Tests/TemplateLoader/IncludeSpec.swift
@@ -5,7 +5,7 @@ import PathKit

 func testInclude() {
  describe("Include") {
-    let path = Path(__FILE__) + ".." + ".." + "fixtures"
+    let path = Path(__FILE__) + ".." + "fixtures"
    let loader = TemplateLoader(paths: [path])

    $0.describe("parsing") {
--- a/Tests/TemplateLoader/InheritenceSpec.swift
+++ b/Tests/TemplateLoader/InheritenceSpec.swift
@@ -5,7 +5,7 @@ import PathKit

 func testInheritence() {
  describe("Inheritence") {
-    let path = Path(__FILE__) + ".." + ".." + "fixtures"
+    let path = Path(__FILE__) + ".." + "fixtures"
    let loader = TemplateLoader(paths: [path])

    $0.it("can inherit from another template") {
--- a/Tests/Nodes/NodeSpec.swift
+++ b/Tests/Nodes/NodeSpec.swift
--- a/Tests/Nodes/NowNodeSpec.swift
+++ b/Tests/Nodes/NowNodeSpec.swift
--- a/Tests/TemplateLoaderSpec.swift
+++ b/Tests/TemplateLoaderSpec.swift
@@ -5,7 +5,7 @@ import PathKit

 func testTemplateLoader() {
  describe("TemplateLoader") {
-    let path = Path(__FILE__) + ".." + ".." + "Tests" + "fixtures"
+    let path = Path(__FILE__) + ".."  + "fixtures"
    let loader = TemplateLoader(paths: [path])

    $0.it("returns nil when a template cannot be found") {