Merge pull request #824 from Quick/fix-swift-5.3-incompatibility-of-e…

…xpect

[API BREAKING] Modify `expect` overloads to fix Swift 5.3 incompatibility

.github/workflows/ci.yml

@@ -22,21 +22,22 @@ jobs:
     runs-on: macos-latest
     strategy:
       matrix:
-        xcode: [11.7]
-        platform: [macos, ios, tvos, macos_xcodespm, ios_xcodespm, tvos_xcodespm]
+        xcode: [11.7, 12]
+        platform: [macos, ios, tvos]
       fail-fast: false
     env:
       DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode }}.app
     steps:
       - uses: actions/checkout@v2
       - run: ./test ${{ matrix.platform }}
+      - run: ./test ${{ matrix.platform }}_xcodespm
 
   swiftpm_darwin:
     name: SwiftPM, Darwin, Xcode ${{ matrix.xcode }}
     runs-on: macos-latest
     strategy:
       matrix:
-        xcode: [11.7]
+        xcode: [11.7, 12]
     env:
       DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode }}.app
     steps:

.travis.yml

@@ -19,22 +19,22 @@ jobs:
     #   osx_image: xcode10.3
     #   script: ./test swiftpm
     - &swiftpm_linux
-      name: SwiftPM / Linux / Swift 5.2.3
+      name: SwiftPM / Linux / Swift 5.2.5
       os: linux
       env:
-        - SWIFT_VERSION=5.2.3
+        - SWIFT_VERSION=5.2.5
       install:
         - eval "$(curl -sL https://swiftenv.fuller.li/install.sh)"
       script:
         - ./test swiftpm
     - <<: *swiftpm_linux
       name: SwiftPM / Linux / Swift 5.3 Development
       env:
-        - SWIFT_VERSION=5.3-DEVELOPMENT-SNAPSHOT-2020-05-11-a
+        - SWIFT_VERSION=5.3-DEVELOPMENT-SNAPSHOT-2020-09-04-a
     - <<: *swiftpm_linux
       name: SwiftPM / Linux / Swift Development
       env:
-        - SWIFT_VERSION=DEVELOPMENT-SNAPSHOT-2020-05-18-a
+        - SWIFT_VERSION=DEVELOPMENT-SNAPSHOT-2020-08-31-a
 install: true
 script:
   - ./test $TYPE

Sources/Nimble/Adapters/NMBExpectation.swift

@@ -52,9 +52,7 @@ public class NMBExpectation: NSObject {
     }
 
     private var expectValue: Expectation<NSObject> {
-        return expect(_file, line: _line) {
-            self._actualBlock() as NSObject?
-        }
+        return expect(file: _file, line: _line, self._actualBlock() as NSObject?)
     }
 
     @objc public var withTimeout: (TimeInterval) -> NMBExpectation {

Sources/Nimble/DSL.swift

@@ -1,5 +1,5 @@
 /// Make an expectation on a given actual value. The value given is lazily evaluated.
-public func expect<T>(_ expression: @autoclosure @escaping () throws -> T?, file: FileString = #file, line: UInt = #line) -> Expectation<T> {
+public func expect<T>(file: FileString = #file, line: UInt = #line, _ expression: @autoclosure @escaping () throws -> T?) -> Expectation<T> {
     return Expectation(
         expression: Expression(
             expression: expression,
@@ -8,10 +8,28 @@ public func expect<T>(_ expression: @autoclosure @escaping () throws -> T?, file
 }
 
 /// Make an expectation on a given actual value. The closure is lazily invoked.
-public func expect<T>(_ file: FileString = #file, line: UInt = #line, expression: @escaping () throws -> T?) -> Expectation<T> {
+public func expect<T>(file: FileString = #file, line: UInt = #line, _ expression: @autoclosure () -> (() throws -> T)) -> Expectation<T> {
     return Expectation(
         expression: Expression(
-            expression: expression,
+            expression: expression(),
+            location: SourceLocation(file: file, line: line),
+            isClosure: true))
+}
+
+/// Make an expectation on a given actual value. The closure is lazily invoked.
+public func expect<T>(file: FileString = #file, line: UInt = #line, _ expression: @autoclosure () -> (() throws -> T?)) -> Expectation<T> {
+    return Expectation(
+        expression: Expression(
+            expression: expression(),
+            location: SourceLocation(file: file, line: line),
+            isClosure: true))
+}
+
+/// Make an expectation on a given actual value. The closure is lazily invoked.
+public func expect(file: FileString = #file, line: UInt = #line, _ expression: @autoclosure () -> (() throws -> Void)) -> Expectation<Void> {
+    return Expectation(
+        expression: Expression(
+            expression: expression(),
             location: SourceLocation(file: file, line: line),
             isClosure: true))
 }

Tests/NimbleTests/Matchers/PostNotificationTest.swift

@@ -23,7 +23,7 @@ final class PostNotificationTest: XCTestCase {
         let bar = 2 as NSNumber
         let n1 = Notification(name: Notification.Name("Foo"), object: foo)
         let n2 = Notification(name: Notification.Name("Bar"), object: bar)
-        expect { () -> Void in
+        expect {
             self.notificationCenter.post(n1)
             self.notificationCenter.post(n2)
         }.to(postNotifications(equal([n1, n2]), from: notificationCenter))
@@ -72,7 +72,7 @@ final class PostNotificationTest: XCTestCase {
         let center = DistributedNotificationCenter()
         let n1 = Notification(name: Notification.Name("Foo"), object: "1")
         let n2 = Notification(name: Notification.Name("Bar"), object: "2")
-        expect { () -> Void in
+        expect {
             center.post(n1)
             center.post(n2)
         }.toEventually(postDistributedNotifications(equal([n1, n2]), from: center, names: [n1.name, n2.name]))