Merge branch 'develop' into swift3_develop

# Conflicts:
#	Cartfile.resolved
#	Carthage/Checkouts/GCDKit
#	CoreStoreTests/ErrorTests.swift
#	Sources/Fetching and Querying/Concrete Clauses/Select.swift
#	Sources/ObjectiveC/CSError.swift
This commit is contained in:
John Rommel Estropia committed 2016-07-22 00:47:03 +09:00
commit db5b8ca702
9 files changed
+57 -24

No files matched your search

+1 -1
View File
@@ -147,7 +147,7 @@ final class ErrorTests: XCTestCase {
"key3": Date()
]
)
let error = CoreStoreError.internalError(NSError: internalError)
let error = CoreStoreError(internalError)
XCTAssertEqual((error as NSError).domain, CoreStoreErrorDomain)
XCTAssertEqual((error as NSError).code, CoreStoreErrorCode.internalError.rawValue)