Skip to content

Commit c3cf18e

Browse files
committed
Fix broken tests
1 parent 39d5665 commit c3cf18e

File tree

1 file changed

+26
-15
lines changed

1 file changed

+26
-15
lines changed

RubberduckTests/SourceControl/BranchesViewModelTests.cs

Lines changed: 26 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -118,11 +118,12 @@ public void DeleteBranchDisabled_BranchIsActive()
118118
//arrange
119119
var vm = new BranchesViewViewModel
120120
{
121-
Provider = _provider.Object
121+
Provider = _provider.Object,
122+
CurrentPublishedBranch = "master"
122123
};
123124

124125
//Assert
125-
Assert.IsFalse(vm.DeleteBranchToolbarButtonCommand.CanExecute("master"));
126+
Assert.IsFalse(vm.DeleteBranchToolbarButtonCommand.CanExecute(bool.TrueString));
126127
}
127128

128129
[TestMethod]
@@ -131,11 +132,12 @@ public void DeleteBranchEnabled_BranchIsNotActive()
131132
//arrange
132133
var vm = new BranchesViewViewModel
133134
{
134-
Provider = _provider.Object
135+
Provider = _provider.Object,
136+
CurrentPublishedBranch = "bugbranch"
135137
};
136138

137139
//Assert
138-
Assert.IsTrue(vm.DeleteBranchToolbarButtonCommand.CanExecute("bugbranch"));
140+
Assert.IsTrue(vm.DeleteBranchToolbarButtonCommand.CanExecute(bool.TrueString));
139141
}
140142

141143
[TestMethod]
@@ -151,18 +153,22 @@ public void DeleteBranch_BranchIsNotActive_BranchIsRemoved()
151153
};
152154

153155
//Assert
154-
Assert.IsFalse(vm.DeleteBranchToolbarButtonCommand.CanExecute("master"));
156+
Assert.IsFalse(vm.DeleteBranchToolbarButtonCommand.CanExecute(bool.FalseString));
155157

156158
_provider.SetupGet(p => p.Branches).Returns(
157159
new List<IBranch>
158160
{
159161
new Branch(firstBranchName, "ref/Heads/" + firstBranchName, false, true, null),
160162
new Branch(secondBranchName, "ref/Heads/" + secondBranchName, false, false, null)
161163
});
164+
165+
vm.CurrentPublishedBranch = firstBranchName;
166+
vm.CurrentUnpublishedBranch = secondBranchName;
167+
162168
_provider.Setup(p => p.DeleteBranch(It.IsAny<string>()));
163169

164170
//act
165-
vm.DeleteBranchToolbarButtonCommand.Execute(secondBranchName);
171+
vm.DeleteBranchToolbarButtonCommand.Execute(bool.FalseString);
166172

167173
//Assert
168174
_provider.Verify(p => p.DeleteBranch(secondBranchName));
@@ -737,13 +743,15 @@ public void OnMergeBranch_WhenCheckoutFails_ActionFailedEventIsRaised()
737743
public void OnDeleteBranch_WhenDeleteFails_ActionFailedEventIsRaised()
738744
{
739745
//arrange
746+
var branchName = "dev";
747+
740748
var wasRaised = false;
741749
var vm = new BranchesViewViewModel
742750
{
743-
Provider = _provider.Object
751+
Provider = _provider.Object,
752+
CurrentPublishedBranch = branchName
744753
};
745754

746-
var branchName = "dev";
747755
_provider.Setup(p => p.DeleteBranch(It.Is<string>(b => b == branchName)))
748756
.Throws(
749757
new SourceControlException("A source control exception was thrown.",
@@ -753,7 +761,7 @@ public void OnDeleteBranch_WhenDeleteFails_ActionFailedEventIsRaised()
753761
vm.ErrorThrown += (sender, error) => wasRaised = true;
754762

755763
//act
756-
vm.DeleteBranchToolbarButtonCommand.Execute(branchName);
764+
vm.DeleteBranchToolbarButtonCommand.Execute(bool.TrueString);
757765

758766
//assert
759767
Assert.IsTrue(wasRaised, "ActionFailedEvent was not raised.");
@@ -794,11 +802,12 @@ public void PublishPublishesBranch()
794802
var branch = "dev";
795803
var vm = new BranchesViewViewModel
796804
{
797-
Provider = _provider.Object
805+
Provider = _provider.Object,
806+
CurrentUnpublishedBranch = branch
798807
};
799808

800809
//act
801-
vm.PublishBranchToolbarButtonCommand.Execute(branch);
810+
vm.PublishBranchToolbarButtonCommand.Execute(null);
802811

803812
//Assert
804813
_provider.Verify(git => git.Publish(branch));
@@ -811,11 +820,12 @@ public void UnpublishUnpublishesBranch()
811820
var branch = "master";
812821
var vm = new BranchesViewViewModel
813822
{
814-
Provider = _provider.Object
823+
Provider = _provider.Object,
824+
CurrentPublishedBranch = branch
815825
};
816826

817827
//act
818-
vm.UnpublishBranchToolbarButtonCommand.Execute(branch);
828+
vm.UnpublishBranchToolbarButtonCommand.Execute(null);
819829

820830
//Assert
821831
_provider.Verify(git => git.Unpublish(branch));
@@ -852,7 +862,8 @@ public void UnpublishBranch_ActionFailedEventIsRaised()
852862
//arrange
853863
var vm = new BranchesViewViewModel
854864
{
855-
Provider = _provider.Object
865+
Provider = _provider.Object,
866+
CurrentPublishedBranch = "master"
856867
};
857868
var wasRaised = false;
858869

@@ -865,7 +876,7 @@ public void UnpublishBranch_ActionFailedEventIsRaised()
865876
vm.ErrorThrown += (sender, error) => wasRaised = true;
866877

867878
//act
868-
vm.UnpublishBranchToolbarButtonCommand.Execute("master");
879+
vm.UnpublishBranchToolbarButtonCommand.Execute(null);
869880

870881
//assert
871882
Assert.IsTrue(wasRaised, "ActionFailedEvent was not raised.");

0 commit comments

Comments
 (0)