From 3b4d77e70400250728e7bc0e04c7faf26165eee8 Mon Sep 17 00:00:00 2001 From: Stanley Goldman Date: Mon, 18 Sep 2017 17:45:03 -0400 Subject: [PATCH 1/2] Missing fix --- src/tests/IntegrationTests/Events/RepositoryWatcherTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tests/IntegrationTests/Events/RepositoryWatcherTests.cs b/src/tests/IntegrationTests/Events/RepositoryWatcherTests.cs index 00a7f4a2d..6427fac6c 100644 --- a/src/tests/IntegrationTests/Events/RepositoryWatcherTests.cs +++ b/src/tests/IntegrationTests/Events/RepositoryWatcherTests.cs @@ -44,7 +44,7 @@ public async Task ShouldDetectFileChanges() Logger.Trace("Continue test"); repositoryWatcherListener.DidNotReceive().ConfigChanged(); - repositoryWatcherListener.DidNotReceive().HeadChanged(Args.String); + repositoryWatcherListener.DidNotReceive().HeadChanged(); repositoryWatcherListener.Received().IndexChanged(); repositoryWatcherListener.DidNotReceive().LocalBranchCreated(Args.String); repositoryWatcherListener.DidNotReceive().LocalBranchDeleted(Args.String); From 553c13bca287a6e522c1c2b8ae2c8a9721f3341f Mon Sep 17 00:00:00 2001 From: Stanley Goldman Date: Tue, 19 Sep 2017 08:25:52 -0400 Subject: [PATCH 2/2] Fixing tests --- src/GitHub.Api/Git/RepositoryManager.cs | 3 +++ .../Events/RepositoryManagerTests.cs | 16 ++++++++++------ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/src/GitHub.Api/Git/RepositoryManager.cs b/src/GitHub.Api/Git/RepositoryManager.cs index 238a2dc09..14cfac99d 100644 --- a/src/GitHub.Api/Git/RepositoryManager.cs +++ b/src/GitHub.Api/Git/RepositoryManager.cs @@ -460,6 +460,9 @@ private void RefreshConfigData(bool resetConfig = false) LoadBranchesFromConfig(); LoadRemotesFromConfig(); + OnLocalBranchListChanged?.Invoke(); + OnRemoteBranchListChanged?.Invoke(); + OnActiveBranchChanged?.Invoke(GetActiveBranch()); OnActiveRemoteChanged?.Invoke(GetActiveRemote()); } diff --git a/src/tests/IntegrationTests/Events/RepositoryManagerTests.cs b/src/tests/IntegrationTests/Events/RepositoryManagerTests.cs index c8d84ebd2..58513519a 100644 --- a/src/tests/IntegrationTests/Events/RepositoryManagerTests.cs +++ b/src/tests/IntegrationTests/Events/RepositoryManagerTests.cs @@ -301,6 +301,8 @@ public async Task ShouldDetectChangesToRemotes() await RepositoryManager.RemoteRemove("origin").StartAsAsync(); await TaskManager.Wait(); RepositoryManager.WaitForEvents(); + WaitForNotBusy(repositoryManagerEvents); + repositoryManagerEvents.OnRemoteBranchListChanged.WaitOne(TimeSpan.FromSeconds(1)); Environment.Repository.CurrentRemote.HasValue.Should().BeFalse(); @@ -310,7 +312,7 @@ public async Task ShouldDetectChangesToRemotes() repositoryManagerListener.DidNotReceive().OnStatusUpdate(Args.GitStatus); repositoryManagerListener.Received().OnActiveBranchChanged(Arg.Any()); repositoryManagerListener.Received().OnActiveRemoteChanged(Arg.Any()); - repositoryManagerListener.DidNotReceive().OnLocalBranchListChanged(); + repositoryManagerListener.Received().OnLocalBranchListChanged(); repositoryManagerListener.Received().OnRemoteBranchListChanged(); repositoryManagerListener.ReceivedWithAnyArgs().OnIsBusyChanged(Args.Bool); repositoryManagerListener.DidNotReceive().OnLocksUpdated(Args.EnumerableGitLock); @@ -321,6 +323,8 @@ public async Task ShouldDetectChangesToRemotes() await RepositoryManager.RemoteAdd("origin", "https://github.com/EvilShana/IOTestsRepo.git").StartAsAsync(); await TaskManager.Wait(); RepositoryManager.WaitForEvents(); + WaitForNotBusy(repositoryManagerEvents); + repositoryManagerEvents.OnRemoteBranchListChanged.WaitOne(TimeSpan.FromSeconds(1)); Environment.Repository.CurrentRemote.HasValue.Should().BeTrue(); Environment.Repository.CurrentRemote.Value.Name.Should().Be("origin"); @@ -332,8 +336,8 @@ public async Task ShouldDetectChangesToRemotes() repositoryManagerListener.DidNotReceive().OnStatusUpdate(Args.GitStatus); repositoryManagerListener.Received().OnActiveBranchChanged(Arg.Any()); repositoryManagerListener.Received().OnActiveRemoteChanged(Arg.Any()); - repositoryManagerListener.DidNotReceive().OnLocalBranchListChanged(); - repositoryManagerListener.DidNotReceive().OnRemoteBranchListChanged(); + repositoryManagerListener.Received().OnLocalBranchListChanged(); + repositoryManagerListener.Received().OnRemoteBranchListChanged(); repositoryManagerListener.ReceivedWithAnyArgs().OnIsBusyChanged(Args.Bool); repositoryManagerListener.DidNotReceive().OnLocksUpdated(Args.EnumerableGitLock); } @@ -422,7 +426,7 @@ public async Task ShouldUpdateCloneUrlIfRemoteIsDeleted() repositoryManagerListener.ReceivedWithAnyArgs().OnIsBusyChanged(Args.Bool); repositoryManagerListener.Received().OnActiveBranchChanged(Arg.Any()); repositoryManagerListener.Received().OnActiveRemoteChanged(Arg.Any()); - repositoryManagerListener.DidNotReceive().OnLocalBranchListChanged(); + repositoryManagerListener.Received().OnLocalBranchListChanged(); repositoryManagerListener.Received().OnRemoteBranchListChanged(); repositoryManagerListener.DidNotReceive().OnLocksUpdated(Args.EnumerableGitLock); @@ -443,8 +447,8 @@ public async Task ShouldUpdateCloneUrlIfRemoteIsDeleted() repositoryManagerListener.ReceivedWithAnyArgs().OnIsBusyChanged(Args.Bool); repositoryManagerListener.Received().OnActiveBranchChanged(Arg.Any()); repositoryManagerListener.Received().OnActiveRemoteChanged(Arg.Any()); - repositoryManagerListener.DidNotReceive().OnLocalBranchListChanged(); - repositoryManagerListener.DidNotReceive().OnRemoteBranchListChanged(); + repositoryManagerListener.Received().OnLocalBranchListChanged(); + repositoryManagerListener.Received().OnRemoteBranchListChanged(); repositoryManagerListener.DidNotReceive().OnLocksUpdated(Args.EnumerableGitLock); }