Only update SubscribedChannel if switching is successful

ashokgelal · Apr 26, 2017 · bad3628 · bad3628
1 parent 2609164
commit bad3628
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 5 deletions.
diff --git a/src/Magpie/Magpie.Tests/Services/MagpieTest.cs b/src/Magpie/Magpie.Tests/Services/MagpieTest.cs
@@ -132,7 +132,7 @@ public void SwitchingToChannelThatRequiresEnrollment_ShowsEnrollmentWindow()
         }
 
         [TestMethod]
-        public void FailingToEnroll_DoesNotCheckForUpdates()
+        public void SwitchingChannel_FailingToEnroll_DoesNotCheckForUpdates()
         {
             var updateDecider = Substitute.For<UpdateDecider>(new DebuggingWindowViewModel());
             _mockMagpie.UpdateDecider = updateDecider;
@@ -144,7 +144,7 @@ public void FailingToEnroll_DoesNotCheckForUpdates()
         }
 
         [TestMethod]
-        public void SuccessfullyEnrolled_CheckForUpdates()
+        public void SwitchingChannel_SuccessfullyEnrolled_CheckForUpdates()
         {
             var updateDecider = Substitute.For<UpdateDecider>(new DebuggingWindowViewModel());
             _mockMagpie.UpdateDecider = updateDecider;
@@ -157,19 +157,51 @@ public void SuccessfullyEnrolled_CheckForUpdates()
         }
 
         [TestMethod]
-        public void SwitchChannel_LogsEnrollment()
+        public void SwitchingChannel_LogsEnrollment()
         {
             _mockMagpie.SwitchSubscribedChannel(3);
             _analyticsLogger.Received(1).LogEnrollment(Arg.Any<Enrollment>());
         }
 
         [TestMethod]
-        public void SwitchChannel_EnrollmentAvailableEventGetsFired()
+        public void SwitchingChannel_EnrollmentAvailableEventGetsFired()
         {
             var raised = false;
             _mockMagpie.EnrollmentAvailableEvent += (s, a) => { raised = true; };
             _mockMagpie.SwitchSubscribedChannel(3);
             Assert.IsTrue(raised);
         }
+
+        [TestMethod]
+        public void SwitchingChannel_SuccessfullyEnrolled_UpdatesSubscribedChannel()
+        {
+            var updateDecider = Substitute.For<UpdateDecider>(new DebuggingWindowViewModel());
+            _mockMagpie.UpdateDecider = updateDecider;
+            updateDecider.ShouldUpdate(Arg.Any<Channel>(), true).Returns(false);
+            _mockMagpie._enrollmentToReturn = new Enrollment(new Channel()) { IsEnrolled = true };
+            _mockMagpie.SwitchSubscribedChannel(4);
+
+            Assert.AreEqual(4, _mockMagpie.AppInfo.SubscribedChannel);
+        }
+
+        [TestMethod]
+        public void SwitchingChannel_FailingToEnroll_DoesNotUpdateSubscribedChannel()
+        {
+            _mockMagpie._enrollmentToReturn = new Enrollment(new Channel()) { IsEnrolled = false };
+            _mockMagpie.SwitchSubscribedChannel(4);
+
+            Assert.AreNotEqual(4, _mockMagpie.AppInfo.SubscribedChannel);
+        }
+
+        [TestMethod] 
+        public void SwitchingToChannelThatDoesNotRequireEnrollment_UpdatesSubscribedChannel()
+        {
+            var updateDecider = Substitute.For<UpdateDecider>(new DebuggingWindowViewModel());
+            updateDecider.ShouldUpdate(Arg.Any<Channel>(), true).Returns(false);
+            _mockMagpie.UpdateDecider = updateDecider;
+            _mockMagpie.SwitchSubscribedChannel(3);
+
+            Assert.AreEqual(3, _mockMagpie.AppInfo.SubscribedChannel);
+        }
     }
 }
diff --git a/src/Magpie/Magpie/Services/Magpie.cs b/src/Magpie/Magpie/Services/Magpie.cs
@@ -48,7 +48,6 @@ await Check(appcastUrl ?? AppInfo.AppCastUrl, CheckState.Force, AppInfo.Subscrib
 
         public async void SwitchSubscribedChannel(int channelId, bool showDebuggingWindow = false)
         {
-            AppInfo.SubscribedChannel = channelId;
             await Check(AppInfo.AppCastUrl, CheckState.ChannelSwitch, channelId, showDebuggingWindow)
                 .ConfigureAwait(false);
         }
@@ -83,6 +82,7 @@ private async Task Check(string appcastUrl, CheckState checkState, int channelId
                 {
                     ShowNoUpdatesWindow();
                 }
+                AppInfo.SubscribedChannel = channelId;
             }
             catch (Exception ex)
             {