@@ -118,11 +118,12 @@ public void DeleteBranchDisabled_BranchIsActive()
118
118
//arrange
119
119
var vm = new BranchesViewViewModel
120
120
{
121
- Provider = _provider . Object
121
+ Provider = _provider . Object ,
122
+ CurrentPublishedBranch = "master"
122
123
} ;
123
124
124
125
//Assert
125
- Assert . IsFalse ( vm . DeleteBranchToolbarButtonCommand . CanExecute ( "master" ) ) ;
126
+ Assert . IsFalse ( vm . DeleteBranchToolbarButtonCommand . CanExecute ( bool . TrueString ) ) ;
126
127
}
127
128
128
129
[ TestMethod ]
@@ -131,11 +132,12 @@ public void DeleteBranchEnabled_BranchIsNotActive()
131
132
//arrange
132
133
var vm = new BranchesViewViewModel
133
134
{
134
- Provider = _provider . Object
135
+ Provider = _provider . Object ,
136
+ CurrentPublishedBranch = "bugbranch"
135
137
} ;
136
138
137
139
//Assert
138
- Assert . IsTrue ( vm . DeleteBranchToolbarButtonCommand . CanExecute ( "bugbranch" ) ) ;
140
+ Assert . IsTrue ( vm . DeleteBranchToolbarButtonCommand . CanExecute ( bool . TrueString ) ) ;
139
141
}
140
142
141
143
[ TestMethod ]
@@ -151,18 +153,22 @@ public void DeleteBranch_BranchIsNotActive_BranchIsRemoved()
151
153
} ;
152
154
153
155
//Assert
154
- Assert . IsFalse ( vm . DeleteBranchToolbarButtonCommand . CanExecute ( "master" ) ) ;
156
+ Assert . IsFalse ( vm . DeleteBranchToolbarButtonCommand . CanExecute ( bool . FalseString ) ) ;
155
157
156
158
_provider . SetupGet ( p => p . Branches ) . Returns (
157
159
new List < IBranch >
158
160
{
159
161
new Branch ( firstBranchName , "ref/Heads/" + firstBranchName , false , true , null ) ,
160
162
new Branch ( secondBranchName , "ref/Heads/" + secondBranchName , false , false , null )
161
163
} ) ;
164
+
165
+ vm . CurrentPublishedBranch = firstBranchName ;
166
+ vm . CurrentUnpublishedBranch = secondBranchName ;
167
+
162
168
_provider . Setup ( p => p . DeleteBranch ( It . IsAny < string > ( ) ) ) ;
163
169
164
170
//act
165
- vm . DeleteBranchToolbarButtonCommand . Execute ( secondBranchName ) ;
171
+ vm . DeleteBranchToolbarButtonCommand . Execute ( bool . FalseString ) ;
166
172
167
173
//Assert
168
174
_provider . Verify ( p => p . DeleteBranch ( secondBranchName ) ) ;
@@ -737,13 +743,15 @@ public void OnMergeBranch_WhenCheckoutFails_ActionFailedEventIsRaised()
737
743
public void OnDeleteBranch_WhenDeleteFails_ActionFailedEventIsRaised ( )
738
744
{
739
745
//arrange
746
+ var branchName = "dev" ;
747
+
740
748
var wasRaised = false ;
741
749
var vm = new BranchesViewViewModel
742
750
{
743
- Provider = _provider . Object
751
+ Provider = _provider . Object ,
752
+ CurrentPublishedBranch = branchName
744
753
} ;
745
754
746
- var branchName = "dev" ;
747
755
_provider . Setup ( p => p . DeleteBranch ( It . Is < string > ( b => b == branchName ) ) )
748
756
. Throws (
749
757
new SourceControlException ( "A source control exception was thrown." ,
@@ -753,7 +761,7 @@ public void OnDeleteBranch_WhenDeleteFails_ActionFailedEventIsRaised()
753
761
vm . ErrorThrown += ( sender , error ) => wasRaised = true ;
754
762
755
763
//act
756
- vm . DeleteBranchToolbarButtonCommand . Execute ( branchName ) ;
764
+ vm . DeleteBranchToolbarButtonCommand . Execute ( bool . TrueString ) ;
757
765
758
766
//assert
759
767
Assert . IsTrue ( wasRaised , "ActionFailedEvent was not raised." ) ;
@@ -794,11 +802,12 @@ public void PublishPublishesBranch()
794
802
var branch = "dev" ;
795
803
var vm = new BranchesViewViewModel
796
804
{
797
- Provider = _provider . Object
805
+ Provider = _provider . Object ,
806
+ CurrentUnpublishedBranch = branch
798
807
} ;
799
808
800
809
//act
801
- vm . PublishBranchToolbarButtonCommand . Execute ( branch ) ;
810
+ vm . PublishBranchToolbarButtonCommand . Execute ( null ) ;
802
811
803
812
//Assert
804
813
_provider . Verify ( git => git . Publish ( branch ) ) ;
@@ -811,11 +820,12 @@ public void UnpublishUnpublishesBranch()
811
820
var branch = "master" ;
812
821
var vm = new BranchesViewViewModel
813
822
{
814
- Provider = _provider . Object
823
+ Provider = _provider . Object ,
824
+ CurrentPublishedBranch = branch
815
825
} ;
816
826
817
827
//act
818
- vm . UnpublishBranchToolbarButtonCommand . Execute ( branch ) ;
828
+ vm . UnpublishBranchToolbarButtonCommand . Execute ( null ) ;
819
829
820
830
//Assert
821
831
_provider . Verify ( git => git . Unpublish ( branch ) ) ;
@@ -852,7 +862,8 @@ public void UnpublishBranch_ActionFailedEventIsRaised()
852
862
//arrange
853
863
var vm = new BranchesViewViewModel
854
864
{
855
- Provider = _provider . Object
865
+ Provider = _provider . Object ,
866
+ CurrentPublishedBranch = "master"
856
867
} ;
857
868
var wasRaised = false ;
858
869
@@ -865,7 +876,7 @@ public void UnpublishBranch_ActionFailedEventIsRaised()
865
876
vm . ErrorThrown += ( sender , error ) => wasRaised = true ;
866
877
867
878
//act
868
- vm . UnpublishBranchToolbarButtonCommand . Execute ( "master" ) ;
879
+ vm . UnpublishBranchToolbarButtonCommand . Execute ( null ) ;
869
880
870
881
//assert
871
882
Assert . IsTrue ( wasRaised , "ActionFailedEvent was not raised." ) ;
0 commit comments