cashapp · NickEntin · Jan 5, 2021 · Jan 2, 2021 · Jan 2, 2021 · Jan 2, 2021
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -12,15 +12,19 @@ jobs:
     runs-on: macOS-latest
     strategy:
       matrix:
-        platform: ['iOS_13']
+        platform: ['iOS_14', 'iOS_13']
       fail-fast: false
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v2
       - name: Bundle Install
         run: bundle install --gemfile=Example/Gemfile
-      - name: Select Xcode Version
+      - name: Select Xcode Version (12.2)
+        run: sudo xcode-select --switch /Applications/Xcode_12.2.app/Contents/Developer
+        if: matrix.platform == 'iOS_14'
+      - name: Select Xcode Version (11.3.1)
         run: sudo xcode-select --switch /Applications/Xcode_11.3.1.app/Contents/Developer
+        if: matrix.platform == 'iOS_13'
       - name: Pod Install
         run: bundle exec --gemfile=Example/Gemfile pod install --project-directory=Example
       - name: Build and Test

diff --git a/..._64/ObjectiveCTests/testSimpleViewWithActivationPointAlways_14_2_390x844@3x.png b/..._64/ObjectiveCTests/testSimpleViewWithActivationPointAlways_14_2_390x844@3x.png
diff --git a/...64/ObjectiveCTests/testSimpleViewWithActivationPointDefault_14_2_390x844@3x.png b/...64/ObjectiveCTests/testSimpleViewWithActivationPointDefault_14_2_390x844@3x.png
diff --git a/.../_64/ObjectiveCTests/testSimpleViewWithActivationPointNever_14_2_390x844@3x.png b/.../_64/ObjectiveCTests/testSimpleViewWithActivationPointNever_14_2_390x844@3x.png
diff --git a/...Images/_64/ObjectiveCTests/testSimpleViewWithColorSnapshots_14_2_390x844@3x.png b/...Images/_64/ObjectiveCTests/testSimpleViewWithColorSnapshots_14_2_390x844@3x.png
diff --git a/..._64/ObjectiveCTests/testSimpleViewWithIdentifier_identifier_14_2_390x844@3x.png b/..._64/ObjectiveCTests/testSimpleViewWithIdentifier_identifier_14_2_390x844@3x.png
diff --git a/...hotTests/ReferenceImages/_64/ObjectiveCTests/testSimpleView_14_2_390x844@3x.png b/...hotTests/ReferenceImages/_64/ObjectiveCTests/testSimpleView_14_2_390x844@3x.png
diff --git a/...erenceImages/_64/ObjectiveCTests/testViewWithInvertedColors_14_2_390x844@3x.png b/...erenceImages/_64/ObjectiveCTests/testViewWithInvertedColors_14_2_390x844@3x.png
diff --git a/...Tests.AccessibilityContainersTests/testDataTableWithHeaders_14_2_390x844@3x.png b/...Tests.AccessibilityContainersTests/testDataTableWithHeaders_14_2_390x844@3x.png
diff --git a/...AccessibilityContainersTests/testDataTableWithUndefinedRows_14_2_390x844@3x.png b/...AccessibilityContainersTests/testDataTableWithUndefinedRows_14_2_390x844@3x.png
diff --git a/...64/SnapshotTests.AccessibilityContainersTests/testDataTable_14_2_390x844@3x.png b/...64/SnapshotTests.AccessibilityContainersTests/testDataTable_14_2_390x844@3x.png
diff --git a/..._64/SnapshotTests.AccessibilityContainersTests/testLandmark_14_2_390x844@3x.png b/..._64/SnapshotTests.AccessibilityContainersTests/testLandmark_14_2_390x844@3x.png
diff --git a/...ges/_64/SnapshotTests.AccessibilityContainersTests/testList_14_2_390x844@3x.png b/...ges/_64/SnapshotTests.AccessibilityContainersTests/testList_14_2_390x844@3x.png
diff --git a/...shotTests.AccessibilitySnapshotTests/testAccessibilityPaths_14_2_390x844@3x.png b/...shotTests.AccessibilitySnapshotTests/testAccessibilityPaths_14_2_390x844@3x.png
diff --git a/...4/SnapshotTests.AccessibilitySnapshotTests/testButtonTraits_14_2_390x844@3x.png b/...4/SnapshotTests.AccessibilitySnapshotTests/testButtonTraits_14_2_390x844@3x.png
diff --git a/.../SnapshotTests.AccessibilitySnapshotTests/testCustomActions_14_2_390x844@3x.png b/.../SnapshotTests.AccessibilitySnapshotTests/testCustomActions_14_2_390x844@3x.png
diff --git a/...otTests.AccessibilitySnapshotTests/testDescriptionEdgeCases_14_2_390x844@3x.png b/...otTests.AccessibilitySnapshotTests/testDescriptionEdgeCases_14_2_390x844@3x.png
diff --git a/...apshotTests.AccessibilitySnapshotTests/testLabelDescription_14_2_390x844@3x.png b/...apshotTests.AccessibilitySnapshotTests/testLabelDescription_14_2_390x844@3x.png
diff --git a/...es/_64/SnapshotTests.AccessibilitySnapshotTests/testTabBars_14_2_390x844@3x.png b/...es/_64/SnapshotTests.AccessibilitySnapshotTests/testTabBars_14_2_390x844@3x.png
diff --git a/...napshotTests.AccessibilitySnapshotTests/testViewDescription_14_2_390x844@3x.png b/...napshotTests.AccessibilitySnapshotTests/testViewDescription_14_2_390x844@3x.png
diff --git a/...pshotTests.ActivationPointTests/testActivationPointDisabled_14_2_390x844@3x.png b/...pshotTests.ActivationPointTests/testActivationPointDisabled_14_2_390x844@3x.png
diff --git a/...tivationPointTests/testActivationPointEnabledWhenOverridden_14_2_390x844@3x.png b/...tivationPointTests/testActivationPointEnabledWhenOverridden_14_2_390x844@3x.png
diff --git a/...apshotTests.ActivationPointTests/testActivationPointEnabled_14_2_390x844@3x.png b/...apshotTests.ActivationPointTests/testActivationPointEnabled_14_2_390x844@3x.png
diff --git a/...ages/_64/SnapshotTests.DefaultControlsTests/testPageControl_14_2_390x844@3x.png b/...ages/_64/SnapshotTests.DefaultControlsTests/testPageControl_14_2_390x844@3x.png
diff --git a/..._64/SnapshotTests.DefaultControlsTests/testSegmentedControl_14_2_390x844@3x.png b/..._64/SnapshotTests.DefaultControlsTests/testSegmentedControl_14_2_390x844@3x.png
diff --git a/...nceImages/_64/SnapshotTests.DefaultControlsTests/testSlider_14_2_390x844@3x.png b/...nceImages/_64/SnapshotTests.DefaultControlsTests/testSlider_14_2_390x844@3x.png
diff --git a/...ges/_64/SnapshotTests.DefaultControlsTests/testStepperAtMin_14_2_390x844@3x.png b/...ges/_64/SnapshotTests.DefaultControlsTests/testStepperAtMin_14_2_390x844@3x.png
diff --git a/...ceImages/_64/SnapshotTests.DefaultControlsTests/testStepper_14_2_390x844@3x.png b/...ceImages/_64/SnapshotTests.DefaultControlsTests/testStepper_14_2_390x844@3x.png
diff --git a/...SnapshotTests.ElementOrderTests/testContainerInElementStack_14_2_390x844@3x.png b/...SnapshotTests.ElementOrderTests/testContainerInElementStack_14_2_390x844@3x.png
diff --git a/...eferenceImages/_64/SnapshotTests.ElementOrderTests/testGrid_14_2_390x844@3x.png b/...eferenceImages/_64/SnapshotTests.ElementOrderTests/testGrid_14_2_390x844@3x.png
diff --git a/...pshotTests.ElementOrderTests/testGroupedViewsInElementStack_14_2_390x844@3x.png b/...pshotTests.ElementOrderTests/testGroupedViewsInElementStack_14_2_390x844@3x.png
diff --git a/...renceImages/_64/SnapshotTests.ElementOrderTests/testScatter_14_2_390x844@3x.png b/...renceImages/_64/SnapshotTests.ElementOrderTests/testScatter_14_2_390x844@3x.png
diff --git a/...ests.ElementOrderTests/testUngroupedViewsInAccessibleParent_14_2_390x844@3x.png b/...ests.ElementOrderTests/testUngroupedViewsInAccessibleParent_14_2_390x844@3x.png
diff --git a/...hotTests.ElementOrderTests/testUngroupedViewsInElementStack_14_2_390x844@3x.png b/...hotTests.ElementOrderTests/testUngroupedViewsInElementStack_14_2_390x844@3x.png
diff --git a/...ests.ElementOrderTests/testZeroSizedContainerInElementStack_14_2_390x844@3x.png b/...ests.ElementOrderTests/testZeroSizedContainerInElementStack_14_2_390x844@3x.png
diff --git a/...ests.ElementSelectionTests/testAccessibilityContainerHidden_14_2_390x844@3x.png b/...ests.ElementSelectionTests/testAccessibilityContainerHidden_14_2_390x844@3x.png
diff --git a/...SelectionTests/testAccessibilityContainerWithElementsHidden_14_2_390x844@3x.png b/...SelectionTests/testAccessibilityContainerWithElementsHidden_14_2_390x844@3x.png
diff --git a/...pshotTests.ElementSelectionTests/testAccessibilityContainer_14_2_390x844@3x.png b/...pshotTests.ElementSelectionTests/testAccessibilityContainer_14_2_390x844@3x.png
diff --git a/...tTests.ElementSelectionTests/testAccessibilityElementHidden_14_2_390x844@3x.png b/...tTests.ElementSelectionTests/testAccessibilityElementHidden_14_2_390x844@3x.png
diff --git a/...ntSelectionTests/testAccessibilityElementWithElementsHidden_14_2_390x844@3x.png b/...ntSelectionTests/testAccessibilityElementWithElementsHidden_14_2_390x844@3x.png
diff --git a/...tTests.ElementSelectionTests/testGroupedViewsInHiddenParent_14_2_390x844@3x.png b/...tTests.ElementSelectionTests/testGroupedViewsInHiddenParent_14_2_390x844@3x.png
diff --git a/...entSelectionTests/testGroupedViewsInParentThatHidesElements_14_2_390x844@3x.png b/...entSelectionTests/testGroupedViewsInParentThatHidesElements_14_2_390x844@3x.png
diff --git a/...es/_64/SnapshotTests.ElementSelectionTests/testGroupedViews_14_2_390x844@3x.png b/...es/_64/SnapshotTests.ElementSelectionTests/testGroupedViews_14_2_390x844@3x.png
diff --git a/...tTests.ElementSelectionTests/testMixedAccessibilityElements_14_2_390x844@3x.png b/...tTests.ElementSelectionTests/testMixedAccessibilityElements_14_2_390x844@3x.png
diff --git a/...shotTests.ElementSelectionTests/testNoAccessibilityElements_14_2_390x844@3x.png b/...shotTests.ElementSelectionTests/testNoAccessibilityElements_14_2_390x844@3x.png
diff --git a/...hotTests.ElementSelectionTests/testTwoAccessibilityElements_14_2_390x844@3x.png b/...hotTests.ElementSelectionTests/testTwoAccessibilityElements_14_2_390x844@3x.png
diff --git a/...Images/_64/SnapshotTests.HighlightTests/testColorInSnapshot_14_2_390x844@3x.png b/...Images/_64/SnapshotTests.HighlightTests/testColorInSnapshot_14_2_390x844@3x.png
diff --git a/...ReferenceImages/_64/SnapshotTests.HighlightTests/testColors_14_2_390x844@3x.png b/...ReferenceImages/_64/SnapshotTests.HighlightTests/testColors_14_2_390x844@3x.png
diff --git a/...eferenceImages/_64/SnapshotTests.HighlightTests/testOverlap_14_2_390x844@3x.png b/...eferenceImages/_64/SnapshotTests.HighlightTests/testOverlap_14_2_390x844@3x.png
diff --git a/...Images/_64/SnapshotTests.InvertColorsTests/testInvertColors_14_2_390x844@3x.png b/...Images/_64/SnapshotTests.InvertColorsTests/testInvertColors_14_2_390x844@3x.png
diff --git a/.../ReferenceImages/_64/SnapshotTests.LayoutTests/testClipping_14_2_390x844@3x.png b/.../ReferenceImages/_64/SnapshotTests.LayoutTests/testClipping_14_2_390x844@3x.png
diff --git a/.../_64/SnapshotTests.LayoutTests/testFullScreenWithFewMarkers_14_2_390x844@3x.png b/.../_64/SnapshotTests.LayoutTests/testFullScreenWithFewMarkers_14_2_390x844@3x.png
diff --git a/...SnapshotTests.LayoutTests/testFullScreenWithManyManyMarkers_14_2_390x844@3x.png b/...SnapshotTests.LayoutTests/testFullScreenWithManyManyMarkers_14_2_390x844@3x.png
diff --git a/..._64/SnapshotTests.LayoutTests/testFullScreenWithManyMarkers_14_2_390x844@3x.png b/..._64/SnapshotTests.LayoutTests/testFullScreenWithManyMarkers_14_2_390x844@3x.png
diff --git a/...ges/_64/SnapshotTests.LayoutTests/testLongMarkerDescription_14_2_390x844@3x.png b/...ges/_64/SnapshotTests.LayoutTests/testLongMarkerDescription_14_2_390x844@3x.png
diff --git a/.../ReferenceImages/_64/SnapshotTests.LayoutTests/testStandard_14_2_390x844@3x.png b/.../ReferenceImages/_64/SnapshotTests.LayoutTests/testStandard_14_2_390x844@3x.png
diff --git a/...es/_64/SnapshotTests.LayoutTests/testWideViewWithFewMarkers_14_2_390x844@3x.png b/...es/_64/SnapshotTests.LayoutTests/testWideViewWithFewMarkers_14_2_390x844@3x.png
diff --git a/...s/_64/SnapshotTests.LayoutTests/testWideViewWithManyMarkers_14_2_390x844@3x.png b/...s/_64/SnapshotTests.LayoutTests/testWideViewWithManyMarkers_14_2_390x844@3x.png
diff --git a/...mages/_64/SnapshotTests.ModalTests/testOneModalOneContainer_14_2_390x844@3x.png b/...mages/_64/SnapshotTests.ModalTests/testOneModalOneContainer_14_2_390x844@3x.png
diff --git a/...eferenceImages/_64/SnapshotTests.ModalTests/testSingleModal_14_2_390x844@3x.png b/...eferenceImages/_64/SnapshotTests.ModalTests/testSingleModal_14_2_390x844@3x.png
diff --git a/...erenceImages/_64/SnapshotTests.ModalTests/testTwoContainers_14_2_390x844@3x.png b/...erenceImages/_64/SnapshotTests.ModalTests/testTwoContainers_14_2_390x844@3x.png
diff --git a/.../ReferenceImages/_64/SnapshotTests.ModalTests/testTwoModals_14_2_390x844@3x.png b/.../ReferenceImages/_64/SnapshotTests.ModalTests/testTwoModals_14_2_390x844@3x.png
diff --git a/.../_64/SnapshotTests.SwitchControlsTests/testFakeSwitchButton_14_2_390x844@3x.png b/.../_64/SnapshotTests.SwitchControlsTests/testFakeSwitchButton_14_2_390x844@3x.png
diff --git a/...Images/_64/SnapshotTests.SwitchControlsTests/testFakeSwitch_14_2_390x844@3x.png b/...Images/_64/SnapshotTests.SwitchControlsTests/testFakeSwitch_14_2_390x844@3x.png
diff --git a/...ferenceImages/_64/SnapshotTests.SwitchControlsTests/testOff_14_2_390x844@3x.png b/...ferenceImages/_64/SnapshotTests.SwitchControlsTests/testOff_14_2_390x844@3x.png
diff --git a/...eferenceImages/_64/SnapshotTests.SwitchControlsTests/testOn_14_2_390x844@3x.png b/...eferenceImages/_64/SnapshotTests.SwitchControlsTests/testOn_14_2_390x844@3x.png
diff --git a/...mages/_64/SnapshotTests.SwitchControlsTests/testOn_disabled_14_2_390x844@3x.png b/...mages/_64/SnapshotTests.SwitchControlsTests/testOn_disabled_14_2_390x844@3x.png
diff --git a/...tTests.SwitchControlsTests/testOn_withLabelAndHintAndTraits_14_2_390x844@3x.png b/...tTests.SwitchControlsTests/testOn_withLabelAndHintAndTraits_14_2_390x844@3x.png
diff --git a/...4/SnapshotTests.SwitchControlsTests/testOn_withLabelAndHint_14_2_390x844@3x.png b/...4/SnapshotTests.SwitchControlsTests/testOn_withLabelAndHint_14_2_390x844@3x.png
diff --git a/.../SnapshotTests.SwitchControlsTests/testOn_withLabelAndValue_14_2_390x844@3x.png b/.../SnapshotTests.SwitchControlsTests/testOn_withLabelAndValue_14_2_390x844@3x.png
diff --git a/...ages/_64/SnapshotTests.SwitchControlsTests/testOn_withLabel_14_2_390x844@3x.png b/...ages/_64/SnapshotTests.SwitchControlsTests/testOn_withLabel_14_2_390x844@3x.png
diff --git a/Example/SnapshotTests/SnapshotTestCase.swift b/Example/SnapshotTests/SnapshotTestCase.swift
@@ -44,6 +44,7 @@ class SnapshotTestCase: FBSnapshotTestCase {
     // MARK: - Private Static Properties
 
     private static let testedDevices = [
+        TestDeviceConfig(systemVersion: "14.2", screenSize: CGSize(width: 390, height: 844), screenScale: 3),
         TestDeviceConfig(systemVersion: "13.3", screenSize: CGSize(width: 375, height: 812), screenScale: 3),
         TestDeviceConfig(systemVersion: "12.1", screenSize: CGSize(width: 375, height: 812), screenScale: 3),
     ]

diff --git a/...otTests/__Snapshots__/SnapshotTestingTests/testInvertColors.390x844-14-2-3x.png b/...otTests/__Snapshots__/SnapshotTestingTests/testInvertColors.390x844-14-2-3x.png
diff --git a/.../__Snapshots__/SnapshotTestingTests/testMarkerColors.custom-390x844-14-2-3x.png b/.../__Snapshots__/SnapshotTestingTests/testMarkerColors.custom-390x844-14-2-3x.png
diff --git a/...__Snapshots__/SnapshotTestingTests/testMarkerColors.default-390x844-14-2-3x.png b/...__Snapshots__/SnapshotTestingTests/testMarkerColors.default-390x844-14-2-3x.png
diff --git a/...Snapshots__/SnapshotTestingTests/testRenderingMethods.false-390x844-14-2-3x.png b/...Snapshots__/SnapshotTestingTests/testRenderingMethods.false-390x844-14-2-3x.png
diff --git a/..._Snapshots__/SnapshotTestingTests/testRenderingMethods.true-390x844-14-2-3x.png b/..._Snapshots__/SnapshotTestingTests/testRenderingMethods.true-390x844-14-2-3x.png
diff --git a/...ts__/SnapshotTestingTests/testShowingActivationPoint.always-390x844-14-2-3x.png b/...ts__/SnapshotTestingTests/testShowingActivationPoint.always-390x844-14-2-3x.png
diff --git a/...ots__/SnapshotTestingTests/testShowingActivationPoint.never-390x844-14-2-3x.png b/...ots__/SnapshotTestingTests/testShowingActivationPoint.never-390x844-14-2-3x.png
diff --git a/...pshotTestingTests/testShowingActivationPoint.whenOverridden-390x844-14-2-3x.png b/...pshotTestingTests/testShowingActivationPoint.whenOverridden-390x844-14-2-3x.png
diff --git a/.../__Snapshots__/SnapshotTestingTests/testSimpleConfiguration.390x844-14-2-3x.png b/.../__Snapshots__/SnapshotTestingTests/testSimpleConfiguration.390x844-14-2-3x.png
diff --git a/...ts__/SnapshotTestingTests/testUsingMonochromeSnapshot.false-390x844-14-2-3x.png b/...ts__/SnapshotTestingTests/testUsingMonochromeSnapshot.false-390x844-14-2-3x.png
diff --git a/...ots__/SnapshotTestingTests/testUsingMonochromeSnapshot.true-390x844-14-2-3x.png b/...ots__/SnapshotTestingTests/testUsingMonochromeSnapshot.true-390x844-14-2-3x.png
diff --git a/Sources/AccessibilitySnapshot/Core/Swift/Classes/UIView+InvertColorsSnapshotting.swift b/Sources/AccessibilitySnapshot/Core/Swift/Classes/UIView+InvertColorsSnapshotting.swift
@@ -24,18 +24,17 @@ extension UIView {
 
     public func drawHierarchyWithInvertedColors(in rect: CGRect, using context: UIGraphicsImageRendererContext) {
         if accessibilityIgnoresInvertColors {
-            drawHierarchy(in: rect, afterScreenUpdates: false)
+            drawHierarchy(in: rect, afterScreenUpdates: true)
 
         } else {
             let subviewsToDrawSeparately = subviews.filter { subview in
                 !subview.isHidden && subview.hasSubviewInHierarchyThatIgnoresInvertColors
             }
             subviewsToDrawSeparately.forEach { $0.isHidden = true }
-            CATransaction.flush()
 
             let renderer = UIGraphicsImageRenderer(bounds: bounds)
             let image = renderer.image { context in
-                drawHierarchy(in: bounds, afterScreenUpdates: false)
+                drawHierarchy(in: bounds, afterScreenUpdates: true)
             }
 
             let filter = CIFilter(name: "CIColorInvert")!
@@ -47,7 +46,6 @@ extension UIView {
             context.cgContext.draw(invertedCGImage, in: rect)
 
             subviewsToDrawSeparately.forEach { $0.isHidden = false }
-            CATransaction.flush()
 
             // Sort the visible subviews by their ordering in the draw stack. For the most part, the
             // position of views is determined by the ordering of `subviews`, with the exception of those