Merge branch 'main' into hs/support-throwing-transforms

.github/actions/build-and-run-unit-tests/action.yml

@@ -13,7 +13,12 @@ inputs:
 runs:
   using: "composite"
   steps:
+  # Look into caching the xcbeautify installation to instead of installing for each test
+  - name: Install XCBeautify
+    shell: bash
+    run: |
+        HOMEBREW_NO_AUTO_UPDATE=1 brew install xcbeautify
   - name: Build and Test
     shell: bash
     run: |
-      xcodebuild clean test -resultBundlePath TestResults/ResultBundle.xcresult -derivedDataPath DerivedData -workspace "ApolloDev.xcworkspace" -scheme "${{ inputs.scheme }}" -destination "${{ inputs.destination }}" -testPlan "${{ inputs.test-plan }}"
+      xcodebuild clean test -resultBundlePath TestResults/ResultBundle.xcresult -derivedDataPath DerivedData -workspace "ApolloDev.xcworkspace" -scheme "${{ inputs.scheme }}" -destination "${{ inputs.destination }}" -testPlan "${{ inputs.test-plan }}" | xcbeautify

.github/workflows/ci-tests.yml

@@ -177,6 +177,10 @@ jobs:
         xcode-version: ${{ env.XCODE_VERSION }}
     - name: Checkout Repo
       uses: actions/checkout@v3
+    - name: Install XCBeautify
+      shell: bash
+      run: |
+        HOMEBREW_NO_AUTO_UPDATE=1 brew install xcbeautify
     - name: Test Codegen Configurations
       shell: bash
       run: |

.github/workflows/docs-publish.yml

@@ -1,17 +1,19 @@
 name: Deploy docs to production
 
 on:
-  push:
+  pull_request_target:
     branches:
       - main
     paths:
       - docs/**
+    types: [closed]
 
 permissions:
   contents: read
 
 jobs:
   publish:
+    if: ${{ github.event.pull_request.merged }}
     permissions:
       contents: read
     uses: apollographql/docs/.github/workflows/publish.yml@main

.github/workflows/release-check.yml

@@ -230,6 +230,10 @@ jobs:
         xcode-version: ${{ env.XCODE_VERSION }}
     - name: Checkout Repo
       uses: actions/checkout@v3
+    - name: Install XCBeautify
+      shell: bash
+      run: |
+        HOMEBREW_NO_AUTO_UPDATE=1 brew install xcbeautify
     - name: Test Codegen Configurations
       shell: bash
       run: |

Tests/ApolloCodegenInternalTestHelpers/MockFileManager.swift

@@ -24,20 +24,33 @@ public class MockApolloFileManager: ApolloFileManager {
     }
   }
 
-  /// If `true` then all called closures must be mocked otherwise the call will fail. When `false` any called closure
-  /// that is not mocked will fall through to `super`. As a byproduct of `false`, all mocked closures must be called otherwise
-  /// the test will fail.
+  /// If `true` then any function on the file manager called that is not mocked will
+  ///  result in a test failure. If `false`, any called closure that is not mocked will fall
+  ///  through to `super`. Defaults to `true`.
   var strict: Bool { _base.strict }
+
+  /// If `true` all mocked closures must be called otherwise the test
+  ///  will fail. Defaults to `true`.
+  var requireAllClosuresCalled: Bool { _base.requireAllClosuresCalled }
+
   var _base: MockFileManager { unsafeDowncast(base, to: MockFileManager.self) }
 
   /// Designated initializer.
   ///
   /// - Parameters:
-  ///  - strict: If `true` then all called closures must be mocked otherwise the call will fail.
-  ///  When `false` any called closure that is not mocked will fall through to `super`. As a
-  ///  byproduct of `false`, all mocked closures must be called otherwise the test will fail.
-  public init(strict: Bool = true) {
-    super.init(base: MockFileManager(strict: strict))
+  ///  - strict: If `true` then any function on the file manager called that is not mocked will
+  ///  result in a test failure. If `false`, any called closure that is not mocked will fall
+  ///  through to `super`. Defaults to `true`.
+  ///  - requireAllClosuresCalled: If `true` all mocked closures must be called otherwise the test
+  ///  will fail. Defaults to `true`.
+  public init(
+    strict: Bool = true,
+    requireAllClosuresCalled: Bool = true
+  ) {
+    super.init(base: MockFileManager(
+      strict: strict,
+      requireAllClosuresCalled: requireAllClosuresCalled
+    ))
   }
 
   /// Provide a mock closure for the `FileManager` function.
@@ -58,39 +71,50 @@ public class MockApolloFileManager: ApolloFileManager {
 
   class MockFileManager: FileManager {
 
+    private let lock = NSLock()
+
     fileprivate var closures: [String: Closure] = [:]
     fileprivate var closuresToBeCalled: Set<String> = []
 
-    /// If `true` then all called closures must be mocked otherwise the call will fail. When `false` any called closure
-    /// that is not mocked will fall through to `super`. As a byproduct of `false`, all mocked closures must be called otherwise
-    /// the test will fail.
     let strict: Bool
 
-    fileprivate init(strict: Bool = true) {
+    let requireAllClosuresCalled: Bool
+
+    fileprivate init(
+      strict: Bool = true,
+      requireAllClosuresCalled: Bool = true
+    ) {
       self.strict = strict
+      self.requireAllClosuresCalled = requireAllClosuresCalled
     }
 
     deinit {
-      if strict == false && allClosuresCalled == false {
-        XCTFail("Non-strict mode requires that all mocked closures are called! Check \(closuresToBeCalled) in your MockFileManager instance.")
+      if requireAllClosuresCalled && !allClosuresCalled {
+        XCTFail("`requireAllClosuresCalled` is `true`, but not all mocked closures are called! Check \(closuresToBeCalled) in your MockFileManager instance.")
       }
     }
 
     /// Provide a mock closure for the `FileManager` function.
     ///
     /// - Parameter closure: The mocked function closure.
     fileprivate func mock(closure: Closure) {
-      closures[closure.description] = closure
-      closuresToBeCalled.insert(closure.description)
+      lock.withLock {
+        closures[closure.description] = closure
+        closuresToBeCalled.insert(closure.description)
+      }
     }
 
     fileprivate func didCall(closure: Closure) {
-      closuresToBeCalled.remove(closure.description)
+      lock.withLock {
+        _ = closuresToBeCalled.remove(closure.description)
+      }
     }
 
     /// Check whether all mocked closures were called during the lifetime of an instance.
     fileprivate var allClosuresCalled: Bool {
-      return closuresToBeCalled.isEmpty
+      return lock.withLock {
+        return closuresToBeCalled.isEmpty
+      }
     }
 
     // MARK: FileManager overrides