Validate dictionary args only if the job requires persistence (#61)

lucas34 · Jan 21, 2018 · 3a2d507 · 3a2d507
1 parent 6c16705
commit 3a2d507
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/Sources/SwiftQueue/Job.swift b/Sources/SwiftQueue/Job.swift
@@ -95,7 +95,6 @@ public final class JobBuilder {
 
     /// Custom parameters will be forwarded to create method
     public func with(params: [String: Any]) -> Self {
-        assert(JSONSerialization.isValidJSONObject(params))
         info.params = params
         return self
     }
@@ -106,6 +105,11 @@ public final class JobBuilder {
 
     /// Add job to the JobQueue
     public func schedule(manager: SwiftQueueManager) {
+        if info.isPersisted {
+            // Check if we will be able to serialise args
+            assert(JSONSerialization.isValidJSONObject(info.params))
+        }
+
         let queue = manager.getQueue(name: info.group)
         guard let job = queue.createHandler(type: info.type, params: info.params) else {
             return

diff --git a/Tests/SwiftQueueTests/SwiftQueueBuilderTests.swift b/Tests/SwiftQueueTests/SwiftQueueBuilderTests.swift
@@ -135,6 +135,17 @@ class SwiftQueueBuilderTests: XCTestCase {
         XCTAssertTrue(NSDictionary(dictionary: params).isEqual(to: jobInfo?.params))
     }
 
+    public func testBuilderWithFreeArgs() {
+        let type = UUID().uuidString
+        let params: [String: Any] = [UUID().uuidString: [UUID().uuidString: self]]
+
+        let creator = TestCreator([type: TestJob()])
+        let manager = SwiftQueueManager(creators: [creator])
+
+        // No assert expected
+        JobBuilder(type: type).with(params: params).schedule(manager: manager)
+    }
+
     private func toJobInfo(type: String, _ builder: JobBuilder) -> JobInfo? {
         let creator = TestCreator([type: TestJob()])
         let persister = PersisterTracker(key: UUID().uuidString)