Fix bug with updating snapshots in CI env

stvd fgbfy srvd
theramis · Oct 1, 2020 · 4ab9e68 · 4ab9e68
1 parent 987c82b
commit 4ab9e68
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 2 deletions.
diff --git a/project/Snapper/Core/SnapperCore.cs b/project/Snapper/Core/SnapperCore.cs
@@ -36,14 +36,20 @@ protected SnapResult Snap(SnapshotId snapshotId, object newSnapshot)
 
         private bool ShouldUpdateSnapshot(object currentSnapshot, object newSnapshot)
         {
+            var snapshotsAreEqual = currentSnapshot != null
+                                    && _snapshotComparer.CompareSnapshots(currentSnapshot, newSnapshot);
+            if (!snapshotsAreEqual && _snapshotUpdateDecider.ShouldUpdateSnapshot())
+            {
+                return true;
+            }
+
             // Create snapshot if it doesn't currently exist and its not a CI env
             if (currentSnapshot == null)
             {
                 return !CiEnvironmentDetector.IsCiEnv();
             }
 
-            return !_snapshotComparer.CompareSnapshots(currentSnapshot, newSnapshot)
-                && _snapshotUpdateDecider.ShouldUpdateSnapshot();
+            return false;
         }
     }
 }
diff --git a/project/Tests/Snapper.Internals.Tests/Core/SnapperCoreTests.cs b/project/Tests/Snapper.Internals.Tests/Core/SnapperCoreTests.cs
@@ -120,6 +120,9 @@ public void SnapshotDoesNotExist_ShouldUpdate_ResultStatusIs_SnapshotUpdated()
         [Fact]
         public void SnapshotDoesNotExist_ResultStatusIs_SnapshotUpdated()
         {
+            // Tests run on CI so clearing the CI environment variable to emulate local machine
+            Environment.SetEnvironmentVariable("CI", null, EnvironmentVariableTarget.Process);
+
             _store.Setup(a => a.GetSnapshot(It.IsAny<SnapshotId>())).Returns(null);
             _updateDecider.Setup(a => a.ShouldUpdateSnapshot()).Returns(false);
 

diff --git a/project/Tests/Snapper.Tests/SnapperSnapshotsPerClassTests.cs b/project/Tests/Snapper.Tests/SnapperSnapshotsPerClassTests.cs
@@ -106,6 +106,10 @@ public void SnapshotDoesNotExist_And_IsCiEnv_SnapshotDoesNotExistException_IsThr
         public void SnapshotsDoesNotExist_SnapshotIsCreated()
         {
             // Arrange
+
+            // Tests run on CI so clearing the CI environment variable to emulate local machine
+            Environment.SetEnvironmentVariable("CI", null, EnvironmentVariableTarget.Process);
+
             var snapshotFilePath = GetSnapshotFilePath<SnapperSnapshotsPerClassTests>();
 
             var content = File.ReadAllText(snapshotFilePath);

diff --git a/project/Tests/Snapper.Tests/SnapperSnapshotsPerMethodTests.cs b/project/Tests/Snapper.Tests/SnapperSnapshotsPerMethodTests.cs
@@ -136,6 +136,9 @@ public void SnapshotDoesNotExist_And_IsCiEnv_SnapshotDoesNotExistException_IsThr
         [Fact]
         public void SnapshotsDoesNotExist_SnapshotIsCreated()
         {
+            // Tests run on CI so clearing the CI environment variable to emulate local machine
+            Environment.SetEnvironmentVariable("CI", null, EnvironmentVariableTarget.Process);
+
             // Arrange
             var snapshotFilePath = GetSnapshotFilePath<SnapperSnapshotsPerMethodTests>(
                 nameof(SnapshotsDoesNotExist_SnapshotIsCreated));