update to latest stencilswiftkit and use enrich method from kit

SwiftGen · Feb 16, 2017 · 498d415 · 498d415
1 parent cef6c08
commit 498d415
Show file tree

Hide file tree

Showing 13 changed files with 417 additions and 249 deletions.
diff --git a/Tests/Podfile.lock b/Tests/Podfile.lock
@@ -20,7 +20,7 @@ CHECKOUT OPTIONS:
     :commit: 99efba56e942270780a452e5dcdfa1a839839cf4
     :git: https://github.com/kylef/Stencil
   StencilSwiftKit:
-    :commit: 59efee95ce9514e45b2bc6f5b78d3bdffb273a78
+    :commit: cc3c4d9aed593c7026e8d18c7d7d75628039a330
     :git: https://github.com/SwiftGen/StencilSwiftKit
 
 SPEC CHECKSUMS:
@@ -30,4 +30,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: af694ce70d27109bd28ecfb95a4370560e111f3a
 
-COCOAPODS: 1.2.0.beta.3
+COCOAPODS: 1.2.0
diff --git a/Tests/Pods/Manifest.lock b/Tests/Pods/Manifest.lock
diff --git a/Tests/Pods/Pods.xcodeproj/project.pbxproj b/Tests/Pods/Pods.xcodeproj/project.pbxproj
diff --git a/Tests/Pods/StencilSwiftKit/README.md b/Tests/Pods/StencilSwiftKit/README.md
diff --git a/Tests/Pods/StencilSwiftKit/Sources/CallNode.swift b/Tests/Pods/StencilSwiftKit/Sources/CallNode.swift
diff --git a/Tests/Pods/StencilSwiftKit/Sources/Context.swift b/Tests/Pods/StencilSwiftKit/Sources/Context.swift
diff --git a/Tests/Pods/StencilSwiftKit/Sources/Environment.swift b/Tests/Pods/StencilSwiftKit/Sources/Environment.swift
diff --git a/Tests/Pods/StencilSwiftKit/Sources/Filters.swift b/Tests/Pods/StencilSwiftKit/Sources/Filters.swift
diff --git a/Tests/Pods/StencilSwiftKit/Sources/Parameters.swift b/Tests/Pods/StencilSwiftKit/Sources/Parameters.swift
diff --git a/Tests/Pods/StencilSwiftKit/Sources/SetNode.swift b/Tests/Pods/StencilSwiftKit/Sources/SetNode.swift
diff --git a/...encilSwiftKit/Sources/SwiftTemplate.swift → ...iftKit/Sources/StencilSwiftTemplate.swift b/...encilSwiftKit/Sources/SwiftTemplate.swift → ...iftKit/Sources/StencilSwiftTemplate.swift
diff --git a/Tests/TestSuites/StoryboardsiOSTests.swift b/Tests/TestSuites/StoryboardsiOSTests.swift
@@ -5,23 +5,39 @@
 //
 
 import XCTest
+import StencilSwiftKit
 
 class StoryboardsiOSTests: XCTestCase {
   enum Contexts {
     static let all = ["empty", "all", "customname"]
   }
-  
+
   // generate variations to test target module matching
   static let variations: VariationGenerator = { name, context in
     guard name == "all" else { return [(context: context, suffix: "")] }
-
-    return [
-      (context: context, suffix: ""),
-      (context: enrich(context, env: ["PRODUCT_MODULE_NAME": "Test"]), suffix: ""),
-      (context: enrich(context, env: ["PRODUCT_MODULE_NAME": "CustomSegue"]), suffix: "-ignore-module"),
-      (context: enrich(context, param: ["module": "Test"]), suffix: ""),
-      (context: enrich(context, param: ["module": "CustomSegue"]), suffix: "-ignore-module")
-    ]
+
+    do {
+      return [
+        (context: context,
+         suffix: ""),
+        (context: try StencilContext.enrich(context: context,
+                                            parameters: [],
+                                            environment: ["PRODUCT_MODULE_NAME": "Test"]),
+         suffix: ""),
+        (context: try StencilContext.enrich(context: context,
+                                            parameters: [],
+                                            environment: ["PRODUCT_MODULE_NAME": "CustomSegue"]),
+         suffix: "-ignore-module"),
+        (context: try StencilContext.enrich(context: context,
+                                            parameters: ["module=Test"]),
+         suffix: ""),
+        (context: try StencilContext.enrich(context: context,
+                                            parameters: ["module=CustomSegue"]),
+         suffix: "-ignore-module")
+      ]
+    } catch {
+      fatalError("Unable to create context variations")
+    }
   }
 
   func testDefault() {
@@ -55,17 +71,4 @@ class StoryboardsiOSTests: XCTestCase {
          directory: .storyboardsiOS,
          contextVariations: StoryboardsiOSTests.variations)
   }
-
-  private static func enrich(_ context: [String: Any], env: [String: Any]? = nil, param: [String: Any]? = nil) -> [String: Any] {
-    var result = context
-
-    if let env = env {
-      result["env"] = env
-    }
-    if let param = param {
-      result["param"] = param
-    }
-
-    return result
-  }
 }