fix JSONEncodable tests for Array and Dictionary when they are declared with JSONEncodable protocol type

toco · toco · commit 683ac9cc6fe3 · 2015-10-14T14:03:45.000+02:00
diff --git a/JSONCodable/JSONHelpers.swift b/JSONCodable/JSONHelpers.swift
@@ -15,7 +15,7 @@ protocol JSONDictionary {
 
 extension Dictionary : JSONDictionary {
     func dictionaryIsJSONEncodable() -> Bool {
-        return Key.self is String.Type && Value.self is JSONEncodable.Type
+		return Key.self is String.Type && (Value.self is JSONEncodable.Type || Value.self is JSONEncodable.Protocol)
     }
     
     func dictionaryMadeJSONEncodable() -> [String: JSONEncodable] {
@@ -37,7 +37,7 @@ protocol JSONArray {
 
 extension Array: JSONArray {
     func elementsAreJSONEncodable() -> Bool {
-        return Element.self is JSONEncodable.Type
+		return Element.self is JSONEncodable.Type || Element.self is JSONEncodable.Protocol
     }
     
     func elementsMadeJSONEncodable() -> [JSONEncodable] {

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ protocol JSONDictionary {`
`15`	`15`
`16`	`16`	`extension Dictionary : JSONDictionary {`
`17`	`17`	`func dictionaryIsJSONEncodable() -> Bool {`
`18`		`- return Key.self is String.Type && Value.self is JSONEncodable.Type`
	`18`	`+ return Key.self is String.Type && (Value.self is JSONEncodable.Type \|\| Value.self is JSONEncodable.Protocol)`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`func dictionaryMadeJSONEncodable() -> [String: JSONEncodable] {`
`@@ -37,7 +37,7 @@ protocol JSONArray {`
`37`	`37`
`38`	`38`	`extension Array: JSONArray {`
`39`	`39`	`func elementsAreJSONEncodable() -> Bool {`
`40`		`- return Element.self is JSONEncodable.Type`
	`40`	`+ return Element.self is JSONEncodable.Type \|\| Element.self is JSONEncodable.Protocol`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`func elementsMadeJSONEncodable() -> [JSONEncodable] {`