Skip to content

Commit 80d30ef

Browse files
committed
Toggle error icon in create branch form
1 parent 0f22142 commit 80d30ef

File tree

4 files changed

+14
-10
lines changed

4 files changed

+14
-10
lines changed

RetailCoder.VBE/UI/SourceControl/BranchesPresenter.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ private void OnCreateViewCancel(object sender, EventArgs e)
176176

177177
private void OnCreateBranchTextChanged(object sender, EventArgs e)
178178
{
179-
_createView.OkButtonEnabled = !string.IsNullOrEmpty(_createView.UserInputText) &&
179+
_createView.IsValidBranchName = !string.IsNullOrEmpty(_createView.UserInputText) &&
180180
!_view.Local.Contains(_createView.UserInputText) &&
181181
!_createView.UserInputText.Any(char.IsWhiteSpace);
182182
}

RetailCoder.VBE/UI/SourceControl/CreateBranchForm.cs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,14 @@ public string UserInputText
2626
set { this.UserInputBox.Text = value; }
2727
}
2828

29-
public bool OkButtonEnabled
29+
public bool IsValidBranchName
3030
{
3131
get { return this.OkButton.Enabled; }
32-
set { this.OkButton.Enabled = value; }
32+
set
33+
{
34+
this.OkButton.Enabled = value;
35+
this.InvalidNameValidationIcon.Visible = !value;
36+
}
3337
}
3438

3539
public event EventHandler<BranchCreateArgs> Confirm;

RetailCoder.VBE/UI/SourceControl/ICreateBranchView.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ namespace Rubberduck.UI.SourceControl
66
public interface ICreateBranchView
77
{
88
string UserInputText { get; set; }
9-
bool OkButtonEnabled { get; set; }
9+
bool IsValidBranchName { get; set; }
1010

1111
event EventHandler<BranchCreateArgs> Confirm;
1212
event EventHandler<EventArgs> Cancel;

RubberduckTests/SourceControl/BranchesPresenterTests.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -250,13 +250,13 @@ public void CreateBranch_AndBranchExists()
250250

251251
_view.SetupProperty(v => v.Local, branches);
252252
_createView.SetupProperty(c => c.UserInputText, branchName);
253-
_createView.SetupProperty(c => c.OkButtonEnabled);
253+
_createView.SetupProperty(c => c.IsValidBranchName);
254254

255255
//act
256256
_createView.Raise(c => c.UserInputTextChanged += null, new EventArgs());
257257

258258
//Assert
259-
Assert.IsFalse(_createView.Object.OkButtonEnabled);
259+
Assert.IsFalse(_createView.Object.IsValidBranchName);
260260
}
261261

262262
[TestMethod]
@@ -269,13 +269,13 @@ public void CreateBranch_AndValidBranchName()
269269

270270
_view.SetupProperty(v => v.Local, branches);
271271
_createView.SetupProperty(c => c.UserInputText, newBranchName);
272-
_createView.SetupProperty(c => c.OkButtonEnabled);
272+
_createView.SetupProperty(c => c.IsValidBranchName);
273273

274274
//act
275275
_createView.Raise(c => c.UserInputTextChanged += null, new EventArgs());
276276

277277
//Assert
278-
Assert.IsTrue(_createView.Object.OkButtonEnabled);
278+
Assert.IsTrue(_createView.Object.IsValidBranchName);
279279
}
280280

281281
[TestMethod]
@@ -287,13 +287,13 @@ public void CreateBranch_WithNameAsMultipleWords()
287287

288288
_view.SetupProperty(v => v.Local, branches);
289289
_createView.SetupProperty(c => c.UserInputText, branchName);
290-
_createView.SetupProperty(c => c.OkButtonEnabled);
290+
_createView.SetupProperty(c => c.IsValidBranchName);
291291

292292
//act
293293
_createView.Raise(c => c.UserInputTextChanged += null, new EventArgs());
294294

295295
//Assert
296-
Assert.IsFalse(_createView.Object.OkButtonEnabled);
296+
Assert.IsFalse(_createView.Object.IsValidBranchName);
297297
}
298298

299299
[TestMethod]

0 commit comments

Comments
 (0)