Merge pull request #227 from ncooke3/nc/add-ci

[Infra] Add GHA workflow
google · Jan 29, 2024 · 5031732 · 5031732
2 parents 5b6daa4 + 1ae8e6d
commit 5031732
Show file tree

Hide file tree

Showing 5 changed files with 52 additions and 15 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -0,0 +1,30 @@
+name: ci
+
+on:
+  pull_request:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  spm:
+    runs-on: macOS-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Build
+        run: swift build
+      - name: Test
+        run: swift test
+
+  cocoapods:
+    strategy:
+      matrix:
+        podspec: [PromisesObjC.podspec, PromisesSwift.podspec]
+        platform: [ios, tvos, macos, watchos]
+    runs-on: macOS-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Lint
+        run: |
+          pod lib lint ${{ matrix.podspec }} --platforms=${{ matrix.platform }}
diff --git a/Tests/FBLPromisesInteroperabilityTests/FBLPromise+CatchInteroperabilityTests.m b/Tests/FBLPromisesInteroperabilityTests/FBLPromise+CatchInteroperabilityTests.m
@@ -20,7 +20,8 @@
 
 #import "FBLPromise+Testing.h"
 #import "FBLPromisesTestHelpers.h"
-#import "PromisesTestHelpers-Swift.h"
+
+@import PromisesTestHelpers;
 
 @interface FBLPromiseCatchInteroperabilityTests : XCTestCase
 @end

diff --git a/Tests/FBLPromisesInteroperabilityTests/FBLPromise+ThenInteroperabilityTests.m b/Tests/FBLPromisesInteroperabilityTests/FBLPromise+ThenInteroperabilityTests.m
@@ -20,7 +20,8 @@
 
 #import "FBLPromise+Testing.h"
 #import "FBLPromisesTestHelpers.h"
-#import "PromisesTestHelpers-Swift.h"
+
+@import PromisesTestHelpers;
 
 @interface FBLPromiseThenInteroperabilityTests : XCTestCase
 @end

diff --git a/Tests/PromisesTests/Promise+ThenTests.swift b/Tests/PromisesTests/Promise+ThenTests.swift
@@ -59,6 +59,23 @@ class PromiseThenTests: XCTestCase {
     XCTAssertNil(postFinalPromise.error)
   }
 
+  func testPromiseWhenNilBridgesToNSNullInThenChain() {
+    // Act.
+    let promise = Promise<Any?> { fulfill, _ in
+      fulfill(nil)
+    }.catch { _ in
+      XCTFail()
+    }.then { value in
+      XCTAssert(value is NSNull)
+    }
+
+    // Assert.
+    XCTAssert(waitForPromises(timeout: 10))
+    XCTAssertTrue(promise.isFulfilled)
+    XCTAssert(promise.value is NSNull)
+    XCTAssertNil(promise.error)
+  }
+
   func testPromiseAsyncFulfill() {
     // Act.
     let promise = Promise { fulfill, _ in

diff --git a/Tests/PromisesTests/Promise+WrapTests.swift b/Tests/PromisesTests/Promise+WrapTests.swift
@@ -23,8 +23,6 @@ class PromiseResolveTests: XCTestCase {
       Harness.async(completion: handler)
     }.catch { _ in
       XCTFail()
-    }.then { value in
-      XCTAssertNil(value)
     }
 
     // Assert.
@@ -57,8 +55,6 @@ class PromiseResolveTests: XCTestCase {
       Harness.async(value: nil, completion: handler)
     }.catch { _ in
       XCTFail()
-    }.then { value in
-      XCTAssertNil(value)
     }
 
     // Assert.
@@ -107,8 +103,6 @@ class PromiseResolveTests: XCTestCase {
       Harness.async(value: nil, error: nil, completion: handler)
     }.catch { _ in
       XCTFail()
-    }.then { value in
-      XCTAssertNil(value)
     }
     // Assert.
     XCTAssert(waitForPromises(timeout: 10))
@@ -118,21 +112,15 @@ class PromiseResolveTests: XCTestCase {
   }
 
   func testPromiseWrapErrorOrObjectCompletionFulfillsWithNilValue() {
-    // Arrange.
-    let expectation = self.expectation(description: "")
-
     // Act.
     let promise = wrap { (handler: @escaping (Error?, Any?) -> Void) in
       Harness.async(error: nil, value: nil, completion: handler)
     }.catch { _ in
       XCTFail()
-    }.then { value in
-      XCTAssertNil(value)
-      expectation.fulfill()
     }
 
     // Assert.
-    waitForExpectations(timeout: 10)
+    XCTAssert(waitForPromises(timeout: 10))
     XCTAssertTrue(promise.isFulfilled)
     XCTAssert(promise.value == nil)
     XCTAssertNil(promise.error)